diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild
index 3de334d89101..98886764bc2d 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="metapackage"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 DEPEND=""
 RDEPEND=">=app-accessibility/at-spi2-core-2.46.0[${MULTILIB_USEDEP}]"
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.54.1-r1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.54.1-r1.ebuild
index 8cbbfcb5fc17..5ccdf9bcfa89 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.54.1-r1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.54.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/at-spi2-core"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="X dbus-broker gtk-doc +introspection systemd"
 REQUIRED_USE="
 	dbus-broker? ( systemd )
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.56.4.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.56.4.ebuild
index 31186ed5fcad..20a548657688 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.56.4.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.56.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/at-spi2-core"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="X dbus-broker gtk-doc +introspection systemd"
 REQUIRED_USE="
 	dbus-broker? ( systemd )
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.56.5.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.56.5.ebuild
index bcc494457a58..2bcf280780ff 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.56.5.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.56.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/at-spi2-core"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="X dbus-broker gtk-doc +introspection systemd"
 REQUIRED_USE="
 	dbus-broker? ( systemd )
diff --git a/app-admin/apache-tools/apache-tools-2.4.65.ebuild b/app-admin/apache-tools/apache-tools-2.4.65.ebuild
index 424804ae92f9..8f0e7f61aee6 100644
--- a/app-admin/apache-tools/apache-tools-2.4.65.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.65.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/httpd-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="ssl"
 
 RDEPEND=">=dev-libs/apr-1.5.0:1=
diff --git a/app-admin/apache-tools/apache-tools-2.4.66.ebuild b/app-admin/apache-tools/apache-tools-2.4.66.ebuild
index a3dd2292f3a7..7a5702149ceb 100644
--- a/app-admin/apache-tools/apache-tools-2.4.66.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.66.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/httpd-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="ssl"
 
 RDEPEND=">=dev-libs/apr-1.5.0:1=
diff --git a/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild b/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild
index ef51acd860be..18c78cdb6c38 100644
--- a/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cracklib"
 
 DEPEND="virtual/libcrypt:=
diff --git a/app-admin/apg/apg-2.3.0b_p20240821.ebuild b/app-admin/apg/apg-2.3.0b_p20240821.ebuild
index 356017a8e30a..8e6082a522ad 100644
--- a/app-admin/apg/apg-2.3.0b_p20240821.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20240821.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="cracklib"
 
 DEPEND="
diff --git a/app-admin/chrpath/chrpath-0.16-r1.ebuild b/app-admin/chrpath/chrpath-0.16-r1.ebuild
index fdd040e190db..e94196c0c825 100644
--- a/app-admin/chrpath/chrpath-0.16-r1.ebuild
+++ b/app-admin/chrpath/chrpath-0.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
diff --git a/app-admin/chrpath/chrpath-0.18.ebuild b/app-admin/chrpath/chrpath-0.18.ebuild
index bc3e69b07716..dd26d7d656ab 100644
--- a/app-admin/chrpath/chrpath-0.18.ebuild
+++ b/app-admin/chrpath/chrpath-0.18.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.16-multilib.patch
diff --git a/app-admin/emacs-updater/emacs-updater-1.19.ebuild b/app-admin/emacs-updater/emacs-updater-1.19.ebuild
index a43f764ae136..a31fa44d50ab 100644
--- a/app-admin/emacs-updater/emacs-updater-1.19.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
diff --git a/app-admin/eselect/eselect-1.4.30.ebuild b/app-admin/eselect/eselect-1.4.30.ebuild
index 9a0e767d453b..0111d9f42ff4 100644
--- a/app-admin/eselect/eselect-1.4.30.ebuild
+++ b/app-admin/eselect/eselect-1.4.30.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"
 
 # coreutils for realpath
diff --git a/app-admin/eselect/eselect-1.4.31.ebuild b/app-admin/eselect/eselect-1.4.31.ebuild
index 7a354dbfade7..6d465c942f10 100644
--- a/app-admin/eselect/eselect-1.4.31.ebuild
+++ b/app-admin/eselect/eselect-1.4.31.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"
 
 # coreutils for realpath
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index 1ae222c78f52..d9d493fa10d2 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gamin"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	!app-admin/fam
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r4.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r4.ebuild
index cfb6b12208fc..1d28e76c9ae5 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r4.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
 else
 	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="GPL-3+"
 SLOT="2"
diff --git a/app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild b/app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild
index 32a88aff4b4c..1ed5cb1b1991 100644
--- a/app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
 else
 	SRC_URI="https://gkrellm.srcbox.net/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="GPL-3+"
 SLOT="2"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
index 4400fe87eec5..98ce6086bc10 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/gentoo-haskell/haskell-updater#readme"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 
 DEPEND=">=dev-lang/ghc-6.12.1:="
 
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.3.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.3.ebuild
index 85b8216763b6..20217bca2bc6 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.3.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/gentoo-haskell/haskell-updater#readme"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 
 DEPEND=">=dev-lang/ghc-6.12.1"
 
diff --git a/app-admin/haskell-updater/haskell-updater-1.4.0.0.ebuild b/app-admin/haskell-updater/haskell-updater-1.4.0.0.ebuild
index 31c6bd039899..17b35896849a 100644
--- a/app-admin/haskell-updater/haskell-updater-1.4.0.0.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.4.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/gentoo-haskell/haskell-updater#readme"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 
 # Need a lower version for portage to get --keep-going
 RDEPEND="
diff --git a/app-admin/haskell-updater/haskell-updater-1.4.1.0.ebuild b/app-admin/haskell-updater/haskell-updater-1.4.1.0.ebuild
index 836d715bc7ae..54f8049aaaa3 100644
--- a/app-admin/haskell-updater/haskell-updater-1.4.1.0.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.4.1.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/gentoo-haskell/haskell-updater#readme"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 
 # Need a lower version for portage to get --reinstall-atoms
 RDEPEND="
diff --git a/app-admin/lsyncd/lsyncd-2.3.1.ebuild b/app-admin/lsyncd/lsyncd-2.3.1.ebuild
index 9f5892cda996..266527fe1b01 100644
--- a/app-admin/lsyncd/lsyncd-2.3.1.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.3.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/app-admin/makepasswd/makepasswd-1.10-r1.ebuild b/app-admin/makepasswd/makepasswd-1.10-r1.ebuild
index bc4fa705b38e..7ccd9557ed5d 100644
--- a/app-admin/makepasswd/makepasswd-1.10-r1.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-admin/monit/monit-5.34.0.ebuild b/app-admin/monit/monit-5.34.0.ebuild
index adde8bbf80e1..c6a9d124486f 100644
--- a/app-admin/monit/monit-5.34.0.ebuild
+++ b/app-admin/monit/monit-5.34.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="pam ssl"
 
 RDEPEND="virtual/zlib:=
diff --git a/app-admin/monit/monit-5.34.3.ebuild b/app-admin/monit/monit-5.34.3.ebuild
index adde8bbf80e1..c6a9d124486f 100644
--- a/app-admin/monit/monit-5.34.3.ebuild
+++ b/app-admin/monit/monit-5.34.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="pam ssl"
 
 RDEPEND="virtual/zlib:=
diff --git a/app-admin/monit/monit-5.34.4.ebuild b/app-admin/monit/monit-5.34.4.ebuild
index adde8bbf80e1..c6a9d124486f 100644
--- a/app-admin/monit/monit-5.34.4.ebuild
+++ b/app-admin/monit/monit-5.34.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="pam ssl"
 
 RDEPEND="virtual/zlib:=
diff --git a/app-admin/monit/monit-5.35.2.ebuild b/app-admin/monit/monit-5.35.2.ebuild
index 3f24952dc816..fede4e559784 100644
--- a/app-admin/monit/monit-5.35.2.ebuild
+++ b/app-admin/monit/monit-5.35.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="pam ssl"
 
 RDEPEND="virtual/zlib:=
diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild
index 22d5303c88c6..241e6f83762f 100644
--- a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
diff --git a/app-admin/passook/passook-20121001.ebuild b/app-admin/passook/passook-20121001.ebuild
index 457441d9f751..8e6f418ccf1b 100644
--- a/app-admin/passook/passook-20121001.ebuild
+++ b/app-admin/passook/passook-20121001.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PASSOOK_COMMIT}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 RDEPEND="dev-lang/perl
 	sys-apps/miscfiles"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild
index 975122101002..629cfb5cb338 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 1a7d43e4ac80..e807c33c41d4 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/pwgen/pwgen-2.08-r2.ebuild b/app-admin/pwgen/pwgen-2.08-r2.ebuild
index 3785621ec89a..c29d139c09b4 100644
--- a/app-admin/pwgen/pwgen-2.08-r2.ebuild
+++ b/app-admin/pwgen/pwgen-2.08-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="livecd"
 
 PATCHES=(
diff --git a/app-admin/pydf/pydf-12-r2.ebuild b/app-admin/pydf/pydf-12-r2.ebuild
index 89c4e225c1b4..154c74bf8dbb 100644
--- a/app-admin/pydf/pydf-12-r2.ebuild
+++ b/app-admin/pydf/pydf-12-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
diff --git a/app-admin/pydf/pydf-15.ebuild b/app-admin/pydf/pydf-15.ebuild
index d217a5da7cd8..1118a9cc7b38 100644
--- a/app-admin/pydf/pydf-15.ebuild
+++ b/app-admin/pydf/pydf-15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.orig
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
diff --git a/app-admin/stow/stow-2.4.1.ebuild b/app-admin/stow/stow-2.4.1.ebuild
index 33b83cfddd13..098f05266deb 100644
--- a/app-admin/stow/stow-2.4.1.ebuild
+++ b/app-admin/stow/stow-2.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild
index 803311d48bdc..d7494f79b423 100644
--- a/app-alternatives/awk/awk-4.ebuild
+++ b/app-alternatives/awk/awk-4.ebuild
@@ -13,7 +13,7 @@ ALTERNATIVES=(
 inherit app-alternatives eapi9-ver
 
 DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/bc/bc-0.ebuild b/app-alternatives/bc/bc-0.ebuild
index 564a7b49e62b..e845dee24506 100644
--- a/app-alternatives/bc/bc-0.ebuild
+++ b/app-alternatives/bc/bc-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bc symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<sys-devel/bc-1.07.1-r6
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index dc2a614d986e..132af897181a 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
index bdf26f9b5adc..d94ce8be71ea 100644
--- a/app-alternatives/cpio/cpio-0.ebuild
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="CPIO symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/gpg/gpg-0-r2.ebuild b/app-alternatives/gpg/gpg-0-r2.ebuild
index d0c4dc1e70a7..3d7c5706a9cc 100644
--- a/app-alternatives/gpg/gpg-0-r2.ebuild
+++ b/app-alternatives/gpg/gpg-0-r2.ebuild
@@ -10,7 +10,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gpg symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls ssl"
 
 RDEPEND="
diff --git a/app-alternatives/gpg/gpg-0-r3.ebuild b/app-alternatives/gpg/gpg-0-r3.ebuild
index ad2fee016e98..2c62ab921b0a 100644
--- a/app-alternatives/gpg/gpg-0-r3.ebuild
+++ b/app-alternatives/gpg/gpg-0-r3.ebuild
@@ -10,7 +10,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gpg symlink"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls ssl"
 
 RDEPEND="
diff --git a/app-alternatives/gpg/gpg-1-r2.ebuild b/app-alternatives/gpg/gpg-1-r2.ebuild
index fc91d249f8e1..ae1e3fc87879 100644
--- a/app-alternatives/gpg/gpg-1-r2.ebuild
+++ b/app-alternatives/gpg/gpg-1-r2.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gpg symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="nls ssl"
 
 RDEPEND="
diff --git a/app-alternatives/gpg/gpg-1-r3.ebuild b/app-alternatives/gpg/gpg-1-r3.ebuild
index 3c5077b8d4b2..be10893abd30 100644
--- a/app-alternatives/gpg/gpg-1-r3.ebuild
+++ b/app-alternatives/gpg/gpg-1-r3.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gpg symlink"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="nls ssl"
 
 RDEPEND="
diff --git a/app-alternatives/gzip/gzip-0.ebuild b/app-alternatives/gzip/gzip-0.ebuild
index ce65e553ba7f..1515f2e83219 100644
--- a/app-alternatives/gzip/gzip-0.ebuild
+++ b/app-alternatives/gzip/gzip-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gzip symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/gzip/gzip-1.ebuild b/app-alternatives/gzip/gzip-1.ebuild
index 1cecbfbb757f..e19ecc745f84 100644
--- a/app-alternatives/gzip/gzip-1.ebuild
+++ b/app-alternatives/gzip/gzip-1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gzip symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/lex/lex-0-r1.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
index e36f0c362a26..6f9b54ab738b 100644
--- a/app-alternatives/lex/lex-0-r1.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="lex symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<sys-devel/flex-2.6.4-r5
diff --git a/app-alternatives/lzip/lzip-0.ebuild b/app-alternatives/lzip/lzip-0.ebuild
index d0ca6ff09f8d..876b3052a12f 100644
--- a/app-alternatives/lzip/lzip-0.ebuild
+++ b/app-alternatives/lzip/lzip-0.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="lzip symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="!<app-arch/lzip-1.25"
 
diff --git a/app-alternatives/ninja/ninja-1.ebuild b/app-alternatives/ninja/ninja-1.ebuild
index 3f718497167f..7c8344ee0ec3 100644
--- a/app-alternatives/ninja/ninja-1.ebuild
+++ b/app-alternatives/ninja/ninja-1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="ninja symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<dev-build/ninja-1.11.1-r3"
 
diff --git a/app-alternatives/sh/sh-0.ebuild b/app-alternatives/sh/sh-0.ebuild
index 5b1034da9eb7..7ea6462bc824 100644
--- a/app-alternatives/sh/sh-0.ebuild
+++ b/app-alternatives/sh/sh-0.ebuild
@@ -15,7 +15,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="/bin/sh (POSIX shell) symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!app-eselect/eselect-sh
diff --git a/app-alternatives/tar/tar-0.ebuild b/app-alternatives/tar/tar-0.ebuild
index 8f0931e2858a..753aa6012e2b 100644
--- a/app-alternatives/tar/tar-0.ebuild
+++ b/app-alternatives/tar/tar-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="Tar symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
index ef600cf44ee7..2ac480d316b3 100644
--- a/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="yacc symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-util/yacc-1.9.1-r7
diff --git a/app-antivirus/clamav/clamav-0.103.12-r1.ebuild b/app-antivirus/clamav/clamav-0.103.12-r1.ebuild
index 964ca0317919..9e3258db296d 100644
--- a/app-antivirus/clamav/clamav-0.103.12-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2 unRAR"
 SLOT="0/lts"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv libclamav-only milter metadata-analysis-api selinux systemd test xml"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-antivirus/clamav/clamav-0.103.12-r3.ebuild b/app-antivirus/clamav/clamav-0.103.12-r3.ebuild
index db3ef2530f1f..0dc1d443c4e6 100644
--- a/app-antivirus/clamav/clamav-0.103.12-r3.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.12-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2 unRAR"
 SLOT="0/lts"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv libclamav-only milter metadata-analysis-api selinux systemd test xml"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-antivirus/clamav/clamav-1.0.7-r2.ebuild b/app-antivirus/clamav/clamav-1.0.7-r2.ebuild
index fd4d0cf401d3..deccbcec406b 100644
--- a/app-antivirus/clamav/clamav-1.0.7-r2.ebuild
+++ b/app-antivirus/clamav/clamav-1.0.7-r2.ebuild
@@ -167,7 +167,7 @@ S=${WORKDIR}/clamav-${MY_P}
 LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 SLOT="0/lts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
diff --git a/app-antivirus/clamav/clamav-1.4.1-r3.ebuild b/app-antivirus/clamav/clamav-1.4.1-r3.ebuild
index 03cbe599148f..2dadb8aa2517 100644
--- a/app-antivirus/clamav/clamav-1.4.1-r3.ebuild
+++ b/app-antivirus/clamav/clamav-1.4.1-r3.ebuild
@@ -166,7 +166,7 @@ LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 # 0/sts (short term support) if not an LTS release
 SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
diff --git a/app-antivirus/clamav/clamav-1.4.2-r1.ebuild b/app-antivirus/clamav/clamav-1.4.2-r1.ebuild
index a39c157cf4d7..700db2b25c81 100644
--- a/app-antivirus/clamav/clamav-1.4.2-r1.ebuild
+++ b/app-antivirus/clamav/clamav-1.4.2-r1.ebuild
@@ -166,7 +166,7 @@ LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 # 0/sts (short term support) if not an LTS release
 SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
diff --git a/app-antivirus/clamav/clamav-1.4.3.ebuild b/app-antivirus/clamav/clamav-1.4.3.ebuild
index 8fde1b865ebc..854cee1c7c8c 100644
--- a/app-antivirus/clamav/clamav-1.4.3.ebuild
+++ b/app-antivirus/clamav/clamav-1.4.3.ebuild
@@ -166,7 +166,7 @@ LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 # 0/sts (short term support) if not an LTS release
 SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
diff --git a/app-antivirus/clamav/clamav-1.5.1.ebuild b/app-antivirus/clamav/clamav-1.5.1.ebuild
index e3b3908a6403..b0c681b04439 100644
--- a/app-antivirus/clamav/clamav-1.5.1.ebuild
+++ b/app-antivirus/clamav/clamav-1.5.1.ebuild
@@ -321,7 +321,7 @@ LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 # 0/sts (short term support) if not an LTS release
 SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
diff --git a/app-arch/arc/arc-5.21q.ebuild b/app-arch/arc/arc-5.21q.ebuild
index 33037f815d24..2d84bf29de49 100644
--- a/app-arch/arc/arc-5.21q.ebuild
+++ b/app-arch/arc/arc-5.21q.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ani6al/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.21m-darwin.patch
diff --git a/app-arch/arj/arj-3.10.22-r8.ebuild b/app-arch/arj/arj-3.10.22-r8.ebuild
index d6a538475e52..c105c0edcb70 100644
--- a/app-arch/arj/arj-3.10.22-r8.ebuild
+++ b/app-arch/arj/arj-3.10.22-r8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-implicit-declarations.patch"
diff --git a/app-arch/arj/arj-3.10.22_p28.ebuild b/app-arch/arj/arj-3.10.22_p28.ebuild
index b7a774c47fe3..4c26042ef54d 100644
--- a/app-arch/arj/arj-3.10.22_p28.ebuild
+++ b/app-arch/arj/arj-3.10.22_p28.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 
 PATCHES=(
 	# get order of patches from series file. otherwise the order is wrong :/
diff --git a/app-arch/brotli/brotli-1.0.9-r6.ebuild b/app-arch/brotli/brotli-1.0.9-r6.ebuild
index c2c48ae7b161..c95ec678f8cc 100644
--- a/app-arch/brotli/brotli-1.0.9-r6.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 	SRC_URI="
 		https://github.com/google/${PN}/archive/v${PV}.tar.gz
 			-> ${P}.tar.gz
diff --git a/app-arch/brotli/brotli-1.1.0.ebuild b/app-arch/brotli/brotli-1.1.0.ebuild
index 1f6e0750e208..183aa2e91fe4 100644
--- a/app-arch/brotli/brotli-1.1.0.ebuild
+++ b/app-arch/brotli/brotli-1.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 	SRC_URI="
 		https://github.com/google/${PN}/archive/v${PV}.tar.gz
 			-> ${P}.tar.gz
diff --git a/app-arch/brotli/brotli-1.2.0.ebuild b/app-arch/brotli/brotli-1.2.0.ebuild
index 11fe4305c6df..50469a1dd9d1 100644
--- a/app-arch/brotli/brotli-1.2.0.ebuild
+++ b/app-arch/brotli/brotli-1.2.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 	SRC_URI="
 		https://github.com/google/${PN}/archive/v${PV}.tar.gz
 			-> ${P}.tar.gz
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index d06648765c41..5adb42dcf640 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 	SRC_URI="
 		https://github.com/google/${PN}/archive/v${PV}.tar.gz
 			-> ${P}.tar.gz
diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild
index 6ce3e40df478..af580642e0a1 100644
--- a/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sparc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-64bit.patch )
 
diff --git a/app-arch/cabextract/cabextract-1.11.ebuild b/app-arch/cabextract/cabextract-1.11.ebuild
index d2ffa8d77506..35e117546560 100644
--- a/app-arch/cabextract/cabextract-1.11.ebuild
+++ b/app-arch/cabextract/cabextract-1.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild
index fc7edb42a7d8..d6b3c36e78b8 100644
--- a/app-arch/cabextract/cabextract-9999.ebuild
+++ b/app-arch/cabextract/cabextract-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cksfv/cksfv-1.3.15.ebuild b/app-arch/cksfv/cksfv-1.3.15.ebuild
index f57798d93db1..cc90f3ec30d2 100644
--- a/app-arch/cksfv/cksfv-1.3.15.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.15-destdir.patch
diff --git a/app-arch/cpio/cpio-2.14.ebuild b/app-arch/cpio/cpio-2.14.ebuild
index b3f8a8ebe06c..a3f7d7d13fbe 100644
--- a/app-arch/cpio/cpio-2.14.ebuild
+++ b/app-arch/cpio/cpio-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 PDEPEND="
diff --git a/app-arch/cpio/cpio-2.15.ebuild b/app-arch/cpio/cpio-2.15.ebuild
index e0dfbb1f7a8f..27b1b9b2ec94 100644
--- a/app-arch/cpio/cpio-2.15.ebuild
+++ b/app-arch/cpio/cpio-2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 PDEPEND="
diff --git a/app-arch/deb2targz/deb2targz-1-r3.ebuild b/app-arch/deb2targz/deb2targz-1-r3.ebuild
index d5787df004b3..e76bbddcda9c 100644
--- a/app-arch/deb2targz/deb2targz-1-r3.ebuild
+++ b/app-arch/deb2targz/deb2targz-1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-arch/dpkg/dpkg-1.22.14.ebuild b/app-arch/dpkg/dpkg-1.22.14.ebuild
index e76e1c1059bb..62b978452c3d 100644
--- a/app-arch/dpkg/dpkg-1.22.14.ebuild
+++ b/app-arch/dpkg/dpkg-1.22.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.22.19.ebuild b/app-arch/dpkg/dpkg-1.22.19.ebuild
index 57fa2b438d66..3ac40ab21bbb 100644
--- a/app-arch/dpkg/dpkg-1.22.19.ebuild
+++ b/app-arch/dpkg/dpkg-1.22.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.22.21.ebuild b/app-arch/dpkg/dpkg-1.22.21.ebuild
index a6cae7de5cde..466daf4aea10 100644
--- a/app-arch/dpkg/dpkg-1.22.21.ebuild
+++ b/app-arch/dpkg/dpkg-1.22.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+bzip2 +lzma nls selinux test +update-alternatives +zlib +zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/file-roller/file-roller-44.5.ebuild b/app-arch/file-roller/file-roller-44.5.ebuild
index b132ecadad3f..5e2ea973c163 100644
--- a/app-arch/file-roller/file-roller-44.5.ebuild
+++ b/app-arch/file-roller/file-roller-44.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/file-roller"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="gtk-doc +introspection nautilus"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
diff --git a/app-arch/file-roller/file-roller-44.6.ebuild b/app-arch/file-roller/file-roller-44.6.ebuild
index 5e7cd9d47b19..3db336819fbc 100644
--- a/app-arch/file-roller/file-roller-44.6.ebuild
+++ b/app-arch/file-roller/file-roller-44.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/file-roller"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="gtk-doc +introspection nautilus"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
diff --git a/app-arch/gzip/gzip-1.13-r1.ebuild b/app-arch/gzip/gzip-1.13-r1.ebuild
index c0e2d8b9a6bc..f174dd82b831 100644
--- a/app-arch/gzip/gzip-1.13-r1.ebuild
+++ b/app-arch/gzip/gzip-1.13-r1.ebuild
@@ -31,7 +31,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ ${PV} != *_p* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="pic static"
 
diff --git a/app-arch/gzip/gzip-1.14.ebuild b/app-arch/gzip/gzip-1.14.ebuild
index d345ebe42298..71dddd595788 100644
--- a/app-arch/gzip/gzip-1.14.ebuild
+++ b/app-arch/gzip/gzip-1.14.ebuild
@@ -31,7 +31,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ ${PV} != *_p* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="pic static"
 
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r3.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r3.ebuild
index 5b58e390b38e..36c03532afb5 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r3.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/05/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug static"
 
 PATCHES=(
diff --git a/app-arch/lha/lha-114i_p20250112.ebuild b/app-arch/lha/lha-114i_p20250112.ebuild
index 5ceb427abad1..14ece12644c7 100644
--- a/app-arch/lha/lha-114i_p20250112.ebuild
+++ b/app-arch/lha/lha-114i_p20250112.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ppc ppc64 ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P/_p*}-file-list-from-stdin.patch
diff --git a/app-arch/libarchive/libarchive-3.8.1.ebuild b/app-arch/libarchive/libarchive-3.8.1.ebuild
index 7b22ee07e2a4..a9a4b207d1e2 100644
--- a/app-arch/libarchive/libarchive-3.8.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.8.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd
diff --git a/app-arch/libarchive/libarchive-3.8.2.ebuild b/app-arch/libarchive/libarchive-3.8.2.ebuild
index ca9cd2213592..49a6d5c1876f 100644
--- a/app-arch/libarchive/libarchive-3.8.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.8.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd
diff --git a/app-arch/libarchive/libarchive-3.8.3.ebuild b/app-arch/libarchive/libarchive-3.8.3.ebuild
index cb423ca69c68..b8f794825ad6 100644
--- a/app-arch/libarchive/libarchive-3.8.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.8.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd
diff --git a/app-arch/libarchive/libarchive-3.8.4.ebuild b/app-arch/libarchive/libarchive-3.8.4.ebuild
index 13bf16e5ff2f..66aa87f993e2 100644
--- a/app-arch/libarchive/libarchive-3.8.4.ebuild
+++ b/app-arch/libarchive/libarchive-3.8.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd
diff --git a/app-arch/lz4/lz4-1.10.0-r1.ebuild b/app-arch/lz4/lz4-1.10.0-r1.ebuild
index 4c92c6955ac1..8e94fbf76cdc 100644
--- a/app-arch/lz4/lz4-1.10.0-r1.ebuild
+++ b/app-arch/lz4/lz4-1.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0/1.10.0-meson"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/lz4/lz4-1.10.0.ebuild b/app-arch/lz4/lz4-1.10.0.ebuild
index 3d94cd7a3eb2..4aa5a3d97b1f 100644
--- a/app-arch/lz4/lz4-1.10.0.ebuild
+++ b/app-arch/lz4/lz4-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0/1.10.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/lz4/lz4-1.9.4.ebuild b/app-arch/lz4/lz4-1.9.4.ebuild
index 90207dfda58e..5c086ce6ed09 100644
--- a/app-arch/lz4/lz4-1.9.4.ebuild
+++ b/app-arch/lz4/lz4-1.9.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2 GPL-2"
 # https://abi-laboratory.pro/tracker/timeline/lz4/
 SLOT="0/r132"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/lzip/lzip-1.25.ebuild b/app-arch/lzip/lzip-1.25.ebuild
index 314cb2420dc3..8f6edbb77686 100644
--- a/app-arch/lzip/lzip-1.25.ebuild
+++ b/app-arch/lzip/lzip-1.25.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	verify-sig? (
diff --git a/app-arch/lzma/lzma-19.00-r1.ebuild b/app-arch/lzma/lzma-19.00-r1.ebuild
index 8244a7cc92e7..d43283eb3a34 100644
--- a/app-arch/lzma/lzma-19.00-r1.ebuild
+++ b/app-arch/lzma/lzma-19.00-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/sevenzip/${MY_P}.7z -> ${P}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 BDEPEND="$(unpacker_src_uri_depends)"
diff --git a/app-arch/lzop/lzop-1.04-r1.ebuild b/app-arch/lzop/lzop-1.04-r1.ebuild
index 1792f3cf88bc..d039c988b518 100644
--- a/app-arch/lzop/lzop-1.04-r1.ebuild
+++ b/app-arch/lzop/lzop-1.04-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lzop.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=">=dev-libs/lzo-2"
 DEPEND="${RDEPEND}"
diff --git a/app-arch/makeself/makeself-2.5.0.ebuild b/app-arch/makeself/makeself-2.5.0.ebuild
index 286161726b85..c3fe73a2677f 100644
--- a/app-arch/makeself/makeself-2.5.0.ebuild
+++ b/app-arch/makeself/makeself-2.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86"
 
 # NB: The test framework requires bashunit (which isn't a big deal), but the
 # tests themselves are not of great quality.  You should avoid running them
diff --git a/app-arch/mscompress/mscompress-0.3-r2.ebuild b/app-arch/mscompress/mscompress-0.3-r2.ebuild
index 162bf5a558b4..8f8594b0b7fa 100644
--- a/app-arch/mscompress/mscompress-0.3-r2.ebuild
+++ b/app-arch/mscompress/mscompress-0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
diff --git a/app-arch/ncompress/ncompress-5.0-r2.ebuild b/app-arch/ncompress/ncompress-5.0-r2.ebuild
index 4fe2ac69d7ae..39baddd1d8c7 100644
--- a/app-arch/ncompress/ncompress-5.0-r2.ebuild
+++ b/app-arch/ncompress/ncompress-5.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0-c23.patch
diff --git a/app-arch/p7zip/p7zip-17.05-r2.ebuild b/app-arch/p7zip/p7zip-17.05-r2.ebuild
index 66222bada851..d12cf23c2dec 100644
--- a/app-arch/p7zip/p7zip-17.05-r2.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="abi_x86_x32 natspec +pch rar test"
 
 REQUIRED_USE="test? ( rar )" # bug 907221
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild
index 77fcfa6645e4..9621cf053123 100644
--- a/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
 IUSE="openmp"
 
 PATCHES=( "${FILESDIR}"/${P}-big-endian.patch )
diff --git a/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index 35f40692fe8d..04a53298f448 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/pdv/pdv-1.5.1-r5.ebuild b/app-arch/pdv/pdv-1.5.1-r5.ebuild
index 4f9eafbb2817..f5272f8b014c 100644
--- a/app-arch/pdv/pdv-1.5.1-r5.ebuild
+++ b/app-arch/pdv/pdv-1.5.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pdv/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="gui"
 
 RDEPEND="
diff --git a/app-arch/pigz/pigz-2.8.ebuild b/app-arch/pigz/pigz-2.8.ebuild
index 3ee1951d99d5..695433e56fe7 100644
--- a/app-arch/pigz/pigz-2.8.ebuild
+++ b/app-arch/pigz/pigz-2.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild b/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild
index 0968ba7b2f96..8e636f0fb1e4 100644
--- a/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild
+++ b/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jnovy/pxz/archive/${PXZ_COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # Needs the library from xz-utils
 RDEPEND="app-arch/xz-utils"
diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
index dac6b186a29a..1bd51ff33fb2 100644
--- a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-arch/rzip/rzip-2.1-r5.ebuild b/app-arch/rzip/rzip-2.1-r5.ebuild
index 583672b76428..3c5b92b3fe77 100644
--- a/app-arch/rzip/rzip-2.1-r5.ebuild
+++ b/app-arch/rzip/rzip-2.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://rzip.samba.org/ftp/rzip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="app-arch/bzip2:="
 DEPEND="${RDEPEND}"
diff --git a/app-arch/sharutils/sharutils-4.15.2-r3.ebuild b/app-arch/sharutils/sharutils-4.15.2-r3.ebuild
index e7b83d2cad1b..a088841c3579 100644
--- a/app-arch/sharutils/sharutils-4.15.2-r3.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 DEPEND="app-arch/xz-utils
diff --git a/app-arch/snappy/snappy-1.2.1.ebuild b/app-arch/snappy/snappy-1.2.1.ebuild
index 28f5fe3ea2ae..206702fe42b1 100644
--- a/app-arch/snappy/snappy-1.2.1.ebuild
+++ b/app-arch/snappy/snappy-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # ABI may be broken without a new SONAME. Please use abidiff on bumps.
 SLOT="0/1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/snappy/snappy-1.2.2-r1.ebuild b/app-arch/snappy/snappy-1.2.2-r1.ebuild
index be689433ec86..6c369b6690df 100644
--- a/app-arch/snappy/snappy-1.2.2-r1.ebuild
+++ b/app-arch/snappy/snappy-1.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # ABI may be broken without a new SONAME. Please use abidiff on bumps.
 SLOT="0/1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/snappy/snappy-1.2.2.ebuild b/app-arch/snappy/snappy-1.2.2.ebuild
index 76114bbd9837..fee9f4c52910 100644
--- a/app-arch/snappy/snappy-1.2.2.ebuild
+++ b/app-arch/snappy/snappy-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # ABI may be broken without a new SONAME. Please use abidiff on bumps.
 SLOT="0/1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/tar/tar-1.35.ebuild b/app-arch/tar/tar-1.35.ebuild
index b3941c243460..cb0d066ae9c6 100644
--- a/app-arch/tar/tar-1.35.ebuild
+++ b/app-arch/tar/tar-1.35.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ -z "$(ver_cut 3)" || "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="acl minimal nls selinux xattr"
 
diff --git a/app-arch/tarsync/tarsync-0.2.3-r1.ebuild b/app-arch/tarsync/tarsync-0.2.3-r1.ebuild
index 88453712c53e..464229f48549 100644
--- a/app-arch/tarsync/tarsync-0.2.3-r1.ebuild
+++ b/app-arch/tarsync/tarsync-0.2.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zmedico/tarsync/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=dev-util/diffball-0.7"
 RDEPEND="${DEPEND}"
diff --git a/app-arch/unace/unace-2.5-r6.ebuild b/app-arch/unace/unace-2.5-r6.ebuild
index 48bed159fdc8..eaa27767a69b 100644
--- a/app-arch/unace/unace-2.5-r6.ebuild
+++ b/app-arch/unace/unace-2.5-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="freedist"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86"
 
 PATCHES=(
 	"${WORKDIR}"/debian/patches/
diff --git a/app-arch/unadf/unadf-0.7.12-r2.ebuild b/app-arch/unadf/unadf-0.7.12-r2.ebuild
index 8fe86b8fe41d..71983d7ff073 100644
--- a/app-arch/unadf/unadf-0.7.12-r2.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.7.12-CVE-2016-1243_CVE-2016-1244.patch )
 
diff --git a/app-arch/unadf/unadf-0.9.0.ebuild b/app-arch/unadf/unadf-0.9.0.ebuild
index 5805f3a76f1b..66b1bfc6504b 100644
--- a/app-arch/unadf/unadf-0.9.0.ebuild
+++ b/app-arch/unadf/unadf-0.9.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( GPL-2+ LGPL-2.1+ )"
 SLOT="0/2" # see adflib_lt_version from configure.ac and util/bump_project_version for more details
-KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/app-arch/unp/unp-2.0.ebuild b/app-arch/unp/unp-2.0.ebuild
index 11f1134260eb..09822e874a7f 100644
--- a/app-arch/unp/unp-2.0.ebuild
+++ b/app-arch/unp/unp-2.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc x86"
 IUSE="nls test"
 
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/app-arch/unrar/unrar-7.1.10.ebuild b/app-arch/unrar/unrar-7.1.10.ebuild
index 741d7f9a4a92..7567d3604bfa 100644
--- a/app-arch/unrar/unrar-7.1.10.ebuild
+++ b/app-arch/unrar/unrar-7.1.10.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
 SLOT="0/7" # subslot = soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
 
diff --git a/app-arch/unrar/unrar-7.2.1.ebuild b/app-arch/unrar/unrar-7.2.1.ebuild
index 741d7f9a4a92..7567d3604bfa 100644
--- a/app-arch/unrar/unrar-7.2.1.ebuild
+++ b/app-arch/unrar/unrar-7.2.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
 SLOT="0/7" # subslot = soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
 
diff --git a/app-arch/unrar/unrar-7.2.2.ebuild b/app-arch/unrar/unrar-7.2.2.ebuild
index 479e479e523f..44905ea2ef0c 100644
--- a/app-arch/unrar/unrar-7.2.2.ebuild
+++ b/app-arch/unrar/unrar-7.2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
 SLOT="0/7" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
 
diff --git a/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/app-arch/unzip/unzip-6.0_p27-r1.ebuild
index 2176cc5bd40c..a3201cf8e887 100644
--- a/app-arch/unzip/unzip-6.0_p27-r1.ebuild
+++ b/app-arch/unzip/unzip-6.0_p27-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/unzip/unzip-6.0_p29.ebuild b/app-arch/unzip/unzip-6.0_p29.ebuild
index cf7a3eb8d122..ab9eb46e6701 100644
--- a/app-arch/unzip/unzip-6.0_p29.ebuild
+++ b/app-arch/unzip/unzip-6.0_p29.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="
diff --git a/app-arch/xar/xar-1.8.0.0.498-r1.ebuild b/app-arch/xar/xar-1.8.0.0.498-r1.ebuild
index 4d058583dadf..4822c37eece8 100644
--- a/app-arch/xar/xar-1.8.0.0.498-r1.ebuild
+++ b/app-arch/xar/xar-1.8.0.0.498-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${PN}-${APPLE_PV}/${PN}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	elibc_musl? ( sys-libs/fts-standalone )
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.26.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.26.ebuild
index c5e70e124c75..8cb6394ba1cb 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.26.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/app-arch/xz-utils/xz-utils-5.6.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.6.4-r2.ebuild
index 6c1d3903496f..ace89c53efb6 100644
--- a/app-arch/xz-utils/xz-utils-5.6.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.4-r2.ebuild
@@ -37,7 +37,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/xz-utils/xz-utils-5.8.1-r1.ebuild b/app-arch/xz-utils/xz-utils-5.8.1-r1.ebuild
index 3adbb00eb8d2..bd7a75e47f8d 100644
--- a/app-arch/xz-utils/xz-utils-5.8.1-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.8.1-r1.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/xz-utils/xz-utils-5.8.2.ebuild b/app-arch/xz-utils/xz-utils-5.8.2.ebuild
index a2ec8bb54fdb..5ba70b466d28 100644
--- a/app-arch/xz-utils/xz-utils-5.8.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.8.2.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index a2ec8bb54fdb..5ba70b466d28 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/zip/zip-3.0-r7.ebuild b/app-arch/zip/zip-3.0-r7.ebuild
index 68978086f45e..88e591917a26 100644
--- a/app-arch/zip/zip-3.0-r7.ebuild
+++ b/app-arch/zip/zip-3.0-r7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="bzip2 crypt natspec unicode"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild
index 531b61c211c8..79c4b3dc6ead 100644
--- a/app-arch/zoo/zoo-2.10-r6.ebuild
+++ b/app-arch/zoo/zoo-2.10-r6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}.orig
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 
 PATCHES=(
 	"${WORKDIR}"/debian/patches/.
diff --git a/app-arch/zopfli/zopfli-1.0.3.ebuild b/app-arch/zopfli/zopfli-1.0.3.ebuild
index 21c66530858f..29cd31dcae06 100644
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )
 
diff --git a/app-arch/zstd/zstd-1.5.7-r1.ebuild b/app-arch/zstd/zstd-1.5.7-r1.ebuild
index 16847361f0ee..e959be84b165 100644
--- a/app-arch/zstd/zstd-1.5.7-r1.ebuild
+++ b/app-arch/zstd/zstd-1.5.7-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+lzma lz4 static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/zstd/zstd-1.5.7.ebuild b/app-arch/zstd/zstd-1.5.7.ebuild
index e502261b8ba5..218407304083 100644
--- a/app-arch/zstd/zstd-1.5.7.ebuild
+++ b/app-arch/zstd/zstd-1.5.7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+lzma lz4 static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-backup/dar/dar-2.8.1-r1.ebuild b/app-backup/dar/dar-2.8.1-r1.ebuild
index 99649d5afc32..8aae81dd530e 100644
--- a/app-backup/dar/dar-2.8.1-r1.ebuild
+++ b/app-backup/dar/dar-2.8.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync sftp whirlpool xattr"
 
 REQUIRED_USE="
diff --git a/app-backup/dar/dar-2.8.2.ebuild b/app-backup/dar/dar-2.8.2.ebuild
index 0c60ab0a1cce..b89fc3a2e701 100644
--- a/app-backup/dar/dar-2.8.2.ebuild
+++ b/app-backup/dar/dar-2.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync sftp whirlpool xattr"
 
 REQUIRED_USE="
diff --git a/app-backup/duplicity/duplicity-3.0.5-r1.ebuild b/app-backup/duplicity/duplicity-3.0.5-r1.ebuild
index 1599c6ca2dd2..57c15f286be8 100644
--- a/app-backup/duplicity/duplicity-3.0.5-r1.ebuild
+++ b/app-backup/duplicity/duplicity-3.0.5-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-rel.${PV}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 x86 ~x64-macos"
 IUSE="s3 test"
 
 COMMON_DEPEND="
diff --git a/app-backup/duplicity/duplicity-3.0.6.3-r1.ebuild b/app-backup/duplicity/duplicity-3.0.6.3-r1.ebuild
index 04d5fc69a92f..dc78dd189f26 100644
--- a/app-backup/duplicity/duplicity-3.0.6.3-r1.ebuild
+++ b/app-backup/duplicity/duplicity-3.0.6.3-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/${PN}-rel.${PV}.tar.bz2"
 	S="${WORKDIR}"/${PN}-rel.${PV}
 
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-backup/duplicity/duplicity-9999.ebuild b/app-backup/duplicity/duplicity-9999.ebuild
index 04d5fc69a92f..dc78dd189f26 100644
--- a/app-backup/duplicity/duplicity-9999.ebuild
+++ b/app-backup/duplicity/duplicity-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/${PN}-rel.${PV}.tar.bz2"
 	S="${WORKDIR}"/${PN}-rel.${PV}
 
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild
index 664ec60803c7..767bc4d742f3 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rdiff-backup.net/ https://github.com/rdiff-backup/rdiff-backup
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~x64-macos"
 # Tests use a tox environment and separate steps for test env preparation
 RESTRICT="test"
 
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
index 64dcd6ed54ef..14fc1962098b 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${PN%2}-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+cairo"
 
 REQUIRED_USE="cairo? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild b/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
index ecce7034aca7..310b051c80a3 100644
--- a/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
+++ b/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~mips x86 ~x64-macos"
 IUSE="debug idleconn"
 
 DEPEND="
diff --git a/app-benchmarks/httperf/httperf-0.9.1_p20201206-r1.ebuild b/app-benchmarks/httperf/httperf-0.9.1_p20201206-r1.ebuild
index 54927299dd48..76075c75b9ed 100644
--- a/app-benchmarks/httperf/httperf-0.9.1_p20201206-r1.ebuild
+++ b/app-benchmarks/httperf/httperf-0.9.1_p20201206-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${HTTPERF_COMMIT}"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~mips ~x86 ~x64-macos"
 IUSE="debug idleconn"
 
 DEPEND="
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild
index 2465f0a29645..b4ae4ea0efde 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 IUSE="policykit qt6"
 
diff --git a/app-benchmarks/ioping/ioping-1.3.ebuild b/app-benchmarks/ioping/ioping-1.3.ebuild
index d466ce4f1b5c..7c7e4a4ba4d1 100644
--- a/app-benchmarks/ioping/ioping-1.3.ebuild
+++ b/app-benchmarks/ioping/ioping-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/koct9i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/app-benchmarks/pipebench/pipebench-0.40-r3.ebuild b/app-benchmarks/pipebench/pipebench-0.40-r3.ebuild
index d4538c458b53..e2c05a8a7361 100644
--- a/app-benchmarks/pipebench/pipebench-0.40-r3.ebuild
+++ b/app-benchmarks/pipebench/pipebench-0.40-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.habets.pp.se/synscan/files/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.40-fix-build-system.patch
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild
index 93024872c4d1..a9c9d0720823 100644
--- a/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild
+++ b/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 
 PATCHES=( "${FILESDIR}"/${P}-segfault.patch )
 
diff --git a/app-cdr/bchunk/bchunk-1.2.2-r1.ebuild b/app-cdr/bchunk/bchunk-1.2.2-r1.ebuild
index a2755c40e43a..5905c77f72eb 100644
--- a/app-cdr/bchunk/bchunk-1.2.2-r1.ebuild
+++ b/app-cdr/bchunk/bchunk-1.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://he.fi/bchunk/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86 ~x64-macos"
 
 src_compile() {
 	emake \
diff --git a/app-cdr/bin2iso/bin2iso-19b-r3.ebuild b/app-cdr/bin2iso/bin2iso-19b-r3.ebuild
index 66d8882f6ad9..84856a537549 100644
--- a/app-cdr/bin2iso/bin2iso-19b-r3.ebuild
+++ b/app-cdr/bin2iso/bin2iso-19b-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sanity-checks.patch
diff --git a/app-cdr/ccd2iso/ccd2iso-0.3-r2.ebuild b/app-cdr/ccd2iso/ccd2iso-0.3-r2.ebuild
index 34e35db87e37..89649d0796b9 100644
--- a/app-cdr/ccd2iso/ccd2iso-0.3-r2.ebuild
+++ b/app-cdr/ccd2iso/ccd2iso-0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/ccd2iso/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc x86 ~x64-macos"
 
 PATCHES=( "${FILESDIR}"/${P}-headers.patch )
 
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r5.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r5.ebuild
index 45ca191ace42..6eca1f708670 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r5.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r5.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_alpha[0-9][0-9]}
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild b/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild
index bbdc955814b5..540dd6dd3a34 100644
--- a/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild
+++ b/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/svend/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 src_prepare() {
 	default
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
index 541b268dee0b..8fba35888830 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="app-cdr/cdrtools"
 DEPEND="${RDEPEND}
diff --git a/app-cdr/nrg2iso/nrg2iso-0.4.1.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4.1.ebuild
index 0aff433d15de..6154bb1c5298 100644
--- a/app-cdr/nrg2iso/nrg2iso-0.4.1.ebuild
+++ b/app-cdr/nrg2iso/nrg2iso-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild
index 95afbf07a674..0893536d94b4 100644
--- a/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-containers/apptainer/apptainer-1.4.2.ebuild b/app-containers/apptainer/apptainer-1.4.2.ebuild
index e26ad016c1d5..c1bc2a85ee4d 100644
--- a/app-containers/apptainer/apptainer-1.4.2.ebuild
+++ b/app-containers/apptainer/apptainer-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="+network rootless +seccomp suid systemd"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/app-containers/apptainer/apptainer-1.4.3.ebuild b/app-containers/apptainer/apptainer-1.4.3.ebuild
index e26ad016c1d5..c1bc2a85ee4d 100644
--- a/app-containers/apptainer/apptainer-1.4.3.ebuild
+++ b/app-containers/apptainer/apptainer-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="+network rootless +seccomp suid systemd"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/app-containers/apptainer/apptainer-1.4.5.ebuild b/app-containers/apptainer/apptainer-1.4.5.ebuild
index 93464060d5fc..bf792688ffae 100644
--- a/app-containers/apptainer/apptainer-1.4.5.ebuild
+++ b/app-containers/apptainer/apptainer-1.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="+network rootless +seccomp suid systemd"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/app-crypt/aespipe/aespipe-2.4f-r1.ebuild b/app-crypt/aespipe/aespipe-2.4f-r1.ebuild
index d1b92e2ae0fb..a5dad1199351 100644
--- a/app-crypt/aespipe/aespipe-2.4f-r1.ebuild
+++ b/app-crypt/aespipe/aespipe-2.4f-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_padlock static"
 
 RDEPEND="
diff --git a/app-crypt/aespipe/aespipe-2.4j.ebuild b/app-crypt/aespipe/aespipe-2.4j.ebuild
index a634ad6cca06..f763a6de7870 100644
--- a/app-crypt/aespipe/aespipe-2.4j.ebuild
+++ b/app-crypt/aespipe/aespipe-2.4j.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_padlock static"
 
 RDEPEND="
diff --git a/app-crypt/argon2/argon2-20190702-r1.ebuild b/app-crypt/argon2/argon2-20190702-r1.ebuild
index 32604c550e2f..7ac7b4606494 100644
--- a/app-crypt/argon2/argon2-20190702-r1.ebuild
+++ b/app-crypt/argon2/argon2-20190702-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 DOCS=( argon2-specs.pdf CHANGELOG.md README.md )
diff --git a/app-crypt/bsign/bsign-0.4.5-r1.ebuild b/app-crypt/bsign/bsign-0.4.5-r1.ebuild
index 8725fdd801f6..2c92c26ee857 100644
--- a/app-crypt/bsign/bsign-0.4.5-r1.ebuild
+++ b/app-crypt/bsign/bsign-0.4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/b/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/app-crypt/ccrypt/ccrypt-1.11-r4.ebuild b/app-crypt/ccrypt/ccrypt-1.11-r4.ebuild
index e76cf51aaeef..89911665251d 100644
--- a/app-crypt/ccrypt/ccrypt-1.11-r4.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.11-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="emacs"
 
 RDEPEND="virtual/libcrypt:="
diff --git a/app-crypt/freepg/freepg-2.5.14.ebuild b/app-crypt/freepg/freepg-2.5.14.ebuild
index e0b943ad4721..f3728eaedb89 100644
--- a/app-crypt/freepg/freepg-2.5.14.ebuild
+++ b/app-crypt/freepg/freepg-2.5.14.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
diff --git a/app-crypt/gcr/gcr-3.41.2-r2.ebuild b/app-crypt/gcr/gcr-3.41.2-r2.ebuild
index 4b043045aa7f..30424c89da3d 100644
--- a/app-crypt/gcr/gcr-3.41.2-r2.ebuild
+++ b/app-crypt/gcr/gcr-3.41.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
 
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection systemd test +vala wayland X"
 REQUIRED_USE="
diff --git a/app-crypt/gcr/gcr-4.2.1.ebuild b/app-crypt/gcr/gcr-4.2.1.ebuild
index 6bc476fa006e..85c739884806 100644
--- a/app-crypt/gcr/gcr-4.2.1.ebuild
+++ b/app-crypt/gcr/gcr-4.2.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4/gcr-4.4-gck-2.2" # subslot = soname and soversion of libgcr and libgck
 
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection systemd test +vala"
 REQUIRED_USE="
diff --git a/app-crypt/gcr/gcr-4.3.0.ebuild b/app-crypt/gcr/gcr-4.3.0.ebuild
index 442fa03286b3..b00aae6a2242 100644
--- a/app-crypt/gcr/gcr-4.3.0.ebuild
+++ b/app-crypt/gcr/gcr-4.3.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4/gcr-4.4-gck-2.2" # subslot = soname and soversion of libgcr and libgck
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="gnutls gtk gtk-doc +introspection systemd test +vala"
 REQUIRED_USE="
diff --git a/app-crypt/gcr/gcr-4.3.1.ebuild b/app-crypt/gcr/gcr-4.3.1.ebuild
index 635977bbb60e..119f08d9f1b1 100644
--- a/app-crypt/gcr/gcr-4.3.1.ebuild
+++ b/app-crypt/gcr/gcr-4.3.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4/gcr-4.4-gck-2.2" # subslot = soname and soversion of libgcr and libgck
 
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gnutls gtk gtk-doc +introspection systemd test +vala"
 REQUIRED_USE="
diff --git a/app-crypt/gcr/gcr-4.4.0.1-r1.ebuild b/app-crypt/gcr/gcr-4.4.0.1-r1.ebuild
index eb0796ba113b..33d34b3fbaca 100644
--- a/app-crypt/gcr/gcr-4.4.0.1-r1.ebuild
+++ b/app-crypt/gcr/gcr-4.4.0.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4/gcr-4.4-gck-2.2" # subslot = soname and soversion of libgcr and libgck
 
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gnutls gtk gtk-doc +introspection systemd test +vala"
 REQUIRED_USE="
diff --git a/app-crypt/gnupg/gnupg-2.2.45-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.45-r1.ebuild
index df703ecdb166..11f3c0996841 100644
--- a/app-crypt/gnupg/gnupg-2.2.45-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.45-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/gnupg/gnupg-2.4.8-r1.ebuild b/app-crypt/gnupg/gnupg-2.4.8-r1.ebuild
index e31546121113..0ed75a78cb8f 100644
--- a/app-crypt/gnupg/gnupg-2.4.8-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.8-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+alternatives bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
diff --git a/app-crypt/gnupg/gnupg-2.4.8-r2.ebuild b/app-crypt/gnupg/gnupg-2.4.8-r2.ebuild
index 92901f572042..e236a149b2da 100644
--- a/app-crypt/gnupg/gnupg-2.4.8-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.8-r2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+alternatives bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
diff --git a/app-crypt/gnupg/gnupg-2.5.12-r1.ebuild b/app-crypt/gnupg/gnupg-2.5.12-r1.ebuild
index c15e65f2929c..2b2a392d69df 100644
--- a/app-crypt/gnupg/gnupg-2.5.12-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.5.12-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
diff --git a/app-crypt/gnupg/gnupg-2.5.13-r1.ebuild b/app-crypt/gnupg/gnupg-2.5.13-r1.ebuild
index 6b3033db3238..bca264d170b3 100644
--- a/app-crypt/gnupg/gnupg-2.5.13-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.5.13-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+alternatives bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
diff --git a/app-crypt/gnupg/gnupg-2.5.13-r2.ebuild b/app-crypt/gnupg/gnupg-2.5.13-r2.ebuild
index 4909d3f1b266..12415fb9ce81 100644
--- a/app-crypt/gnupg/gnupg-2.5.13-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.5.13-r2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+alternatives bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
diff --git a/app-crypt/gnupg/gnupg-2.5.14.ebuild b/app-crypt/gnupg/gnupg-2.5.14.ebuild
index 01cecc51e327..391625c29b24 100644
--- a/app-crypt/gnupg/gnupg-2.5.14.ebuild
+++ b/app-crypt/gnupg/gnupg-2.5.14.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+alternatives bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
diff --git a/app-crypt/gpgme/gpgme-2.0.0.ebuild b/app-crypt/gpgme/gpgme-2.0.0.ebuild
index fc4387ddba51..2749511cd9b1 100644
--- a/app-crypt/gpgme/gpgme-2.0.0.ebuild
+++ b/app-crypt/gpgme/gpgme-2.0.0.ebuild
@@ -27,7 +27,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
 # Subslot: SONAME of each: <libgpgme.FUDGE>
 SLOT="1/45.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="common-lisp static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/gpgme/gpgme-2.0.1-r1.ebuild b/app-crypt/gpgme/gpgme-2.0.1-r1.ebuild
index 8aae57b9935c..4e90ec30ec8b 100644
--- a/app-crypt/gpgme/gpgme-2.0.1-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-2.0.1-r1.ebuild
@@ -27,7 +27,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
 # Subslot: SONAME of each: <libgpgme.FUDGE>
 SLOT="1/45.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="common-lisp static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
index 201bd4a5ea03..3e1a37b8cd96 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
@@ -16,7 +16,7 @@ else
 	HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216-r1.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216-r1.ebuild
index 097f890b2640..3f4067d85aca 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216-r1.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250216-r1.ebuild
@@ -16,7 +16,7 @@ else
 	HASH_COMMIT="8a72b12fe6e1626ef6014e5a190b9d1f69a9edde"
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
index 7d840cfe4e59..f1d9d3663e20 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20250703.ebuild
@@ -16,7 +16,7 @@ else
 	HASH_COMMIT="b27f951a8e191210685c8421c90ca610cdd39dce"
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 7d840cfe4e59..f1d9d3663e20 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -16,7 +16,7 @@ else
 	HASH_COMMIT="b27f951a8e191210685c8421c90ca610cdd39dce"
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild
index 1074d9cfbfa2..c5ad79e8ba67 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
diff --git a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
index d693db78e443..3dac4bc2d91b 100644
--- a/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
diff --git a/app-crypt/keylookup/keylookup-2.2-r1.ebuild b/app-crypt/keylookup/keylookup-2.2-r1.ebuild
index 791c5da15e69..91d0fcc02780 100644
--- a/app-crypt/keylookup/keylookup-2.2-r1.ebuild
+++ b/app-crypt/keylookup/keylookup-2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.palfrader.org/keylookup/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 85f86d30df01..f6aafb8605d8 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libmd/libmd-1.0.4.ebuild b/app-crypt/libmd/libmd-1.0.4.ebuild
index 5ad9111840e9..c3a80c799a28 100644
--- a/app-crypt/libmd/libmd-1.0.4.ebuild
+++ b/app-crypt/libmd/libmd-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-version-script-linker-support-detection.patch"
diff --git a/app-crypt/libmd/libmd-1.1.0.ebuild b/app-crypt/libmd/libmd-1.1.0.ebuild
index a814533d6f69..7b7ee9176d3f 100644
--- a/app-crypt/libmd/libmd-1.1.0.ebuild
+++ b/app-crypt/libmd/libmd-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
diff --git a/app-crypt/md5deep/md5deep-4.4.ebuild b/app-crypt/md5deep/md5deep-4.4.ebuild
index 08dcc2323fbd..f76fa3e750fe 100644
--- a/app-crypt/md5deep/md5deep-4.4.ebuild
+++ b/app-crypt/md5deep/md5deep-4.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/hashdeep-release-${PV}"
 
 LICENSE="public-domain GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ~ppc64 x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-4.4-pointer-comparison.patch )
 
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild
index 78134a9c4670..4d3ffb5106fe 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl" # pod2html
diff --git a/app-crypt/p11-kit/p11-kit-0.25.10.ebuild b/app-crypt/p11-kit/p11-kit-0.25.10.ebuild
index 641c730f2951..3ef5cea73068 100644
--- a/app-crypt/p11-kit/p11-kit-0.25.10.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+libffi gtk-doc nls systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/p11-kit/p11-kit-0.25.5.ebuild b/app-crypt/p11-kit/p11-kit-0.25.5.ebuild
index 26f1ff09bc68..fa41b20915ff 100644
--- a/app-crypt/p11-kit/p11-kit-0.25.5.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+libffi gtk-doc nls systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/pinentry/pinentry-1.3.1-r1.ebuild b/app-crypt/pinentry/pinentry-1.3.1-r1.ebuild
index 59e717ac480d..700fcdeb7389 100644
--- a/app-crypt/pinentry/pinentry-1.3.1-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="caps efl emacs gtk keyring ncurses qt6 wayland X"
 
 DEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild b/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild
index 5ec89652ba7b..6f36bf8224c6 100644
--- a/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="caps efl emacs gtk keyring ncurses qt6 wayland X"
 
 DEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.3.2.ebuild b/app-crypt/pinentry/pinentry-1.3.2.ebuild
index 8225d37f4d2f..30637c283705 100644
--- a/app-crypt/pinentry/pinentry-1.3.2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="caps efl emacs gtk keyring ncurses qt6 wayland X"
 
 DEPEND="
diff --git a/app-crypt/qca/qca-2.3.10-r1.ebuild b/app-crypt/qca/qca-2.3.10-r1.ebuild
index 74b616112131..e8fed49a8897 100644
--- a/app-crypt/qca/qca-2.3.10-r1.ebuild
+++ b/app-crypt/qca/qca-2.3.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/rhash/rhash-1.4.5.ebuild b/app-crypt/rhash/rhash-1.4.5.ebuild
index c184f1a1afed..78b6aee79d2e 100644
--- a/app-crypt/rhash/rhash-1.4.5.ebuild
+++ b/app-crypt/rhash/rhash-1.4.5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/RHash-${PV}"
 
 LICENSE="0BSD"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="debug nls ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.6-r1.ebuild b/app-crypt/rhash/rhash-1.4.6-r1.ebuild
index bdaf68b2e192..5e55e113ad4b 100644
--- a/app-crypt/rhash/rhash-1.4.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.4.6-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/RHash-${PV}"
 
 LICENSE="0BSD"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="cpu_flags_x86_sha debug nls ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/rotix/rotix-0.83-r3.ebuild b/app-crypt/rotix/rotix-0.83-r3.ebuild
index bafff55388fd..dae84005ea6a 100644
--- a/app-crypt/rotix/rotix-0.83-r3.ebuild
+++ b/app-crypt/rotix/rotix-0.83-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-crypt/shash/shash-0.2.6-r4.ebuild b/app-crypt/shash/shash-0.2.6-r4.ebuild
index 68e4246c72f4..217b6ed127f4 100644
--- a/app-crypt/shash/shash-0.2.6-r4.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static"
 
 DEPEND="
diff --git a/app-crypt/xca/xca-2.8.0.ebuild b/app-crypt/xca/xca-2.8.0.ebuild
index 98ec522d732e..cb3893147efa 100644
--- a/app-crypt/xca/xca-2.8.0.ebuild
+++ b/app-crypt/xca/xca-2.8.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/xca-RELEASE.${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-crypt/xca/xca-2.9.0-r1.ebuild b/app-crypt/xca/xca-2.9.0-r1.ebuild
index e6e9e5dc5167..5c5ed9fe5c77 100644
--- a/app-crypt/xca/xca-2.9.0-r1.ebuild
+++ b/app-crypt/xca/xca-2.9.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/xca-RELEASE.${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-crypt/xca/xca-2.9.0.ebuild b/app-crypt/xca/xca-2.9.0.ebuild
index 98ec522d732e..cb3893147efa 100644
--- a/app-crypt/xca/xca-2.9.0.ebuild
+++ b/app-crypt/xca/xca-2.9.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/xca-RELEASE.${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-dicts/aspell-nl/aspell-nl-0.50.2-r1.ebuild b/app-dicts/aspell-nl/aspell-nl-0.50.2-r1.ebuild
index 440f2ac07089..7b295ef2c473 100644
--- a/app-dicts/aspell-nl/aspell-nl-0.50.2-r1.ebuild
+++ b/app-dicts/aspell-nl/aspell-nl-0.50.2-r1.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Dutch"
 inherit aspell-dict-r1
 
 LICENSE="freedist"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/app-dicts/aspell-sv/aspell-sv-0.51.0-r1.ebuild b/app-dicts/aspell-sv/aspell-sv-0.51.0-r1.ebuild
index 829ba6843510..dc1c5888a210 100644
--- a/app-dicts/aspell-sv/aspell-sv-0.51.0-r1.ebuild
+++ b/app-dicts/aspell-sv/aspell-sv-0.51.0-r1.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Swedish"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
index 1b363678d704..b07b32fbff94 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0" # does not provide a public libgdict-1.0.so anymore
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.42:2
diff --git a/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild b/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
index 7d9eb8bc29d0..bf8678bb43fb 100644
--- a/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
+++ b/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/24435/${P}.tar.gz"
 
 LICENSE="ipadic"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86"
 
 BDEPEND=">=app-text/chasen-2.3.1"
 
diff --git a/app-dicts/migemo-dict/migemo-dict-202402.ebuild b/app-dicts/migemo-dict/migemo-dict-202402.ebuild
index 63bea23db353..5826e50a3810 100644
--- a/app-dicts/migemo-dict/migemo-dict-202402.ebuild
+++ b/app-dicts/migemo-dict/migemo-dict-202402.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="unicode"
 
 src_configure() {
diff --git a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild b/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
index 173057c59c7a..8cb60058ac08 100644
--- a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
+++ b/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
@@ -16,4 +16,4 @@ SRC_URI="https://downloads.sourceforge.net/aoo-extensions/geiriadur-cy.oxt -> ${
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
diff --git a/app-dicts/myspell-en/myspell-en-20250401.ebuild b/app-dicts/myspell-en/myspell-en-20250401.ebuild
index 0d16d38d3ce9..2fd317bb3e7a 100644
--- a/app-dicts/myspell-en/myspell-en-20250401.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20250401.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1743477350/dict-
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 PLOCALES=( "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
 IUSE="${PLOCALES[*]/#/+l10n_}"
diff --git a/app-dicts/myspell-fr/myspell-fr-7.0-r1.ebuild b/app-dicts/myspell-fr/myspell-fr-7.0-r1.ebuild
index 75bd56a9ba09..0df604674d51 100644
--- a/app-dicts/myspell-fr/myspell-fr-7.0-r1.ebuild
+++ b/app-dicts/myspell-fr/myspell-fr-7.0-r1.ebuild
@@ -35,7 +35,7 @@ SRC_URI="https://grammalecte.net/grammalecte/oxt/lo-oo-ressources-linguistiques-
 
 LICENSE="MPL-2.0 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-ru/myspell-ru-20200606.ebuild b/app-dicts/myspell-ru/myspell-ru-20200606.ebuild
index 086f2b72fdad..653f56e6f871 100644
--- a/app-dicts/myspell-ru/myspell-ru-20200606.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20200606.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/48/${MY_PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 src_prepare() {
 	default
diff --git a/app-dicts/wordnet/wordnet-3.1-r1.ebuild b/app-dicts/wordnet/wordnet-3.1-r1.ebuild
index 5aea279a390f..4f39ebbcd668 100644
--- a/app-dicts/wordnet/wordnet-3.1-r1.ebuild
+++ b/app-dicts/wordnet/wordnet-3.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/WordNet-3.0"
 
 LICENSE="Princeton"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
 
 # In contrast to what the configure script seems to imply, Tcl/Tk is NOT
 # optional. cf. bug 163478 for details. (Yes, it's about 2.1 but it's
diff --git a/app-doc/blas-docs/blas-docs-3.1.1.ebuild b/app-doc/blas-docs/blas-docs-3.1.1.ebuild
index 0132843e31f5..a90d65ea6178 100644
--- a/app-doc/blas-docs/blas-docs-3.1.1.ebuild
+++ b/app-doc/blas-docs/blas-docs-3.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/lapack-man-${PV}.tgz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 S=${WORKDIR}/lapack-${PV}/manpages
diff --git a/app-doc/eclass-manpages/eclass-manpages-20250711.ebuild b/app-doc/eclass-manpages/eclass-manpages-20250711.ebuild
index 6c3c1fbe2f3b..7a6c8d8b6f16 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20250711.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20250711.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="sys-apps/gawk"
 
diff --git a/app-doc/eclass-manpages/eclass-manpages-20250730.ebuild b/app-doc/eclass-manpages/eclass-manpages-20250730.ebuild
index 6c3c1fbe2f3b..7a6c8d8b6f16 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20250730.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20250730.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="sys-apps/gawk"
 
diff --git a/app-doc/eclass-manpages/eclass-manpages-20250815.ebuild b/app-doc/eclass-manpages/eclass-manpages-20250815.ebuild
index 6c3c1fbe2f3b..7a6c8d8b6f16 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20250815.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20250815.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="sys-apps/gawk"
 
diff --git a/app-doc/eclass-manpages/eclass-manpages-20251126.ebuild b/app-doc/eclass-manpages/eclass-manpages-20251126.ebuild
index 6c3c1fbe2f3b..7a6c8d8b6f16 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20251126.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20251126.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="sys-apps/gawk"
 
diff --git a/app-doc/geant-docs/geant-docs-4.11.4.ebuild b/app-doc/geant-docs/geant-docs-4.11.4.ebuild
index a2a8aa577585..ad41a796ffcc 100644
--- a/app-doc/geant-docs/geant-docs-4.11.4.ebuild
+++ b/app-doc/geant-docs/geant-docs-4.11.4.ebuild
@@ -29,7 +29,7 @@ S="${DISTDIR}"
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86"
 
 src_unpack() {
 		: # empty, nothing to unpack
diff --git a/app-doc/info-manual/info-manual-30.2.ebuild b/app-doc/info-manual/info-manual-30.2.ebuild
index 198ac7cf1398..5184a14878f2 100644
--- a/app-doc/info-manual/info-manual-30.2.ebuild
+++ b/app-doc/info-manual/info-manual-30.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="FDL-1.3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_install() {
 	doinfo info.info
diff --git a/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild b/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
index af2968a0ad12..d76ff6a62795 100644
--- a/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
+++ b/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/lapack-man-${PV}.tgz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 S="${WORKDIR}/lapack-${PV}/manpages"
diff --git a/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild b/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
index 7a5985f84436..32b8f9d4de87 100644
--- a/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
+++ b/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://wh0rd.org/books/${P}.tar.lzma"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc"
 RESTRICT="mirror bindist"
 
diff --git a/app-doc/mathjax-docs/mathjax-docs-3.2.2.ebuild b/app-doc/mathjax-docs/mathjax-docs-3.2.2.ebuild
index 0c57280e413f..171e25d39dde 100644
--- a/app-doc/mathjax-docs/mathjax-docs-3.2.2.ebuild
+++ b/app-doc/mathjax-docs/mathjax-docs-3.2.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/MathJax-docs-${COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	$(python_gen_any_dep '
diff --git a/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r4.ebuild b/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r4.ebuild
index 57e12f64db62..e62a692f6f3b 100644
--- a/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r4.ebuild
+++ b/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r4.ebuild
@@ -11,6 +11,6 @@ S="${WORKDIR}"
 
 LICENSE="OPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 
 DOCS="*.pdf"
diff --git a/app-doc/phrack-all/phrack-all-71.ebuild b/app-doc/phrack-all/phrack-all-71.ebuild
index 0ce3a35863d3..2303fc2cff51 100644
--- a/app-doc/phrack-all/phrack-all-71.ebuild
+++ b/app-doc/phrack-all/phrack-all-71.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 printf -v RDEPEND '~app-doc/phrack-%02i ' {1..71}
diff --git a/app-doc/phrack/phrack-01.ebuild b/app-doc/phrack/phrack-01.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-01.ebuild
+++ b/app-doc/phrack/phrack-01.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-02.ebuild b/app-doc/phrack/phrack-02.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-02.ebuild
+++ b/app-doc/phrack/phrack-02.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-03.ebuild b/app-doc/phrack/phrack-03.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-03.ebuild
+++ b/app-doc/phrack/phrack-03.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-04.ebuild b/app-doc/phrack/phrack-04.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-04.ebuild
+++ b/app-doc/phrack/phrack-04.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-05.ebuild b/app-doc/phrack/phrack-05.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-05.ebuild
+++ b/app-doc/phrack/phrack-05.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-06.ebuild b/app-doc/phrack/phrack-06.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-06.ebuild
+++ b/app-doc/phrack/phrack-06.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-07.ebuild b/app-doc/phrack/phrack-07.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-07.ebuild
+++ b/app-doc/phrack/phrack-07.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-08.ebuild b/app-doc/phrack/phrack-08.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-08.ebuild
+++ b/app-doc/phrack/phrack-08.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-09.ebuild b/app-doc/phrack/phrack-09.ebuild
index dca954eb824f..52eedc8566af 100644
--- a/app-doc/phrack/phrack-09.ebuild
+++ b/app-doc/phrack/phrack-09.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-10-r1.ebuild b/app-doc/phrack/phrack-10-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-10-r1.ebuild
+++ b/app-doc/phrack/phrack-10-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-11-r1.ebuild b/app-doc/phrack/phrack-11-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-11-r1.ebuild
+++ b/app-doc/phrack/phrack-11-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-12-r1.ebuild b/app-doc/phrack/phrack-12-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-12-r1.ebuild
+++ b/app-doc/phrack/phrack-12-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-13-r1.ebuild b/app-doc/phrack/phrack-13-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-13-r1.ebuild
+++ b/app-doc/phrack/phrack-13-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-14-r1.ebuild b/app-doc/phrack/phrack-14-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-14-r1.ebuild
+++ b/app-doc/phrack/phrack-14-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-15-r1.ebuild b/app-doc/phrack/phrack-15-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-15-r1.ebuild
+++ b/app-doc/phrack/phrack-15-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-16-r1.ebuild b/app-doc/phrack/phrack-16-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-16-r1.ebuild
+++ b/app-doc/phrack/phrack-16-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-17-r1.ebuild b/app-doc/phrack/phrack-17-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-17-r1.ebuild
+++ b/app-doc/phrack/phrack-17-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-18-r1.ebuild b/app-doc/phrack/phrack-18-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-18-r1.ebuild
+++ b/app-doc/phrack/phrack-18-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-19-r1.ebuild b/app-doc/phrack/phrack-19-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-19-r1.ebuild
+++ b/app-doc/phrack/phrack-19-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-20-r1.ebuild b/app-doc/phrack/phrack-20-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-20-r1.ebuild
+++ b/app-doc/phrack/phrack-20-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-21-r1.ebuild b/app-doc/phrack/phrack-21-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-21-r1.ebuild
+++ b/app-doc/phrack/phrack-21-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-22-r1.ebuild b/app-doc/phrack/phrack-22-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-22-r1.ebuild
+++ b/app-doc/phrack/phrack-22-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-23-r1.ebuild b/app-doc/phrack/phrack-23-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-23-r1.ebuild
+++ b/app-doc/phrack/phrack-23-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-24-r1.ebuild b/app-doc/phrack/phrack-24-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-24-r1.ebuild
+++ b/app-doc/phrack/phrack-24-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-25-r1.ebuild b/app-doc/phrack/phrack-25-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-25-r1.ebuild
+++ b/app-doc/phrack/phrack-25-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-26-r1.ebuild b/app-doc/phrack/phrack-26-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-26-r1.ebuild
+++ b/app-doc/phrack/phrack-26-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-27-r1.ebuild b/app-doc/phrack/phrack-27-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-27-r1.ebuild
+++ b/app-doc/phrack/phrack-27-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-28-r1.ebuild b/app-doc/phrack/phrack-28-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-28-r1.ebuild
+++ b/app-doc/phrack/phrack-28-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-29-r1.ebuild b/app-doc/phrack/phrack-29-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-29-r1.ebuild
+++ b/app-doc/phrack/phrack-29-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-30-r1.ebuild b/app-doc/phrack/phrack-30-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-30-r1.ebuild
+++ b/app-doc/phrack/phrack-30-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-31-r1.ebuild b/app-doc/phrack/phrack-31-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-31-r1.ebuild
+++ b/app-doc/phrack/phrack-31-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-32-r1.ebuild b/app-doc/phrack/phrack-32-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-32-r1.ebuild
+++ b/app-doc/phrack/phrack-32-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-33-r1.ebuild b/app-doc/phrack/phrack-33-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-33-r1.ebuild
+++ b/app-doc/phrack/phrack-33-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-34-r1.ebuild b/app-doc/phrack/phrack-34-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-34-r1.ebuild
+++ b/app-doc/phrack/phrack-34-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-35-r1.ebuild b/app-doc/phrack/phrack-35-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-35-r1.ebuild
+++ b/app-doc/phrack/phrack-35-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-36-r1.ebuild b/app-doc/phrack/phrack-36-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-36-r1.ebuild
+++ b/app-doc/phrack/phrack-36-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-37-r1.ebuild b/app-doc/phrack/phrack-37-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-37-r1.ebuild
+++ b/app-doc/phrack/phrack-37-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-38-r1.ebuild b/app-doc/phrack/phrack-38-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-38-r1.ebuild
+++ b/app-doc/phrack/phrack-38-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-39-r1.ebuild b/app-doc/phrack/phrack-39-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-39-r1.ebuild
+++ b/app-doc/phrack/phrack-39-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-40-r1.ebuild b/app-doc/phrack/phrack-40-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-40-r1.ebuild
+++ b/app-doc/phrack/phrack-40-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-41-r1.ebuild b/app-doc/phrack/phrack-41-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-41-r1.ebuild
+++ b/app-doc/phrack/phrack-41-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-42-r1.ebuild b/app-doc/phrack/phrack-42-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-42-r1.ebuild
+++ b/app-doc/phrack/phrack-42-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-43-r1.ebuild b/app-doc/phrack/phrack-43-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-43-r1.ebuild
+++ b/app-doc/phrack/phrack-43-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-44-r1.ebuild b/app-doc/phrack/phrack-44-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-44-r1.ebuild
+++ b/app-doc/phrack/phrack-44-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-45-r1.ebuild b/app-doc/phrack/phrack-45-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-45-r1.ebuild
+++ b/app-doc/phrack/phrack-45-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-46-r1.ebuild b/app-doc/phrack/phrack-46-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-46-r1.ebuild
+++ b/app-doc/phrack/phrack-46-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-47-r1.ebuild b/app-doc/phrack/phrack-47-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-47-r1.ebuild
+++ b/app-doc/phrack/phrack-47-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-48-r1.ebuild b/app-doc/phrack/phrack-48-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-48-r1.ebuild
+++ b/app-doc/phrack/phrack-48-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-49-r1.ebuild b/app-doc/phrack/phrack-49-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-49-r1.ebuild
+++ b/app-doc/phrack/phrack-49-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-50-r1.ebuild b/app-doc/phrack/phrack-50-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-50-r1.ebuild
+++ b/app-doc/phrack/phrack-50-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-51-r1.ebuild b/app-doc/phrack/phrack-51-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-51-r1.ebuild
+++ b/app-doc/phrack/phrack-51-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-52-r1.ebuild b/app-doc/phrack/phrack-52-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-52-r1.ebuild
+++ b/app-doc/phrack/phrack-52-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-53-r1.ebuild b/app-doc/phrack/phrack-53-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-53-r1.ebuild
+++ b/app-doc/phrack/phrack-53-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-54-r1.ebuild b/app-doc/phrack/phrack-54-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-54-r1.ebuild
+++ b/app-doc/phrack/phrack-54-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-55-r1.ebuild b/app-doc/phrack/phrack-55-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-55-r1.ebuild
+++ b/app-doc/phrack/phrack-55-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-56-r1.ebuild b/app-doc/phrack/phrack-56-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-56-r1.ebuild
+++ b/app-doc/phrack/phrack-56-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-57-r1.ebuild b/app-doc/phrack/phrack-57-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-57-r1.ebuild
+++ b/app-doc/phrack/phrack-57-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-58-r1.ebuild b/app-doc/phrack/phrack-58-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-58-r1.ebuild
+++ b/app-doc/phrack/phrack-58-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-59-r1.ebuild b/app-doc/phrack/phrack-59-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-59-r1.ebuild
+++ b/app-doc/phrack/phrack-59-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-60-r1.ebuild b/app-doc/phrack/phrack-60-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-60-r1.ebuild
+++ b/app-doc/phrack/phrack-60-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-61-r1.ebuild b/app-doc/phrack/phrack-61-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-61-r1.ebuild
+++ b/app-doc/phrack/phrack-61-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-62-r1.ebuild b/app-doc/phrack/phrack-62-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-62-r1.ebuild
+++ b/app-doc/phrack/phrack-62-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-63-r1.ebuild b/app-doc/phrack/phrack-63-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-63-r1.ebuild
+++ b/app-doc/phrack/phrack-63-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-64-r1.ebuild b/app-doc/phrack/phrack-64-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-64-r1.ebuild
+++ b/app-doc/phrack/phrack-64-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-65-r1.ebuild b/app-doc/phrack/phrack-65-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-65-r1.ebuild
+++ b/app-doc/phrack/phrack-65-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-66-r1.ebuild b/app-doc/phrack/phrack-66-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-66-r1.ebuild
+++ b/app-doc/phrack/phrack-66-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-67-r1.ebuild b/app-doc/phrack/phrack-67-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-67-r1.ebuild
+++ b/app-doc/phrack/phrack-67-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-68-r1.ebuild b/app-doc/phrack/phrack-68-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-68-r1.ebuild
+++ b/app-doc/phrack/phrack-68-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-69-r1.ebuild b/app-doc/phrack/phrack-69-r1.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-69-r1.ebuild
+++ b/app-doc/phrack/phrack-69-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-70.ebuild b/app-doc/phrack/phrack-70.ebuild
index f5ef0c659153..c4a218e150cc 100644
--- a/app-doc/phrack/phrack-70.ebuild
+++ b/app-doc/phrack/phrack-70.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/phrack/phrack-71.ebuild b/app-doc/phrack/phrack-71.ebuild
index efc653a45790..727c0bbba316 100644
--- a/app-doc/phrack/phrack-71.ebuild
+++ b/app-doc/phrack/phrack-71.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="phrack"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	dodoc -r *
diff --git a/app-doc/pms-bin/pms-bin-8_p20210613-r1.ebuild b/app-doc/pms-bin/pms-bin-8_p20210613-r1.ebuild
index 84faae457a8e..eb133bd571a6 100644
--- a/app-doc/pms-bin/pms-bin-8_p20210613-r1.ebuild
+++ b/app-doc/pms-bin/pms-bin-8_p20210613-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/pms-${PV}"
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="html"
 
 RDEPEND="!app-doc/pms"
diff --git a/app-doc/pms-bin/pms-bin-9_p20251214.ebuild b/app-doc/pms-bin/pms-bin-9_p20251214.ebuild
index 3a115f4ec8d6..da275335928c 100644
--- a/app-doc/pms-bin/pms-bin-9_p20251214.ebuild
+++ b/app-doc/pms-bin/pms-bin-9_p20251214.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/pms-${PV}"
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="html"
 
 RDEPEND="!app-doc/pms"
diff --git a/app-doc/pms/pms-8_p20210613-r1.ebuild b/app-doc/pms/pms-8_p20210613-r1.ebuild
index 9c391c22a23c..3847e661012f 100644
--- a/app-doc/pms/pms-8_p20210613-r1.ebuild
+++ b/app-doc/pms/pms-8_p20210613-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="html twoside"
 
 # texlive-bibtexextra for unsrturl.bst
diff --git a/app-doc/pms/pms-9_p20251214.ebuild b/app-doc/pms/pms-9_p20251214.ebuild
index 672b0a2cb591..b77db48270bc 100644
--- a/app-doc/pms/pms-9_p20251214.ebuild
+++ b/app-doc/pms/pms-9_p20251214.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="html twoside"
 
 # texlive-bibtexextra for unsrturl.bst
diff --git a/app-doc/zsh-lovers/zsh-lovers-0.11.0.ebuild b/app-doc/zsh-lovers/zsh-lovers-0.11.0.ebuild
index dd3b0bc2ce59..b4153e273615 100644
--- a/app-doc/zsh-lovers/zsh-lovers-0.11.0.ebuild
+++ b/app-doc/zsh-lovers/zsh-lovers-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://deb.grml.org/pool/main/z/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="app-text/asciidoc"
 
diff --git a/app-editors/aee/aee-2.2.22.ebuild b/app-editors/aee/aee-2.2.22.ebuild
index ddeabf67e145..a751401e5aa6 100644
--- a/app-editors/aee/aee-2.2.22.ebuild
+++ b/app-editors/aee/aee-2.2.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/ports1/aee/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 )"
diff --git a/app-editors/bvi/bvi-1.4.2.ebuild b/app-editors/bvi/bvi-1.4.2.ebuild
index 9f01e70ed4d6..7e9085921e03 100644
--- a/app-editors/bvi/bvi-1.4.2.ebuild
+++ b/app-editors/bvi/bvi-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
diff --git a/app-editors/dav/dav-0.9.0.ebuild b/app-editors/dav/dav-0.9.0.ebuild
index d5177b62d77c..f0f847f5643d 100644
--- a/app-editors/dav/dav-0.9.0.ebuild
+++ b/app-editors/dav/dav-0.9.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dav-text-dav-text-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~riscv x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/ee/ee-1.5.2-r1.ebuild b/app-editors/ee/ee-1.5.2-r1.ebuild
index c8e3699ef061..ff2bd712b24d 100644
--- a/app-editors/ee/ee-1.5.2-r1.ebuild
+++ b/app-editors/ee/ee-1.5.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.src.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/emacs/emacs-26.3-r24.ebuild b/app-editors/emacs/emacs-26.3-r24.ebuild
index a8dc0b664ca8..28eed6c6dba3 100644
--- a/app-editors/emacs/emacs-26.3-r24.ebuild
+++ b/app-editors/emacs/emacs-26.3-r24.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui?]
diff --git a/app-editors/emacs/emacs-27.2-r22.ebuild b/app-editors/emacs/emacs-27.2-r22.ebuild
index 218dade49ff6..e2a623fc0200 100644
--- a/app-editors/emacs/emacs-27.2-r22.ebuild
+++ b/app-editors/emacs/emacs-27.2-r22.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
diff --git a/app-editors/emacs/emacs-28.2-r18.ebuild b/app-editors/emacs/emacs-28.2-r18.ebuild
index 64112f14be37..e30a3fc96a3b 100644
--- a/app-editors/emacs/emacs-28.2-r18.ebuild
+++ b/app-editors/emacs/emacs-28.2-r18.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/emacs/emacs-28.2-r19.ebuild b/app-editors/emacs/emacs-28.2-r19.ebuild
index a8bd98189007..3bb2d99c8b59 100644
--- a/app-editors/emacs/emacs-28.2-r19.ebuild
+++ b/app-editors/emacs/emacs-28.2-r19.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
diff --git a/app-editors/emacs/emacs-29.4-r4.ebuild b/app-editors/emacs/emacs-29.4-r4.ebuild
index 91d23776af1e..b182e2808c7b 100644
--- a/app-editors/emacs/emacs-29.4-r4.ebuild
+++ b/app-editors/emacs/emacs-29.4-r4.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/emacs/emacs-29.4-r5.ebuild b/app-editors/emacs/emacs-29.4-r5.ebuild
index 45c1b92694f9..19aa7cdbce88 100644
--- a/app-editors/emacs/emacs-29.4-r5.ebuild
+++ b/app-editors/emacs/emacs-29.4-r5.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
diff --git a/app-editors/emacs/emacs-30.1-r3.ebuild b/app-editors/emacs/emacs-30.1-r3.ebuild
index e0e1c44bf2a0..04151523aafb 100644
--- a/app-editors/emacs/emacs-30.1-r3.ebuild
+++ b/app-editors/emacs/emacs-30.1-r3.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
diff --git a/app-editors/emacs/emacs-30.2.9999.ebuild b/app-editors/emacs/emacs-30.2.9999.ebuild
index 729139ee086a..4026021e7854 100644
--- a/app-editors/emacs/emacs-30.2.9999.ebuild
+++ b/app-editors/emacs/emacs-30.2.9999.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
diff --git a/app-editors/emacs/emacs-30.2.ebuild b/app-editors/emacs/emacs-30.2.ebuild
index 111edc6baf3e..b287e99c6cc1 100644
--- a/app-editors/emacs/emacs-30.2.ebuild
+++ b/app-editors/emacs/emacs-30.2.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild
index e2d582e1f8bf..9c533e51fe10 100644
--- a/app-editors/emacs/emacs-31.0.9999.ebuild
+++ b/app-editors/emacs/emacs-31.0.9999.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
diff --git a/app-editors/ghex/ghex-48.1.ebuild b/app-editors/ghex/ghex-48.1.ebuild
index 8943b8d6980b..07285a2839cf 100644
--- a/app-editors/ghex/ghex-48.1.ebuild
+++ b/app-editors/ghex/ghex-48.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-editors/ghex/ghex-48.3.ebuild b/app-editors/ghex/ghex-48.3.ebuild
index c9d6cf987224..e0bb40343345 100644
--- a/app-editors/ghex/ghex-48.3.ebuild
+++ b/app-editors/ghex/ghex-48.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-editors/ghex/ghex-9999.ebuild b/app-editors/ghex/ghex-9999.ebuild
index c9d6cf987224..e0bb40343345 100644
--- a/app-editors/ghex/ghex-9999.ebuild
+++ b/app-editors/ghex/ghex-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-editors/gvim/gvim-9.1.0794.ebuild b/app-editors/gvim/gvim-9.1.0794.ebuild
index bcb1df49114d..7c8c55620f19 100644
--- a/app-editors/gvim/gvim-9.1.0794.ebuild
+++ b/app-editors/gvim/gvim-9.1.0794.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-9.1.1436-r1.ebuild b/app-editors/gvim/gvim-9.1.1436-r1.ebuild
index 875cbbd5cdf0..b1d163c6c846 100644
--- a/app-editors/gvim/gvim-9.1.1436-r1.ebuild
+++ b/app-editors/gvim/gvim-9.1.1436-r1.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-9.1.1436.ebuild b/app-editors/gvim/gvim-9.1.1436.ebuild
index a8101bd95444..f40014abbc83 100644
--- a/app-editors/gvim/gvim-9.1.1436.ebuild
+++ b/app-editors/gvim/gvim-9.1.1436.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-9.1.1500.ebuild b/app-editors/gvim/gvim-9.1.1500.ebuild
index 875cbbd5cdf0..b1d163c6c846 100644
--- a/app-editors/gvim/gvim-9.1.1500.ebuild
+++ b/app-editors/gvim/gvim-9.1.1500.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-9.1.1652-r1.ebuild b/app-editors/gvim/gvim-9.1.1652-r1.ebuild
index 5b8377994ab3..f12e8b517179 100644
--- a/app-editors/gvim/gvim-9.1.1652-r1.ebuild
+++ b/app-editors/gvim/gvim-9.1.1652-r1.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-9.1.1652.ebuild b/app-editors/gvim/gvim-9.1.1652.ebuild
index c5068639a5cc..fb283304606c 100644
--- a/app-editors/gvim/gvim-9.1.1652.ebuild
+++ b/app-editors/gvim/gvim-9.1.1652.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 3938a8a96365..def63e9eadfd 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
index 897fca3336ac..273c5d5950b0 100644
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LonnyGomes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~riscv ~s390 ~sparc x86"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/hexedit/hexedit-1.6.ebuild b/app-editors/hexedit/hexedit-1.6.ebuild
index 460663d14d9c..9a37d27ecfa9 100644
--- a/app-editors/hexedit/hexedit-1.6.ebuild
+++ b/app-editors/hexedit/hexedit-1.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 EGIT_REPO_URI="https://github.com/pixel/hexedit.git"
 else
 SRC_URI="https://github.com/pixel/hexedit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild
index c05a8a8985c0..ea314ac09bae 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/me${PV:2}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="gui nanoemacs xpm"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/jed/jed-0.99.19-r1.ebuild b/app-editors/jed/jed-0.99.19-r1.ebuild
index 5265cfad921b..f28869b9b21c 100644
--- a/app-editors/jed/jed-0.99.19-r1.ebuild
+++ b/app-editors/jed/jed-0.99.19-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
 IUSE="gpm gui xft"
 
 RDEPEND=">=sys-libs/slang-2
diff --git a/app-editors/joe/joe-4.6-r2.ebuild b/app-editors/joe/joe-4.6-r2.ebuild
index 902a761da6c4..d8ac904ac32c 100644
--- a/app-editors/joe/joe-4.6-r2.ebuild
+++ b/app-editors/joe/joe-4.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild b/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
index c451a3b39dbc..282995778db5 100644
--- a/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
+++ b/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
 IUSE="emacs"
 
 BDEPEND="
diff --git a/app-editors/levee/levee-4.0.ebuild b/app-editors/levee/levee-4.0.ebuild
index e1eaa5c2a5f6..92aad526b960 100644
--- a/app-editors/levee/levee-4.0.ebuild
+++ b/app-editors/levee/levee-4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.
 
 LICENSE="levee"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~sparc x86"
 
 RDEPEND="
 	!app-text/lv
diff --git a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
index a41a84d18f01..bb8dbfe08f9e 100644
--- a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
+++ b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 ppc ~riscv ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-editors/moe/moe-1.15.ebuild b/app-editors/moe/moe-1.15.ebuild
index ab94f5815de6..0231270a38d2 100644
--- a/app-editors/moe/moe-1.15.ebuild
+++ b/app-editors/moe/moe-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~riscv x86"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/nano/nano-8.6.ebuild b/app-editors/nano/nano-8.6.ebuild
index 1d8adfcc3de0..ab2720ef44ce 100644
--- a/app-editors/nano/nano-8.6.ebuild
+++ b/app-editors/nano/nano-8.6.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-8.7.ebuild b/app-editors/nano/nano-8.7.ebuild
index 1d8adfcc3de0..ab2720ef44ce 100644
--- a/app-editors/nano/nano-8.7.ebuild
+++ b/app-editors/nano/nano-8.7.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 693682828684..166cbbcd5a73 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/ne/ne-3.3.3.ebuild b/app-editors/ne/ne-3.3.3.ebuild
index 8ca87d8b45b2..a591d75d6669 100644
--- a/app-editors/ne/ne-3.3.3.ebuild
+++ b/app-editors/ne/ne-3.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="
diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild
index b22fa1b95902..e9711873cc84 100644
--- a/app-editors/nedit/nedit-5.7.ebuild
+++ b/app-editors/nedit/nedit-5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~mips ppc ~riscv ~sparc x86"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/motif-2.3:0
diff --git a/app-editors/scite/scite-5.3.5.ebuild b/app-editors/scite/scite-5.3.5.ebuild
index 1242ae6a372f..f284c68af1a9 100644
--- a/app-editors/scite/scite-5.3.5.ebuild
+++ b/app-editors/scite/scite-5.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/app-editors/shed/shed-1.16.ebuild b/app-editors/shed/shed-1.16.ebuild
index 1b26072e8c9f..c211719f0f7f 100644
--- a/app-editors/shed/shed-1.16.ebuild
+++ b/app-editors/shed/shed-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/teco/teco-36_p19940820-r1.ebuild b/app-editors/teco/teco-36_p19940820-r1.ebuild
index 32321b3ef23b..20a2539c74b1 100644
--- a/app-editors/teco/teco-36_p19940820-r1.ebuild
+++ b/app-editors/teco/teco-36_p19940820-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc x86"
 IUSE="doc"
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/app-editors/vile/vile-9.8z-r1.ebuild b/app-editors/vile/vile-9.8z-r1.ebuild
index 7841cdaf97dc..03e1209200d0 100644
--- a/app-editors/vile/vile-9.8z-r1.ebuild
+++ b/app-editors/vile/vile-9.8z-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/vile/current/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~riscv ~sparc x86"
 IUSE="perl iconv ${GENTOO_PERL_USESTRING}"
 
 RDEPEND="
diff --git a/app-editors/vile/vile-9.8z.ebuild b/app-editors/vile/vile-9.8z.ebuild
index 6236e3de8479..1196889bfd9a 100644
--- a/app-editors/vile/vile-9.8z.ebuild
+++ b/app-editors/vile/vile-9.8z.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/vile/current/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~riscv ~sparc x86"
 IUSE="perl iconv"
 
 RDEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/app-editors/vim-core/vim-core-9.1.0794.ebuild b/app-editors/vim-core/vim-core-9.1.0794.ebuild
index e5daa16cf3b4..f668fd39e2da 100644
--- a/app-editors/vim-core/vim-core-9.1.0794.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.0794.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9.1.1436-r1.ebuild b/app-editors/vim-core/vim-core-9.1.1436-r1.ebuild
index 6f5e3d449e4d..34fe3b0930a4 100644
--- a/app-editors/vim-core/vim-core-9.1.1436-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.1436-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9.1.1436.ebuild b/app-editors/vim-core/vim-core-9.1.1436.ebuild
index 444c1bb23df5..8e7c665af2d5 100644
--- a/app-editors/vim-core/vim-core-9.1.1436.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.1436.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9.1.1500.ebuild b/app-editors/vim-core/vim-core-9.1.1500.ebuild
index 6f5e3d449e4d..34fe3b0930a4 100644
--- a/app-editors/vim-core/vim-core-9.1.1500.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.1500.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9.1.1652-r1.ebuild b/app-editors/vim-core/vim-core-9.1.1652-r1.ebuild
index ca0312722c03..0410afeec375 100644
--- a/app-editors/vim-core/vim-core-9.1.1652-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.1652-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9.1.1652-r2.ebuild b/app-editors/vim-core/vim-core-9.1.1652-r2.ebuild
index 92790abc8ffe..eb1153c1061b 100644
--- a/app-editors/vim-core/vim-core-9.1.1652-r2.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.1652-r2.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9.1.1652.ebuild b/app-editors/vim-core/vim-core-9.1.1652.ebuild
index 43faf6c97b5a..25b6e388ea4b 100644
--- a/app-editors/vim-core/vim-core-9.1.1652.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.1652.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 52cc3e2feaa8..33c4d2bce553 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/vim-9.1.0794.ebuild b/app-editors/vim/vim-9.1.0794.ebuild
index 0a66bdba0944..a61b50d0ae10 100644
--- a/app-editors/vim/vim-9.1.0794.ebuild
+++ b/app-editors/vim/vim-9.1.0794.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9.1.1436-r1.ebuild b/app-editors/vim/vim-9.1.1436-r1.ebuild
index 40057e27f302..dab363c43187 100644
--- a/app-editors/vim/vim-9.1.1436-r1.ebuild
+++ b/app-editors/vim/vim-9.1.1436-r1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9.1.1436.ebuild b/app-editors/vim/vim-9.1.1436.ebuild
index cede9efd1b44..deb6ee7ebc98 100644
--- a/app-editors/vim/vim-9.1.1436.ebuild
+++ b/app-editors/vim/vim-9.1.1436.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9.1.1500.ebuild b/app-editors/vim/vim-9.1.1500.ebuild
index 40057e27f302..dab363c43187 100644
--- a/app-editors/vim/vim-9.1.1500.ebuild
+++ b/app-editors/vim/vim-9.1.1500.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9.1.1652-r1.ebuild b/app-editors/vim/vim-9.1.1652-r1.ebuild
index a81986279e22..bf55cd2cb356 100644
--- a/app-editors/vim/vim-9.1.1652-r1.ebuild
+++ b/app-editors/vim/vim-9.1.1652-r1.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9.1.1652.ebuild b/app-editors/vim/vim-9.1.1652.ebuild
index a4a17483aaee..8d4c06ff38ed 100644
--- a/app-editors/vim/vim-9.1.1652.ebuild
+++ b/app-editors/vim/vim-9.1.1652.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
 		# https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 2257c5dd47ed..716d3ae9c2a9 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r4.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r4.ebuild
index 66f015c5bac4..5fe29fe612a7 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r4.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/xml-copy-editor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -ppc ~x86 ~amd64-linux ~x86-linux"  # -ppc due SSE2 requirement
+KEYWORDS="~amd64 -ppc ~x86"  # -ppc due SSE2 requirement
 IUSE="aqua nls"
 
 RDEPEND="
diff --git a/app-editors/zile/zile-2.6.2-r2.ebuild b/app-editors/zile/zile-2.6.2-r2.ebuild
index d5b373562494..537770835027 100644
--- a/app-editors/zile/zile-2.6.2-r2.ebuild
+++ b/app-editors/zile/zile-2.6.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv ~sparc x86"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libgee:0.8=
diff --git a/app-editors/zile/zile-2.6.4.ebuild b/app-editors/zile/zile-2.6.4.ebuild
index d5b373562494..537770835027 100644
--- a/app-editors/zile/zile-2.6.4.ebuild
+++ b/app-editors/zile/zile-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv ~sparc x86"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libgee:0.8=
diff --git a/app-emacs/apel/apel-10.8_p20220721.ebuild b/app-emacs/apel/apel-10.8_p20220721.ebuild
index 1b0ddce5f69c..e3c8fc3773cc 100644
--- a/app-emacs/apel/apel-10.8_p20220721.ebuild
+++ b/app-emacs/apel/apel-10.8_p20220721.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 
 SITEFILE="50apel-gentoo.el"
 
diff --git a/app-emacs/auctex/auctex-14.0.5.ebuild b/app-emacs/auctex/auctex-14.0.5.ebuild
index de6dbc44e194..c198145930c5 100644
--- a/app-emacs/auctex/auctex-14.0.5.ebuild
+++ b/app-emacs/auctex/auctex-14.0.5.ebuild
@@ -20,7 +20,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT_SHA}"
 
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-3+ FDL-1.3+"
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.72.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.72.ebuild
index 0945fea262df..d3d3a1f206b6 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.72.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.72.ebuild
@@ -12,6 +12,6 @@ S="${WORKDIR}/autoconf-${PV}/lib/emacs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bbdb/bbdb-3.2.2d_p20231122-r1.ebuild b/app-emacs/bbdb/bbdb-3.2.2d_p20231122-r1.ebuild
index 6e3f2c474685..32ceb95f6694 100644
--- a/app-emacs/bbdb/bbdb-3.2.2d_p20231122-r1.ebuild
+++ b/app-emacs/bbdb/bbdb-3.2.2d_p20231122-r1.ebuild
@@ -18,7 +18,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3+ FDL-1.3"
diff --git a/app-emacs/bbdb/bbdb-3.2.2d_p20231122.ebuild b/app-emacs/bbdb/bbdb-3.2.2d_p20231122.ebuild
index 89099a3527fc..aee459aa85fa 100644
--- a/app-emacs/bbdb/bbdb-3.2.2d_p20231122.ebuild
+++ b/app-emacs/bbdb/bbdb-3.2.2d_p20231122.ebuild
@@ -18,7 +18,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ppc ~ppc64 x86"
 fi
 
 LICENSE="GPL-3+ FDL-1.3"
diff --git a/app-emacs/cmake-mode/cmake-mode-3.29.1.ebuild b/app-emacs/cmake-mode/cmake-mode-3.29.1.ebuild
index a5b2da15e07b..1091e3f9793b 100644
--- a/app-emacs/cmake-mode/cmake-mode-3.29.1.ebuild
+++ b/app-emacs/cmake-mode/cmake-mode-3.29.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/-mode}/Auxiliary"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!dev-build/cmake[emacs(-)]
diff --git a/app-emacs/cmake-mode/cmake-mode-3.30.3.ebuild b/app-emacs/cmake-mode/cmake-mode-3.30.3.ebuild
index a5b2da15e07b..1091e3f9793b 100644
--- a/app-emacs/cmake-mode/cmake-mode-3.30.3.ebuild
+++ b/app-emacs/cmake-mode/cmake-mode-3.30.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/-mode}/Auxiliary"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!dev-build/cmake[emacs(-)]
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r3.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r3.ebuild
index b958e3d1d111..aa7bc4de6d70 100644
--- a/app-emacs/color-theme/color-theme-6.6.0-r3.ebuild
+++ b/app-emacs/color-theme/color-theme-6.6.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-replace-in-string.patch
diff --git a/app-emacs/dash/dash-2.19.1.ebuild b/app-emacs/dash/dash-2.19.1.ebuild
index ff86b9365e1e..de332f46ca7d 100644
--- a/app-emacs/dash/dash-2.19.1.ebuild
+++ b/app-emacs/dash/dash-2.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/dash/dash-2.20.0.ebuild b/app-emacs/dash/dash-2.20.0.ebuild
index ffd4543f1aeb..b356e42d71a2 100644
--- a/app-emacs/dash/dash-2.20.0.ebuild
+++ b/app-emacs/dash/dash-2.20.0.ebuild
@@ -17,7 +17,7 @@ else
 		-> ${P}.gh.tar.gz"
 	S="${WORKDIR}/${PN}.el-${PV}"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/ddskk/ddskk-17.1-r1.ebuild b/app-emacs/ddskk/ddskk-17.1-r1.ebuild
index 64756da35a2a..cbf9682c8205 100644
--- a/app-emacs/ddskk/ddskk-17.1-r1.ebuild
+++ b/app-emacs/ddskk/ddskk-17.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/skk-dev/${PN}/archive/${P}_Neppu.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="ruby"
 RESTRICT="test"
 
diff --git a/app-emacs/desktop-entry-mode/desktop-entry-mode-0.27-r1.ebuild b/app-emacs/desktop-entry-mode/desktop-entry-mode-0.27-r1.ebuild
index 7cd3d76a3b3b..358ef226772c 100644
--- a/app-emacs/desktop-entry-mode/desktop-entry-mode-0.27-r1.ebuild
+++ b/app-emacs/desktop-entry-mode/desktop-entry-mode-0.27-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/desktop-file-utils-${PV}/misc
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<dev-util/desktop-file-utils-0.27-r1[emacs(-)]"
 
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.79.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.79.ebuild
index d7e629e1fa84..98fae2595a5d 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.79.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.79.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/emacs-common/emacs-common-1.13.ebuild b/app-emacs/emacs-common/emacs-common-1.13.ebuild
index 93b25e9c9d6e..2091b5744bdf 100644
--- a/app-emacs/emacs-common/emacs-common-1.13.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.13.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	S="${EGIT_CHECKOUT_DIR}"
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.632_p20230801.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.632_p20230801.ebuild
index d29dcc9dd19f..b96d58160a01 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.632_p20230801.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.632_p20230801.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/emacs-w3m/emacs-w3m/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.30.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.30.ebuild
index 5a4fed8ccc25..1916e9d7b1c2 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.30.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.30.ebuild
@@ -18,6 +18,6 @@ S="${WORKDIR}/${MY_P}/misc"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.31.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.31.ebuild
index 3e0e6111c05b..dbe1167251b2 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.31.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.31.ebuild
@@ -18,6 +18,6 @@ S="${WORKDIR}/${MY_P}/misc"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ess/ess-25.01.0.ebuild b/app-emacs/ess/ess-25.01.0.ebuild
index b43533690f54..ebdf6803973a 100644
--- a/app-emacs/ess/ess-25.01.0.ebuild
+++ b/app-emacs/ess/ess-25.01.0.ebuild
@@ -18,7 +18,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN^^}-${PV}"
 
-	KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ppc x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
diff --git a/app-emacs/flim/flim-1.14.9_p20231218.ebuild b/app-emacs/flim/flim-1.14.9_p20231218.ebuild
index eea2f5b65acb..45ee07f5df4e 100644
--- a/app-emacs/flim/flim-1.14.9_p20231218.ebuild
+++ b/app-emacs/flim/flim-1.14.9_p20231218.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="oauth2 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emacs/ghub/ghub-5.0.1.ebuild b/app-emacs/ghub/ghub-5.0.1.ebuild
index 713e5eacf670..3cd599d6afac 100644
--- a/app-emacs/ghub/ghub-5.0.1.ebuild
+++ b/app-emacs/ghub/ghub-5.0.1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/ghub/ghub-5.0.2.ebuild b/app-emacs/ghub/ghub-5.0.2.ebuild
index 90bc6d4abf50..ef289b349a25 100644
--- a/app-emacs/ghub/ghub-5.0.2.ebuild
+++ b/app-emacs/ghub/ghub-5.0.2.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/gnuplot-mode/gnuplot-mode-0.11.ebuild b/app-emacs/gnuplot-mode/gnuplot-mode-0.11.ebuild
index 754f478221dd..7d598037d914 100644
--- a/app-emacs/gnuplot-mode/gnuplot-mode-0.11.ebuild
+++ b/app-emacs/gnuplot-mode/gnuplot-mode-0.11.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN%-mode}-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	sci-visualization/gnuplot
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
index 32a6f9602cac..be0987e71834 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://web.archive.org/web/20150908031821/http://martin.meltin.net/sit
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="gui"
 
 RDEPEND=">=app-eselect/eselect-emacs-1.15
diff --git a/app-emacs/howm/howm-1.5.0.ebuild b/app-emacs/howm/howm-1.5.0.ebuild
index e0b23b710e24..93dceb1ba584 100644
--- a/app-emacs/howm/howm-1.5.0.ebuild
+++ b/app-emacs/howm/howm-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
 
 LICENSE="GPL-1+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/lua-mode/lua-mode-20210802.ebuild b/app-emacs/lua-mode/lua-mode-20210802.ebuild
index 89d22db7366f..d11206633cb7 100644
--- a/app-emacs/lua-mode/lua-mode-20210802.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20210802.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/immerrr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 RESTRICT="test"		# tests require cask which isn't packaged yet
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/magit-popup/magit-popup-2.13.3.ebuild b/app-emacs/magit-popup/magit-popup-2.13.3.ebuild
index 50a096e997d5..92e88ef086b2 100644
--- a/app-emacs/magit-popup/magit-popup-2.13.3.ebuild
+++ b/app-emacs/magit-popup/magit-popup-2.13.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/magit/magit-4.3.8.ebuild b/app-emacs/magit/magit-4.3.8.ebuild
index a2f06a6d1aac..f2fe9dc377d7 100644
--- a/app-emacs/magit/magit-4.3.8.ebuild
+++ b/app-emacs/magit/magit-4.3.8.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 amd64-linux x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/magit/magit-4.4.0.ebuild b/app-emacs/magit/magit-4.4.0.ebuild
index d6ad0a9256e5..62b30042c79f 100644
--- a/app-emacs/magit/magit-4.4.0.ebuild
+++ b/app-emacs/magit/magit-4.4.0.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/magit/magit-4.4.2.ebuild b/app-emacs/magit/magit-4.4.2.ebuild
index d6ad0a9256e5..62b30042c79f 100644
--- a/app-emacs/magit/magit-4.4.2.ebuild
+++ b/app-emacs/magit/magit-4.4.2.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/magit/magit-9999.ebuild b/app-emacs/magit/magit-9999.ebuild
index 7e7998e395cb..432dac0e7969 100644
--- a/app-emacs/magit/magit-9999.ebuild
+++ b/app-emacs/magit/magit-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/markdown-mode/markdown-mode-2.7.ebuild b/app-emacs/markdown-mode/markdown-mode-2.7.ebuild
index 5b4b6fd9700b..abc9e8b4f044 100644
--- a/app-emacs/markdown-mode/markdown-mode-2.7.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.7.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/jrblevin/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/matlab/matlab-6.1_p20241107.ebuild b/app-emacs/matlab/matlab-6.1_p20241107.ebuild
index 5e4fc7024609..689fb986a5f3 100644
--- a/app-emacs/matlab/matlab-6.1_p20241107.ebuild
+++ b/app-emacs/matlab/matlab-6.1_p20241107.ebuild
@@ -19,7 +19,7 @@ else
 	   -> ${P}.gh.tar.gz"
 	S="${WORKDIR}/Emacs-MATLAB-Mode-${COMMIT}"
 
-	KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/matlab/matlab-9999.ebuild b/app-emacs/matlab/matlab-9999.ebuild
index 25d44d6bbb42..505c2c74bf65 100644
--- a/app-emacs/matlab/matlab-9999.ebuild
+++ b/app-emacs/matlab/matlab-9999.ebuild
@@ -19,7 +19,7 @@ else
 	   -> ${P}.gh.tar.gz"
 	S="${WORKDIR}/Emacs-MATLAB-Mode-${COMMIT}"
 
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.11.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.11.ebuild
index 40a756e3556d..7bd29ce1d556 100644
--- a/app-emacs/mmm-mode/mmm-mode-0.5.11.ebuild
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.11.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/dgutov/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ppc x86"
 fi
 
 LICENSE="GPL-2+ Texinfo-manual"
diff --git a/app-emacs/navi2ch/navi2ch-1.8.4-r2.ebuild b/app-emacs/navi2ch/navi2ch-1.8.4-r2.ebuild
index 8005e86d902c..63b48cf5617a 100644
--- a/app-emacs/navi2ch/navi2ch-1.8.4-r2.ebuild
+++ b/app-emacs/navi2ch/navi2ch-1.8.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/navi2ch/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/ninja-mode/ninja-mode-1.11.1-r2.ebuild b/app-emacs/ninja-mode/ninja-mode-1.11.1-r2.ebuild
index 21f5ca39a1cc..2650d6509a7f 100644
--- a/app-emacs/ninja-mode/ninja-mode-1.11.1-r2.ebuild
+++ b/app-emacs/ninja-mode/ninja-mode-1.11.1-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/-mode}/misc
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<dev-build/ninja-1.11.1-r4[emacs(-)]"
 
diff --git a/app-emacs/ninja-mode/ninja-mode-1.12.0.ebuild b/app-emacs/ninja-mode/ninja-mode-1.12.0.ebuild
index 306981f856e6..2d468fcd5289 100644
--- a/app-emacs/ninja-mode/ninja-mode-1.12.0.ebuild
+++ b/app-emacs/ninja-mode/ninja-mode-1.12.0.ebuild
@@ -17,7 +17,7 @@ else
 		-> ${P/-mode}.tar.gz"
 	S="${WORKDIR}/${P/-mode}/misc"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emacs/ninja-mode/ninja-mode-1.12.1.ebuild b/app-emacs/ninja-mode/ninja-mode-1.12.1.ebuild
index 306981f856e6..2d468fcd5289 100644
--- a/app-emacs/ninja-mode/ninja-mode-1.12.1.ebuild
+++ b/app-emacs/ninja-mode/ninja-mode-1.12.1.ebuild
@@ -17,7 +17,7 @@ else
 		-> ${P/-mode}.tar.gz"
 	S="${WORKDIR}/${P/-mode}/misc"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
index d85933904ebf..d2eb9a569fce 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/paredit/paredit-26-r1.ebuild b/app-emacs/paredit/paredit-26-r1.ebuild
index 130788d7d6b8..5577668667dd 100644
--- a/app-emacs/paredit/paredit-26-r1.ebuild
+++ b/app-emacs/paredit/paredit-26-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/emacsmirror/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 
 DOCS=( CREDITS NEWS ${PN}.html )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/php-mode/php-mode-1.27.0.ebuild b/app-emacs/php-mode/php-mode-1.27.0.ebuild
index fbd3e647b6c4..31636e3950a9 100644
--- a/app-emacs/php-mode/php-mode-1.27.0.ebuild
+++ b/app-emacs/php-mode/php-mode-1.27.0.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/emacs-php/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="amd64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/php-mode/php-mode-9999.ebuild b/app-emacs/php-mode/php-mode-9999.ebuild
index 70476413ad41..54391350fc17 100644
--- a/app-emacs/php-mode/php-mode-9999.ebuild
+++ b/app-emacs/php-mode/php-mode-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/emacs-php/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 S="${WORKDIR}"/${P}/lisp
diff --git a/app-emacs/po-mode/po-mode-0.26.ebuild b/app-emacs/po-mode/po-mode-0.26.ebuild
index 10c99c72bf8c..2d9834ca6621 100644
--- a/app-emacs/po-mode/po-mode-0.26.ebuild
+++ b/app-emacs/po-mode/po-mode-0.26.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 ELISP_REMOVE="start-po.el"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/pymacs/pymacs-0.26-r6.ebuild b/app-emacs/pymacs/pymacs-0.26-r6.ebuild
index 9bf19ed1774b..22995012cf9f 100644
--- a/app-emacs/pymacs/pymacs-0.26-r6.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26-r6.ebuild
@@ -21,7 +21,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${P^}"
 
-	KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/python-mode/python-mode-6.3.1.ebuild b/app-emacs/python-mode/python-mode-6.3.1.ebuild
index e527efdb1bd3..0bca3954e78a 100644
--- a/app-emacs/python-mode/python-mode-6.3.1.ebuild
+++ b/app-emacs/python-mode/python-mode-6.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://gitlab.com/python-mode-devs/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-	KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
index a7f24a7b33d1..3fb96a72d978 100644
--- a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
+++ b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild
index bccd84822897..494a671457fa 100644
--- a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild
+++ b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.16.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.15-emacs-28.patch )
 
diff --git a/app-emacs/scheme-complete/scheme-complete-0.9.9.ebuild b/app-emacs/scheme-complete/scheme-complete-0.9.9.ebuild
index 849221e2fd60..d40a8d6a9037 100644
--- a/app-emacs/scheme-complete/scheme-complete-0.9.9.ebuild
+++ b/app-emacs/scheme-complete/scheme-complete-0.9.9.ebuild
@@ -11,6 +11,6 @@ SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 
 SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/semi/semi-1.14.7_p20230811-r1.ebuild b/app-emacs/semi/semi-1.14.7_p20230811-r1.ebuild
index 51e476132ef9..8d48ad0b51fd 100644
--- a/app-emacs/semi/semi-1.14.7_p20230811-r1.ebuild
+++ b/app-emacs/semi/semi-1.14.7_p20230811-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="l10n_ja"
 
 RDEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/transient/transient-0.10.1.ebuild b/app-emacs/transient/transient-0.10.1.ebuild
index d87831eddfc1..91a6d3de92b3 100644
--- a/app-emacs/transient/transient-0.10.1.ebuild
+++ b/app-emacs/transient/transient-0.10.1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/transient/transient-0.11.0.ebuild b/app-emacs/transient/transient-0.11.0.ebuild
index fd7ffba53b9f..4da693ab9e78 100644
--- a/app-emacs/transient/transient-0.11.0.ebuild
+++ b/app-emacs/transient/transient-0.11.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/transient/transient-9999.ebuild b/app-emacs/transient/transient-9999.ebuild
index e88de3272abb..c8e3ce2aac93 100644
--- a/app-emacs/transient/transient-9999.ebuild
+++ b/app-emacs/transient/transient-9999.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20230624.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20230624.ebuild
index a78a7fbe29f8..8dbd95258592 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20230624.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20230624.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86"
 IUSE="bbdb ssl l10n_ja"
 
 RDEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/with-editor/with-editor-3.4.6.ebuild b/app-emacs/with-editor/with-editor-3.4.6.ebuild
index 115eee2b0a8c..568c08ccf36b 100644
--- a/app-emacs/with-editor/with-editor-3.4.6.ebuild
+++ b/app-emacs/with-editor/with-editor-3.4.6.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/with-editor/with-editor-3.4.7.ebuild b/app-emacs/with-editor/with-editor-3.4.7.ebuild
index a41415cea096..3b2c2fbad148 100644
--- a/app-emacs/with-editor/with-editor-3.4.7.ebuild
+++ b/app-emacs/with-editor/with-editor-3.4.7.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/with-editor/with-editor-9999.ebuild b/app-emacs/with-editor/with-editor-9999.ebuild
index f01c1a6f71dd..90922a9837c0 100644
--- a/app-emacs/with-editor/with-editor-9999.ebuild
+++ b/app-emacs/with-editor/with-editor-9999.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/yaml-mode/yaml-mode-0.0.15.ebuild b/app-emacs/yaml-mode/yaml-mode-0.0.15.ebuild
index 7a5cbf8da5fd..a81a237d653f 100644
--- a/app-emacs/yaml-mode/yaml-mode-0.0.15.ebuild
+++ b/app-emacs/yaml-mode/yaml-mode-0.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yoshiki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 #S="${WORKDIR}/${PN}-release-${PV}"
 DOCS="README Changes"
diff --git a/app-emacs/yaml-mode/yaml-mode-0.0.16.ebuild b/app-emacs/yaml-mode/yaml-mode-0.0.16.ebuild
index ebd63d30f79a..d9246138a4fe 100644
--- a/app-emacs/yaml-mode/yaml-mode-0.0.16.ebuild
+++ b/app-emacs/yaml-mode/yaml-mode-0.0.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yoshiki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 #S="${WORKDIR}/${PN}-release-${PV}"
 DOCS="README Changes"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.32.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.32.0.ebuild
index 96734ca35cfb..5326d9a71f84 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.32.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.32.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	inherit pypi
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild
index 48e1f67e883c..cc0609f7d586 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	inherit pypi
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
index 46480f9df68c..02baaa4e802b 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/simh/simh-3.11.1.ebuild b/app-emulation/simh/simh-3.11.1.ebuild
index fa5e9c6f3867..56555d1481a9 100644
--- a/app-emulation/simh/simh-3.11.1.ebuild
+++ b/app-emulation/simh/simh-3.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/simh/simh/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="net-libs/libpcap"
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
index 2f941eca1231..798c7191556d 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
index 310ea2fcb992..fc9f7082eae2 100644
--- a/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
+++ b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1-r1.ebuild b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1-r1.ebuild
index c438f3e59588..0b1d2e6ca887 100644
--- a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1-r1.ebuild
+++ b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1-r1.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="app-eselect/eselect-lib-bin-symlink"
 
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.19.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.19.ebuild
index 639028384f20..842765e4140e 100644
--- a/app-eselect/eselect-ctags/eselect-ctags-1.19.ebuild
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=app-admin/eselect-1.2.3"
 
diff --git a/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild b/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
index 626cac6d233b..9e7382ec6a88 100644
--- a/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
+++ b/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND=">=app-admin/eselect-1.2.6
 	~app-eselect/eselect-ctags-${PV}"
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
index 5fd736a7a10c..32daf0a2c3cd 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-20220403.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/fontconfig.esel
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=app-admin/eselect-1.2.3"
 
diff --git a/app-eselect/eselect-guile/eselect-guile-20250224.ebuild b/app-eselect/eselect-guile/eselect-guile-20250224.ebuild
index 04f70a98bfe3..db89ad3814ef 100644
--- a/app-eselect/eselect-guile/eselect-guile-20250224.ebuild
+++ b/app-eselect/eselect-guile/eselect-guile-20250224.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-eselect/eselect-java/eselect-java-0.5.1.ebuild b/app-eselect/eselect-java/eselect-java-0.5.1.ebuild
index 3dad018a6542..32abcfe373d4 100644
--- a/app-eselect/eselect-java/eselect-java-0.5.1.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
index 4b42dfafd48b..279577849e8f 100644
--- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
+++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-admin/eselect
diff --git a/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
index 3342396289d3..f545692580a1 100644
--- a/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect
diff --git a/app-eselect/eselect-luajit/eselect-luajit-1.ebuild b/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
index fca887f72e25..fc0750a5144d 100644
--- a/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
+++ b/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-eselect/eselect-mpg123/eselect-mpg123-0.1-r1.ebuild b/app-eselect/eselect-mpg123/eselect-mpg123-0.1-r1.ebuild
index 91834bd1ce7b..b1344680b356 100644
--- a/app-eselect/eselect-mpg123/eselect-mpg123-0.1-r1.ebuild
+++ b/app-eselect/eselect-mpg123/eselect-mpg123-0.1-r1.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="app-eselect/eselect-lib-bin-symlink"
 
diff --git a/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
index fcff0f2f4253..dd322801f0c5 100644
--- a/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
+++ b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="app-admin/eselect
 	>=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-oodict/eselect-oodict-20100228-r1.ebuild b/app-eselect/eselect-oodict/eselect-oodict-20100228-r1.ebuild
index dc3e6617d407..59ffa895b5f3 100644
--- a/app-eselect/eselect-oodict/eselect-oodict-20100228-r1.ebuild
+++ b/app-eselect/eselect-oodict/eselect-oodict-20100228-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=app-admin/eselect-1.2"
 
diff --git a/app-eselect/eselect-php/eselect-php-0.9.9.ebuild b/app-eselect/eselect-php/eselect-php-0.9.9.ebuild
index d7a7c721deac..e66f087c11e9 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.9.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.4.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.4.ebuild
index 50c4cf74c759..07c76a6f73d4 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.4.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.4.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
 
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4-r1.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4-r1.ebuild
index 6505afbb2813..295357f5e8cf 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4-r1.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-eselect/eselect-python/eselect-python-20200719.ebuild b/app-eselect/eselect-python/eselect-python-20200719.ebuild
index 01ac957283cf..6a7ee6a44ac1 100644
--- a/app-eselect/eselect-python/eselect-python-20200719.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20200719.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~chutzpah/dist/misc/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-rails/eselect-rails-0.26.ebuild b/app-eselect/eselect-rails/eselect-rails-0.26.ebuild
index fb57358b7975..28b09a04195d 100644
--- a/app-eselect/eselect-rails/eselect-rails-0.26.ebuild
+++ b/app-eselect/eselect-rails/eselect-rails-0.26.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.0"
diff --git a/app-eselect/eselect-rails/eselect-rails-0.28.ebuild b/app-eselect/eselect-rails/eselect-rails-0.28.ebuild
index cb6f2b215891..1b576d419837 100644
--- a/app-eselect/eselect-rails/eselect-rails-0.28.ebuild
+++ b/app-eselect/eselect-rails/eselect-rails-0.28.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=app-admin/eselect-1.2.0"
 
diff --git a/app-eselect/eselect-rails/eselect-rails-0.29.ebuild b/app-eselect/eselect-rails/eselect-rails-0.29.ebuild
index 42074bea7411..2b274bcb87a4 100644
--- a/app-eselect/eselect-rails/eselect-rails-0.29.ebuild
+++ b/app-eselect/eselect-rails/eselect-rails-0.29.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=app-admin/eselect-1.2.0"
 
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20231226.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20231226.ebuild
index c6c02e194551..f46d019da2f9 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20231226.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20231226.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20241225.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20241225.ebuild
index ea4d4a974268..a78debda958a 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20241225.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20241225.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=app-admin/eselect-1.0.2"
 
diff --git a/app-eselect/eselect-scala/eselect-scala-0.1.1-r1.ebuild b/app-eselect/eselect-scala/eselect-scala-0.1.1-r1.ebuild
index 82b1ebe745bd..917ba55903a0 100644
--- a/app-eselect/eselect-scala/eselect-scala-0.1.1-r1.ebuild
+++ b/app-eselect/eselect-scala/eselect-scala-0.1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~gienah/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=app-admin/eselect-1.0.2"
 
diff --git a/app-eselect/eselect-unison/eselect-unison-0.4.ebuild b/app-eselect/eselect-unison/eselect-unison-0.4.ebuild
index 27cf985a6381..8b9d59e0710f 100644
--- a/app-eselect/eselect-unison/eselect-unison-0.4.ebuild
+++ b/app-eselect/eselect-unison/eselect-unison-0.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86"
 
 RDEPEND=">=app-admin/eselect-1.2.3"
 
diff --git a/app-eselect/eselect-vi/eselect-vi-20221122.ebuild b/app-eselect/eselect-vi/eselect-vi-20221122.ebuild
index d81d10758010..779d376731a1 100644
--- a/app-eselect/eselect-vi/eselect-vi-20221122.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-20221122.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
index b8793159b6b4..6e54862fdca9 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=app-admin/eselect-1.4.13"
 
diff --git a/app-i18n/anthy/anthy-9100h-r3.ebuild b/app-i18n/anthy/anthy-9100h-r3.ebuild
index f2a53e1d0ee1..cdc586a47b82 100644
--- a/app-i18n/anthy/anthy-9100h-r3.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="emacs static-libs"
 
 BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
diff --git a/app-i18n/enca/enca-1.19-r3.ebuild b/app-i18n/enca/enca-1.19-r3.ebuild
index ca28d71da13e..1066fa6888b2 100644
--- a/app-i18n/enca/enca-1.19-r3.ebuild
+++ b/app-i18n/enca/enca-1.19-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc +iconv recode"
 
 BDEPEND="doc? ( dev-util/gtk-doc )"
diff --git a/app-i18n/gnulib-l10n/gnulib-l10n-20241231.ebuild b/app-i18n/gnulib-l10n/gnulib-l10n-20241231.ebuild
index 64c0ce6bf5eb..3c8bcfbeb947 100644
--- a/app-i18n/gnulib-l10n/gnulib-l10n-20241231.ebuild
+++ b/app-i18n/gnulib-l10n/gnulib-l10n-20241231.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gnulib/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_prepare() {
 	default
diff --git a/app-i18n/kakasi/kakasi-2.3.6-r2.ebuild b/app-i18n/kakasi/kakasi-2.3.6-r2.ebuild
index 1c91919cffca..1e541f370562 100644
--- a/app-i18n/kakasi/kakasi-2.3.6-r2.ebuild
+++ b/app-i18n/kakasi/kakasi-2.3.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kakasi.namazu.org/stable/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="l10n_ja"
 
 BDEPEND="sys-devel/gettext"
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.27.0-r1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.27.0-r1.ebuild
index 72ebed3a97d7..e60489f22c36 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.27.0-r1.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.27.0-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${P/-}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 # fa omitted because of build failures (patches are welcome!)
 MY_L10N=(cs da de el es fi fr hu id it ko mk nb nl pl pt-BR ro ru sr sv uk vi)
 IUSE="${MY_L10N[@]/#/l10n_}"
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.28.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.28.0.ebuild
index d83ec957d99d..c9f530ec999b 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.28.0.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.28.0.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${P/-}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 # fa omitted because of build failures (patches are welcome!)
 MY_L10N=(cs da de el es fi fr hu id it ko mk nb nl pl pt-BR ro ru sr sv uk vi)
 IUSE="${MY_L10N[@]/#/l10n_}"
diff --git a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild
index 7392938caefd..3ec7091a1578 100644
--- a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/${PN}/source-tar/${PN}_${MY_PV}.tar.bz
 
 LICENSE="FDL-1.3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="virtual/man"
 
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.4.2.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.4.2.ebuild
index b4df75b718b8..1607d7595d8c 100644
--- a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.4.2.ebuild
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.4.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="virtual/man"
 
diff --git a/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild
index 7bf867c3441e..54f1edb72a79 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv x86"
 IUSE="cdb"
 
 DEPEND="app-alternatives/awk
diff --git a/app-i18n/uchardet/uchardet-0.0.8.ebuild b/app-i18n/uchardet/uchardet-0.0.8.ebuild
index 03df4d30a438..823cfd66e1a8 100644
--- a/app-i18n/uchardet/uchardet-0.0.8.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="cpu_flags_x86_sse2"
 
 PATCHES=(
diff --git a/app-misc/banner/banner-1.3.6.ebuild b/app-misc/banner/banner-1.3.6.ebuild
index f11dbfcdd22f..c7c7dbfb20ca 100644
--- a/app-misc/banner/banner-1.3.6.ebuild
+++ b/app-misc/banner/banner-1.3.6.ebuild
@@ -10,6 +10,6 @@ S="${WORKDIR}/${PN}-${PN^^}_V${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="!<=games-misc/bsd-games-3"
diff --git a/app-misc/beanstalkd/beanstalkd-1.13-r1.ebuild b/app-misc/beanstalkd/beanstalkd-1.13-r1.ebuild
index b95187e1e66a..97c15d84cf1a 100644
--- a/app-misc/beanstalkd/beanstalkd-1.13-r1.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/beanstalkd/beanstalkd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~mips x86 ~x64-macos"
 
 RDEPEND="
 	acct-group/beanstalk
diff --git a/app-misc/beanstalkd/beanstalkd-1.13.ebuild b/app-misc/beanstalkd/beanstalkd-1.13.ebuild
index ed90efe2b78a..3a021e73ee36 100644
--- a/app-misc/beanstalkd/beanstalkd-1.13.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/beanstalkd/beanstalkd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~mips x86 ~x64-macos"
 
 RDEPEND="
 	acct-group/beanstalk
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index f73610c5d4be..3343403b618b 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
 DEPEND="${RDEPEND}"
diff --git a/app-misc/ca-certificates/ca-certificates-20240203.3.98.ebuild b/app-misc/ca-certificates/ca-certificates-20240203.3.98.ebuild
index 73f7d941bb39..40e9067bbdf8 100644
--- a/app-misc/ca-certificates/ca-certificates-20240203.3.98.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20240203.3.98.ebuild
@@ -57,7 +57,7 @@ S="${WORKDIR}"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 ${PRECOMPILED} || IUSE+=" cacert"
 
 BDEPEND="${COMMON_DEPEND}"
diff --git a/app-misc/ca-certificates/ca-certificates-20250419.3.112.ebuild b/app-misc/ca-certificates/ca-certificates-20250419.3.112.ebuild
index fcab04249498..c6fa56ecf174 100644
--- a/app-misc/ca-certificates/ca-certificates-20250419.3.112.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20250419.3.112.ebuild
@@ -57,7 +57,7 @@ S="${WORKDIR}"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 ${PRECOMPILED} || IUSE+=" cacert"
 
 BDEPEND="${COMMON_DEPEND}"
diff --git a/app-misc/clockywock/clockywock-0.3.1a.ebuild b/app-misc/clockywock/clockywock-0.3.1a.ebuild
index 1477cdb488e8..14ea9566473f 100644
--- a/app-misc/clockywock/clockywock-0.3.1a.ebuild
+++ b/app-misc/clockywock/clockywock-0.3.1a.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://soomka.com/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
diff --git a/app-misc/colordiff/colordiff-1.0.21.ebuild b/app-misc/colordiff/colordiff-1.0.21.ebuild
index 3bc58200ba91..f570ff01fa9e 100644
--- a/app-misc/colordiff/colordiff-1.0.21.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/datefudge/datefudge-1.26.ebuild b/app-misc/datefudge/datefudge-1.26.ebuild
index cbf231ebe618..f6af49254fa4 100644
--- a/app-misc/datefudge/datefudge-1.26.ebuild
+++ b/app-misc/datefudge/datefudge-1.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/app-misc/datefudge/datefudge-1.27.ebuild b/app-misc/datefudge/datefudge-1.27.ebuild
index cbf231ebe618..f6af49254fa4 100644
--- a/app-misc/datefudge/datefudge-1.27.ebuild
+++ b/app-misc/datefudge/datefudge-1.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/app-misc/delay/delay-1.6-r6.ebuild b/app-misc/delay/delay-1.6-r6.ebuild
index 4efff7e7622b..64ff61333669 100644
--- a/app-misc/delay/delay-1.6-r6.ebuild
+++ b/app-misc/delay/delay-1.6-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/app-misc/detox/detox-1.4.5-r1.ebuild b/app-misc/detox/detox-1.4.5-r1.ebuild
index 6f6318d62d5f..9529111fc62f 100644
--- a/app-misc/detox/detox-1.4.5-r1.ebuild
+++ b/app-misc/detox/detox-1.4.5-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ~riscv x86"
 
 RDEPEND="!dev-python/detox"
 DEPEND="${RDEPEND}"
diff --git a/app-misc/detox/detox-3.0.1.ebuild b/app-misc/detox/detox-3.0.1.ebuild
index 83add56151ba..be5f99a34904 100644
--- a/app-misc/detox/detox-3.0.1.ebuild
+++ b/app-misc/detox/detox-3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~riscv ~x86"
 
 BDEPEND="
 	app-alternatives/yacc
diff --git a/app-misc/devtodo/devtodo-0.1.20-r4.ebuild b/app-misc/devtodo/devtodo-0.1.20-r4.ebuild
index 9225b7967bba..b6c1e9445098 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r4.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
index 658bd943073c..9925a5fe3ec9 100644
--- a/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
+++ b/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sys-libs/ncurses:="
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 107161611004..2acad72b773a 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/fdupes/fdupes-2.3.2.ebuild b/app-misc/fdupes/fdupes-2.3.2.ebuild
index ead81236057e..62aed02d01f9 100644
--- a/app-misc/fdupes/fdupes-2.3.2.ebuild
+++ b/app-misc/fdupes/fdupes-2.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fdupes/fdupes-2.4.0.ebuild b/app-misc/fdupes/fdupes-2.4.0.ebuild
index ead81236057e..62aed02d01f9 100644
--- a/app-misc/fdupes/fdupes-2.4.0.ebuild
+++ b/app-misc/fdupes/fdupes-2.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fdupes/fdupes-9999.ebuild b/app-misc/fdupes/fdupes-9999.ebuild
index c735e2285b46..28af05f57b2d 100644
--- a/app-misc/fdupes/fdupes-9999.ebuild
+++ b/app-misc/fdupes/fdupes-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/figlet/figlet-2.2.5-r2.ebuild b/app-misc/figlet/figlet-2.2.5-r2.ebuild
index 8d7a0c4d15e4..14160b8f77c3 100644
--- a/app-misc/figlet/figlet-2.2.5-r2.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-musl.patch
diff --git a/app-misc/gcal/gcal-4.1-r3.ebuild b/app-misc/gcal/gcal-4.1-r3.ebuild
index a581d70261ad..b7cf4993b76e 100644
--- a/app-misc/gcal/gcal-4.1-r3.ebuild
+++ b/app-misc/gcal/gcal-4.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="ncurses nls unicode"
 
 RDEPEND="nls? ( virtual/libintl )
diff --git a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
index 61f99f6b4e43..3426e86466f5 100644
--- a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-exit.patch
diff --git a/app-misc/gtypist/gtypist-2.9.5-r2.ebuild b/app-misc/gtypist/gtypist-2.9.5-r2.ebuild
index 51f826ba61a2..70865c705b5b 100644
--- a/app-misc/gtypist/gtypist-2.9.5-r2.ebuild
+++ b/app-misc/gtypist/gtypist-2.9.5-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ppc ~riscv x86"
 IUSE="nls emacs xemacs"
 
 DEPEND="
diff --git a/app-misc/hatools/hatools-2.14.ebuild b/app-misc/hatools/hatools-2.14.ebuild
index d500b1a2d7fe..ac6b212c2a67 100644
--- a/app-misc/hatools/hatools-2.14.ebuild
+++ b/app-misc/hatools/hatools-2.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.fatalmind.com/software/hatools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~mips ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/hello/hello-2.12.2.ebuild b/app-misc/hello/hello-2.12.2.ebuild
index 3c607be382e4..805157be6e07 100644
--- a/app-misc/hello/hello-2.12.2.ebuild
+++ b/app-misc/hello/hello-2.12.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3+ GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DOCS=( AUTHORS ChangeLog{,.O} NEWS README THANKS )
diff --git a/app-misc/hello/hello-2.12.ebuild b/app-misc/hello/hello-2.12.ebuild
index 0d2eb4b14acc..7aa03d5fcfa3 100644
--- a/app-misc/hello/hello-2.12.ebuild
+++ b/app-misc/hello/hello-2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3+ GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DOCS=( AUTHORS ChangeLog{,.O} NEWS README THANKS contrib/evolution.txt )
diff --git a/app-misc/hilite/hilite-1.5-r1.ebuild b/app-misc/hilite/hilite-1.5-r1.ebuild
index c2fa9d5c238a..d493dcb9073e 100644
--- a/app-misc/hilite/hilite-1.5-r1.ebuild
+++ b/app-misc/hilite/hilite-1.5-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86"
 
 src_unpack() {
 	cp "${DISTDIR}"/${P}.c ${P}.c || die
diff --git a/app-misc/jq/jq-1.7.1-r1.ebuild b/app-misc/jq/jq-1.7.1-r1.ebuild
index 4613d9680fa2..8ba4db1f24da 100644
--- a/app-misc/jq/jq-1.7.1-r1.ebuild
+++ b/app-misc/jq/jq-1.7.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
diff --git a/app-misc/jq/jq-1.8.0.ebuild b/app-misc/jq/jq-1.8.0.ebuild
index 7e90dc1a78a5..09a5f5b70cbb 100644
--- a/app-misc/jq/jq-1.8.0.ebuild
+++ b/app-misc/jq/jq-1.8.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT icu CC-BY-3.0"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.10' # Keep this in sync with bundled vendor/oniguruma/
diff --git a/app-misc/jq/jq-1.8.1.ebuild b/app-misc/jq/jq-1.8.1.ebuild
index 3c20ab51be51..14a0f948a5be 100644
--- a/app-misc/jq/jq-1.8.1.ebuild
+++ b/app-misc/jq/jq-1.8.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT icu CC-BY-3.0"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.10' # Keep this in sync with bundled vendor/oniguruma/
diff --git a/app-misc/linux-logo/linux-logo-6.01.ebuild b/app-misc/linux-logo/linux-logo-6.01.ebuild
index 5be7de2ea4b8..a76e87ead5c9 100644
--- a/app-misc/linux-logo/linux-logo-6.01.ebuild
+++ b/app-misc/linux-logo/linux-logo-6.01.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ~riscv ~sparc x86"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/mc/mc-4.8.30-r2.ebuild b/app-misc/mc/mc-4.8.30-r2.ebuild
index 4e0582f55e7d..4881505f1d94 100644
--- a/app-misc/mc/mc-4.8.30-r2.ebuild
+++ b/app-misc/mc/mc-4.8.30-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+edit gpm nls sftp +slang spell test unicode X"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-4.8.33.ebuild b/app-misc/mc/mc-4.8.33.ebuild
index 542d871e6589..14178fcb18c9 100644
--- a/app-misc/mc/mc-4.8.33.ebuild
+++ b/app-misc/mc/mc-4.8.33.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+edit gpm nls sftp +slang spell test unicode X"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mime-types/mime-types-2.1.54.ebuild b/app-misc/mime-types/mime-types-2.1.54.ebuild
index 6deeb1abda8f..7a56cf88cd76 100644
--- a/app-misc/mime-types/mime-types-2.1.54.ebuild
+++ b/app-misc/mime-types/mime-types-2.1.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://pagure.io/mailcap/archive/r${MY_PV}/mailcap-r${MY_PV}.tar.gz"
 
 LICENSE="public-domain MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nginx"
 
 S="${WORKDIR}/mailcap-r${MY_PV}"
diff --git a/app-misc/mmv/mmv-2.10.ebuild b/app-misc/mmv/mmv-2.10.ebuild
index 35647eaf575a..19008d6fac43 100644
--- a/app-misc/mmv/mmv-2.10.ebuild
+++ b/app-misc/mmv/mmv-2.10.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://github.com/rrthomas/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86"
 
 QA_CONFIG_IMPL_DECL_SKIP=( MIN )
diff --git a/app-misc/mmv/mmv-2.9.1.ebuild b/app-misc/mmv/mmv-2.9.1.ebuild
index 35647eaf575a..19008d6fac43 100644
--- a/app-misc/mmv/mmv-2.9.1.ebuild
+++ b/app-misc/mmv/mmv-2.9.1.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://github.com/rrthomas/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86"
 
 QA_CONFIG_IMPL_DECL_SKIP=( MIN )
diff --git a/app-misc/ondir/ondir-0.2.4.ebuild b/app-misc/ondir/ondir-0.2.4.ebuild
index 99938e2be209..7e645aea29a4 100644
--- a/app-misc/ondir/ondir-0.2.4.ebuild
+++ b/app-misc/ondir/ondir-0.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 DOCS=( AUTHORS ChangeLog INSTALL scripts.tcsh scripts.sh )
 
diff --git a/app-misc/pal/pal-0.4.3-r2.ebuild b/app-misc/pal/pal-0.4.3-r2.ebuild
index c2722b404211..7a2ad910904a 100644
--- a/app-misc/pal/pal-0.4.3-r2.ebuild
+++ b/app-misc/pal/pal-0.4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/palcal/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/pax-utils/pax-utils-1.3.10.ebuild b/app-misc/pax-utils/pax-utils-1.3.10.ebuild
index a775f61acab6..1db6955b1c0b 100644
--- a/app-misc/pax-utils/pax-utils-1.3.10.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.10.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="
 		https://dev.gentoo.org/~floppym/dist/${P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	IUSE+=" man"
 fi
 
diff --git a/app-misc/pax-utils/pax-utils-1.3.7.ebuild b/app-misc/pax-utils/pax-utils-1.3.7.ebuild
index dae9f00d4d66..d9e2ee0bd570 100644
--- a/app-misc/pax-utils/pax-utils-1.3.7.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.7.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-misc/pax-utils/pax-utils-1.3.8.ebuild b/app-misc/pax-utils/pax-utils-1.3.8.ebuild
index 24045b2cba8e..7238c919a86a 100644
--- a/app-misc/pax-utils/pax-utils-1.3.8.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.8.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-misc/pax-utils/pax-utils-1.3.9.ebuild b/app-misc/pax-utils/pax-utils-1.3.9.ebuild
index 81ec837ecbc3..9018acf6a183 100644
--- a/app-misc/pax-utils/pax-utils-1.3.9.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.9.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-misc/pax-utils/pax-utils-9999.ebuild b/app-misc/pax-utils/pax-utils-9999.ebuild
index 88d027d0f8af..3585ab0fe830 100644
--- a/app-misc/pax-utils/pax-utils-9999.ebuild
+++ b/app-misc/pax-utils/pax-utils-9999.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	IUSE+=" man"
 fi
 
diff --git a/app-misc/pipeworks/pipeworks-0.4-r2.ebuild b/app-misc/pipeworks/pipeworks-0.4-r2.ebuild
index 349107b97090..5398b744d774 100644
--- a/app-misc/pipeworks/pipeworks-0.4-r2.ebuild
+++ b/app-misc/pipeworks/pipeworks-0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pipeworks/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
diff --git a/app-misc/reptyr/reptyr-0.10.0.ebuild b/app-misc/reptyr/reptyr-0.10.0.ebuild
index 2b75f965c71a..25c9c02a8712 100644
--- a/app-misc/reptyr/reptyr-0.10.0.ebuild
+++ b/app-misc/reptyr/reptyr-0.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RESTRICT="test"
 
diff --git a/app-misc/reptyr/reptyr-0.9.0.ebuild b/app-misc/reptyr/reptyr-0.9.0.ebuild
index 36b4a0ba132d..de5369abef5f 100644
--- a/app-misc/reptyr/reptyr-0.9.0.ebuild
+++ b/app-misc/reptyr/reptyr-0.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RESTRICT="test"
 
diff --git a/app-misc/rlwrap/rlwrap-0.46.1.ebuild b/app-misc/rlwrap/rlwrap-0.46.1.ebuild
index 10856413f7ee..ad61b6edfa89 100644
--- a/app-misc/rlwrap/rlwrap-0.46.1.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.46.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/hanslub42/rlwrap/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ~mips ppc ~riscv x86 ~x64-macos"
 IUSE="debug"
 
 RDEPEND="
diff --git a/app-misc/rlwrap/rlwrap-0.47.1.ebuild b/app-misc/rlwrap/rlwrap-0.47.1.ebuild
index 3c1135db361e..6592b82b6c06 100644
--- a/app-misc/rlwrap/rlwrap-0.47.1.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.47.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/hanslub42/rlwrap/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~mips ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ~mips ~ppc ~riscv x86 ~x64-macos"
 IUSE="debug"
 
 # We always depend on dev-libs/libptytty as while it's technically optional
diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild
index c0532b88372a..2a56e6c01ab7 100644
--- a/app-misc/screen/screen-4.9.1-r1.ebuild
+++ b/app-misc/screen/screen-4.9.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-4.9.1-r2.ebuild b/app-misc/screen/screen-4.9.1-r2.ebuild
index 4ad18a8ed600..e02c57aef657 100644
--- a/app-misc/screen/screen-4.9.1-r2.ebuild
+++ b/app-misc/screen/screen-4.9.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-5.0.1.ebuild b/app-misc/screen/screen-5.0.1.ebuild
index 12c8ee15274d..f6278da36ca4 100644
--- a/app-misc/screen/screen-5.0.1.ebuild
+++ b/app-misc/screen/screen-5.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 12c8ee15274d..f6278da36ca4 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/sl/sl-5.02-r1.ebuild b/app-misc/sl/sl-5.02-r1.ebuild
index 1415dd792551..5e870a8bdf51 100644
--- a/app-misc/sl/sl-5.02-r1.ebuild
+++ b/app-misc/sl/sl-5.02-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Toyoda"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="l10n_ja"
 
 RDEPEND="sys-libs/ncurses:="
diff --git a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index cfb96c3cede9..c7238b56f4b3 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
 
 REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
diff --git a/app-misc/supercat/supercat-0.5.8.ebuild b/app-misc/supercat/supercat-0.5.8.ebuild
index 91972f44722d..9206dbd9a9fd 100644
--- a/app-misc/supercat/supercat-0.5.8.ebuild
+++ b/app-misc/supercat/supercat-0.5.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 ~sparc x86"
 
 src_configure() {
 	econf --with-system-directory="${EPREFIX}/etc/supercat"
diff --git a/app-misc/tmux/tmux-3.4-r1.ebuild b/app-misc/tmux/tmux-3.4-r1.ebuild
index a0429a419e52..f1ec79fef845 100644
--- a/app-misc/tmux/tmux-3.4-r1.ebuild
+++ b/app-misc/tmux/tmux-3.4-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 	fi
 	S="${WORKDIR}/${P/_/-}"
 fi
diff --git a/app-misc/tmux/tmux-3.5a.ebuild b/app-misc/tmux/tmux-3.5a.ebuild
index 1f84061a3e32..ca5b0d232e47 100644
--- a/app-misc/tmux/tmux-3.5a.ebuild
+++ b/app-misc/tmux/tmux-3.5a.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 	fi
 	S="${WORKDIR}/${P/_/-}"
 fi
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 5981286a116f..b3669c7d6e24 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	fi
 	S="${WORKDIR}/${P/_/-}"
 fi
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
index 77504bcb24d7..d4c2a3ca62f3 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-flags.patch
diff --git a/app-misc/ttyrec/ttyrec-1.1.7.1.ebuild b/app-misc/ttyrec/ttyrec-1.1.7.1.ebuild
index 460a3de44cb1..a010eef7a0bd 100644
--- a/app-misc/ttyrec/ttyrec-1.1.7.1.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.1.7.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ovh-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="+zstd"
 
 RDEPEND="zstd? ( app-arch/zstd:= )"
diff --git a/app-misc/unfoo/unfoo-1.0.8-r2.ebuild b/app-misc/unfoo/unfoo-1.0.8-r2.ebuild
index df6905970def..bae70ce61cbb 100644
--- a/app-misc/unfoo/unfoo-1.0.8-r2.ebuild
+++ b/app-misc/unfoo/unfoo-1.0.8-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jlec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 ~s390 x86"
 IUSE="+minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/wcd/wcd-6.0.4.ebuild b/app-misc/wcd/wcd-6.0.4.ebuild
index 60e5d42132cd..7b180d730025 100644
--- a/app-misc/wcd/wcd-6.0.4.ebuild
+++ b/app-misc/wcd/wcd-6.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86"
 IUSE="nls unicode"
 
 RDEPEND="
diff --git a/app-misc/wcd/wcd-6.0.5.ebuild b/app-misc/wcd/wcd-6.0.5.ebuild
index 77cd4b3493f0..4d5a3bf44dd4 100644
--- a/app-misc/wcd/wcd-6.0.5.ebuild
+++ b/app-misc/wcd/wcd-6.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86"
 IUSE="nls unicode"
 
 RDEPEND="
diff --git a/app-misc/wcd/wcd-6.0.6.ebuild b/app-misc/wcd/wcd-6.0.6.ebuild
index 1dbe9d9f0afa..6e95610f324e 100644
--- a/app-misc/wcd/wcd-6.0.6.ebuild
+++ b/app-misc/wcd/wcd-6.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="nls unicode"
 
 RDEPEND="
diff --git a/app-misc/when/when-1.1.45.ebuild b/app-misc/when/when-1.1.45.ebuild
index 6c438f8ccbc2..792019dbd0fe 100644
--- a/app-misc/when/when-1.1.45.ebuild
+++ b/app-misc/when/when-1.1.45.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/ben-crowell/${PN}/get/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild
index 8ce3bf04f370..44d1d8ba4c5c 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static"
 
 RDEPEND=">=virtual/zlib-1.1.4:="
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
index 60756a005e9b..5f2e6fef24f4 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
 
 RDEPEND="
diff --git a/app-office/abiword/abiword-3.0.6-r2.ebuild b/app-office/abiword/abiword-3.0.6-r2.ebuild
index 67d5302be314..2cb8248933bd 100644
--- a/app-office/abiword/abiword-3.0.6-r2.ebuild
+++ b/app-office/abiword/abiword-3.0.6-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/AbiWord-release-${PV}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86"
 IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math +plugins readline redland spell wordperfect wmf thesaurus"
 # You need 'plugins' enabled if want to enable the extra plugins
 REQUIRED_USE="
diff --git a/app-office/abiword/abiword-3.0.7.ebuild b/app-office/abiword/abiword-3.0.7.ebuild
index 2e4b88d9e9e2..ac6cda31b0f8 100644
--- a/app-office/abiword/abiword-3.0.7.ebuild
+++ b/app-office/abiword/abiword-3.0.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/AbiWord-release-${PV}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math +plugins readline redland spell wordperfect wmf thesaurus"
 # You need 'plugins' enabled if want to enable the extra plugins
 REQUIRED_USE="
diff --git a/app-office/dia/dia-0.97.3-r4.ebuild b/app-office/dia/dia-0.97.3-r4.ebuild
index bc409ad45a8b..416477d20a49 100644
--- a/app-office/dia/dia-0.97.3-r4.ebuild
+++ b/app-office/dia/dia-0.97.3-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 # the doc USE flag doesn't seem to do anything without docbook2html
 # cairo support is preferred as explained by upstream at:
 # https://bugzilla.gnome.org/show_bug.cgi?id=729668#c6
diff --git a/app-office/dia/dia-0.98_pre20250913.ebuild b/app-office/dia/dia-0.98_pre20250913.ebuild
index 34c13f05cba8..49ec52feeeb4 100644
--- a/app-office/dia/dia-0.98_pre20250913.ebuild
+++ b/app-office/dia/dia-0.98_pre20250913.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc pdf python wmf xslt X"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-25.2.7.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-25.2.7.2.ebuild
index bf1e8d8adeef..5535a795ae54 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-25.2.7.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-25.2.7.2.ebuild
@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/libreoffice-25.2.7.2-r1.ebuild b/app-office/libreoffice/libreoffice-25.2.7.2-r1.ebuild
index 8b2f9902ff51..ebbc76a6c4d9 100644
--- a/app-office/libreoffice/libreoffice-25.2.7.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.7.2-r1.ebuild
@@ -85,7 +85,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f5bc820b7a1f..345734e11c21 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -85,7 +85,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild
index 2e9e484a8672..53a90da58a34 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="bluetooth perl png threads usb"
 RESTRICT="test" #672872
 
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r5.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r5.ebuild
index 442358fff55f..c9112a48bb6d 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r5.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="bluetooth perl png threads usb"
 RESTRICT="test" #672872
 
diff --git a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
index 6dbc7265df8a..26d0984d2ea3 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/projg2/diffmask/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 
 RDEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
diff --git a/app-portage/eix/eix-0.36.9.ebuild b/app-portage/eix/eix-0.36.9.ebuild
index d030dbd64f0d..1ca6a29a17ce 100644
--- a/app-portage/eix/eix-0.36.9.ebuild
+++ b/app-portage/eix/eix-0.36.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug doc nls sqlite"
 
 DEPEND="
diff --git a/app-portage/elogv/elogv-0.8.3.ebuild b/app-portage/elogv/elogv-0.8.3.ebuild
index aacef37287d3..f2b7563a0a86 100644
--- a/app-portage/elogv/elogv-0.8.3.ebuild
+++ b/app-portage/elogv/elogv-0.8.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 PLOCALES=( "de" "es" "it" "pl" )
 IUSE="${PLOCALES[*]/#/l10n_}"
 
diff --git a/app-portage/elogv/elogv-0.8.4.ebuild b/app-portage/elogv/elogv-0.8.4.ebuild
index eec10e926357..aa19dc7715ec 100644
--- a/app-portage/elogv/elogv-0.8.4.ebuild
+++ b/app-portage/elogv/elogv-0.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 PLOCALES=( "de" "es" "it" "pl" )
 IUSE="${PLOCALES[*]/#/l10n_}"
 
diff --git a/app-portage/elt-patches/elt-patches-20240912.ebuild b/app-portage/elt-patches/elt-patches-20240912.ebuild
index a5828d797656..3a8df6541941 100644
--- a/app-portage/elt-patches/elt-patches-20240912.ebuild
+++ b/app-portage/elt-patches/elt-patches-20240912.ebuild
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/elt-patches/elt-patches-20241121.ebuild b/app-portage/elt-patches/elt-patches-20241121.ebuild
index a5828d797656..3a8df6541941 100644
--- a/app-portage/elt-patches/elt-patches-20241121.ebuild
+++ b/app-portage/elt-patches/elt-patches-20241121.ebuild
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/elt-patches/elt-patches-20250306.ebuild b/app-portage/elt-patches/elt-patches-20250306.ebuild
index a5828d797656..3a8df6541941 100644
--- a/app-portage/elt-patches/elt-patches-20250306.ebuild
+++ b/app-portage/elt-patches/elt-patches-20250306.ebuild
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/elt-patches/elt-patches-20250718.ebuild b/app-portage/elt-patches/elt-patches-20250718.ebuild
index a5828d797656..3a8df6541941 100644
--- a/app-portage/elt-patches/elt-patches-20250718.ebuild
+++ b/app-portage/elt-patches/elt-patches-20250718.ebuild
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/elt-patches/elt-patches-99999999.ebuild b/app-portage/elt-patches/elt-patches-99999999.ebuild
index 6e0afc2f2699..fbbc560ffc4c 100644
--- a/app-portage/elt-patches/elt-patches-99999999.ebuild
+++ b/app-portage/elt-patches/elt-patches-99999999.ebuild
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/esearch/esearch-1.3-r3.ebuild b/app-portage/esearch/esearch-1.3-r3.ebuild
index d1994a6e418f..553f62dbc9be 100644
--- a/app-portage/esearch/esearch-1.3-r3.ebuild
+++ b/app-portage/esearch/esearch-1.3-r3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="l10n_fr l10n_it"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="${DISTUTILS_DEPS}"
 DEPEND="sys-apps/portage"
diff --git a/app-portage/flaggie/flaggie-0.99.8.ebuild b/app-portage/flaggie/flaggie-0.99.8.ebuild
index e1bf77a9c4e1..2d75019ef268 100644
--- a/app-portage/flaggie/flaggie-0.99.8.ebuild
+++ b/app-portage/flaggie/flaggie-0.99.8.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=app-portage/gentoopm-0.5.0[${PYTHON_USEDEP}]
diff --git a/app-portage/gemato/gemato-20.10-r1.ebuild b/app-portage/gemato/gemato-20.10-r1.ebuild
index 7784fe4bb19b..0adc9976f074 100644
--- a/app-portage/gemato/gemato-20.10-r1.ebuild
+++ b/app-portage/gemato/gemato-20.10-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+gpg pretty-log tools"
 
 RDEPEND="
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.11.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.11.ebuild
index 3efb93523457..8b22c06fecc0 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.11.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.11.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild
index ca26a4827133..d4413dbba5fc 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 3efb93523457..8b22c06fecc0 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
diff --git a/app-portage/getuto/getuto-1.15-r1.ebuild b/app-portage/getuto/getuto-1.15-r1.ebuild
index ff1733680e9b..fc6f7718041b 100644
--- a/app-portage/getuto/getuto-1.15-r1.ebuild
+++ b/app-portage/getuto/getuto-1.15-r1.ebuild
@@ -15,7 +15,7 @@ else
 	"
 	S=${WORKDIR}/${PN}-${P}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/23.0/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar -> ${PN}-23.0-libc-1-r1-1.gpkg.tar )"
diff --git a/app-portage/getuto/getuto-9999.ebuild b/app-portage/getuto/getuto-9999.ebuild
index 3aae41d5975b..7315cccec2df 100644
--- a/app-portage/getuto/getuto-9999.ebuild
+++ b/app-portage/getuto/getuto-9999.ebuild
@@ -15,7 +15,7 @@ else
 	"
 	S=${WORKDIR}/${PN}-${P}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/23.0/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar -> ${PN}-23.0-libc-1-r1-1.gpkg.tar )"
diff --git a/app-portage/metagen/metagen-0.7.3-r2.ebuild b/app-portage/metagen/metagen-0.7.3-r2.ebuild
index 930c202fcc26..26c9cfa46724 100644
--- a/app-portage/metagen/metagen-0.7.3-r2.ebuild
+++ b/app-portage/metagen/metagen-0.7.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/metagen/metagen-0.7.3-r3.ebuild b/app-portage/metagen/metagen-0.7.3-r3.ebuild
index d4b7f124125a..9beb68199648 100644
--- a/app-portage/metagen/metagen-0.7.3-r3.ebuild
+++ b/app-portage/metagen/metagen-0.7.3-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/metagen/metagen-0.7.4.ebuild b/app-portage/metagen/metagen-0.7.4.ebuild
index d1b37a4c8a24..93d80e389587 100644
--- a/app-portage/metagen/metagen-0.7.4.ebuild
+++ b/app-portage/metagen/metagen-0.7.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86"
 
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
 	sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/overlint/overlint-0.5.3-r4.ebuild b/app-portage/overlint/overlint-0.5.3-r4.ebuild
index 2a19d77838d6..0f30a776eaa6 100644
--- a/app-portage/overlint/overlint-0.5.3-r4.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/overlint/overlint-0.5.3-r5.ebuild b/app-portage/overlint/overlint-0.5.3-r5.ebuild
index f034b8487e09..225697aecc03 100644
--- a/app-portage/overlint/overlint-0.5.3-r5.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/overlint/overlint-0.5.3-r6.ebuild b/app-portage/overlint/overlint-0.5.3-r6.ebuild
index e0e7cf201ca2..e504e47e34d7 100644
--- a/app-portage/overlint/overlint-0.5.3-r6.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r6.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86"
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/pfl/pfl-3.5.3.ebuild b/app-portage/pfl/pfl-3.5.3.ebuild
index 86a9aaeabbf8..d90ecd83104f 100644
--- a/app-portage/pfl/pfl-3.5.3.ebuild
+++ b/app-portage/pfl/pfl-3.5.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/client-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+network-cron"
 
 RDEPEND="
diff --git a/app-portage/portage-utils/portage-utils-0.95-r1.ebuild b/app-portage/portage-utils/portage-utils-0.95-r1.ebuild
index 2765f74f4a56..73a6989ad7d7 100644
--- a/app-portage/portage-utils/portage-utils-0.95-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.95-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/portage-utils/portage-utils-0.96-r1.ebuild b/app-portage/portage-utils/portage-utils-0.96-r1.ebuild
index 2765f74f4a56..73a6989ad7d7 100644
--- a/app-portage/portage-utils/portage-utils-0.96-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.96-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/portage-utils/portage-utils-0.96.1.ebuild b/app-portage/portage-utils/portage-utils-0.96.1.ebuild
index d447f0dbfdca..377480f0cb31 100644
--- a/app-portage/portage-utils/portage-utils-0.96.1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.96.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/portage-utils/portage-utils-0.97.ebuild b/app-portage/portage-utils/portage-utils-0.97.ebuild
index b41bde2cd282..4da9374ddac8 100644
--- a/app-portage/portage-utils/portage-utils-0.97.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.97.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 830a59b8a46a..3d8a079dc145 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-11-r1.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-11-r1.ebuild
index ae416e20b2d8..eab48b5f1039 100644
--- a/app-portage/prefix-toolkit/prefix-toolkit-11-r1.ebuild
+++ b/app-portage/prefix-toolkit/prefix-toolkit-11-r1.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>sys-apps/portage-2.3.62
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-12.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-12.ebuild
index 12611ea71c13..e99f1f320858 100644
--- a/app-portage/prefix-toolkit/prefix-toolkit-12.ebuild
+++ b/app-portage/prefix-toolkit/prefix-toolkit-12.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>sys-apps/portage-2.3.62
diff --git a/app-portage/tatt/tatt-0.11-r1.ebuild b/app-portage/tatt/tatt-0.11-r1.ebuild
index 3ded03c0cf7d..2a8b2774fb3d 100644
--- a/app-portage/tatt/tatt-0.11-r1.ebuild
+++ b/app-portage/tatt/tatt-0.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+templates"
 
 RDEPEND="
diff --git a/app-portage/ufed/ufed-0.96.ebuild b/app-portage/ufed/ufed-0.96.ebuild
index d1b7af8334dd..b6076811014c 100644
--- a/app-portage/ufed/ufed-0.96.ebuild
+++ b/app-portage/ufed/ufed-0.96.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 inherit autotools flag-o-matic out-of-source
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
index b63335d2eb27..01fd7f654c50 100644
--- a/app-portage/ufed/ufed-9999.ebuild
+++ b/app-portage/ufed/ufed-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit autotools flag-o-matic out-of-source
diff --git a/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild b/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild
index 01981d626932..843338ef77c6 100644
--- a/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash-completion/bash-completion-2.15.0.ebuild b/app-shells/bash-completion/bash-completion-2.15.0.ebuild
index e175fbb22ab1..56919cabad50 100644
--- a/app-shells/bash-completion/bash-completion-2.15.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.15.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash-completion/bash-completion-2.16.0-r1.ebuild b/app-shells/bash-completion/bash-completion-2.16.0-r1.ebuild
index e0afd55d1408..04984d330e7e 100644
--- a/app-shells/bash-completion/bash-completion-2.16.0-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.16.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash-completion/bash-completion-2.16.0-r2.ebuild b/app-shells/bash-completion/bash-completion-2.16.0-r2.ebuild
index c0314f51c351..f8e9799ad815 100644
--- a/app-shells/bash-completion/bash-completion-2.16.0-r2.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.16.0-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash-completion/bash-completion-2.16.0-r3.ebuild b/app-shells/bash-completion/bash-completion-2.16.0-r3.ebuild
index 05d74ffe46c9..a397eda403d1 100644
--- a/app-shells/bash-completion/bash-completion-2.16.0-r3.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.16.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash-completion/bash-completion-2.16.0.ebuild b/app-shells/bash-completion/bash-completion-2.16.0.ebuild
index dfeed02826ad..eb000a9acc8c 100644
--- a/app-shells/bash-completion/bash-completion-2.16.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.16.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash-completion/bash-completion-2.17.0.ebuild b/app-shells/bash-completion/bash-completion-2.17.0.ebuild
index 03c66508adc8..7fd4d5e12f02 100644
--- a/app-shells/bash-completion/bash-completion-2.17.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.17.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
index 4671ddedac16..76fe9c202946 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-5.0_p18-r3.ebuild b/app-shells/bash/bash-5.0_p18-r3.ebuild
index c6233d54a70a..4be5c744f32e 100644
--- a/app-shells/bash/bash-5.0_p18-r3.ebuild
+++ b/app-shells/bash/bash-5.0_p18-r3.ebuild
@@ -51,7 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-5.1_p16-r14.ebuild b/app-shells/bash/bash-5.1_p16-r14.ebuild
index cdfbabb26607..8e3559b3a0a9 100644
--- a/app-shells/bash/bash-5.1_p16-r14.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r14.ebuild
@@ -65,7 +65,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="GPL-3+"
 SLOT="${MY_PV}"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
diff --git a/app-shells/bash/bash-5.2_p37-r5.ebuild b/app-shells/bash/bash-5.2_p37-r5.ebuild
index 90a872e4be13..73a5fee5d6cc 100644
--- a/app-shells/bash/bash-5.2_p37-r5.ebuild
+++ b/app-shells/bash/bash-5.2_p37-r5.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
diff --git a/app-shells/bash/bash-5.3_p3-r3.ebuild b/app-shells/bash/bash-5.3_p3-r3.ebuild
index d6ccff0a3c22..3fc1d87001e8 100644
--- a/app-shells/bash/bash-5.3_p3-r3.ebuild
+++ b/app-shells/bash/bash-5.3_p3-r3.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
diff --git a/app-shells/bash/bash-5.3_p8.ebuild b/app-shells/bash/bash-5.3_p8.ebuild
index 5d454e80edc1..4d94b8719169 100644
--- a/app-shells/bash/bash-5.3_p8.ebuild
+++ b/app-shells/bash/bash-5.3_p8.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
diff --git a/app-shells/bash/bash-5.3_p9.ebuild b/app-shells/bash/bash-5.3_p9.ebuild
index 5d454e80edc1..4d94b8719169 100644
--- a/app-shells/bash/bash-5.3_p9.ebuild
+++ b/app-shells/bash/bash-5.3_p9.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
diff --git a/app-shells/bash/bash-5.4_alpha_pre20251027.ebuild b/app-shells/bash/bash-5.4_alpha_pre20251027.ebuild
index 934421cbadb5..12879e0a5de3 100644
--- a/app-shells/bash/bash-5.4_alpha_pre20251027.ebuild
+++ b/app-shells/bash/bash-5.4_alpha_pre20251027.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 # As of 5.4_alpha_pre20251016, bash tests finally exit non-0 on failure.
diff --git a/app-shells/bash/bash-5.4_alpha_pre20251119.ebuild b/app-shells/bash/bash-5.4_alpha_pre20251119.ebuild
index 6929138fb0b2..795376bd2afd 100644
--- a/app-shells/bash/bash-5.4_alpha_pre20251119.ebuild
+++ b/app-shells/bash/bash-5.4_alpha_pre20251119.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 # As of 5.4_alpha_pre20251016, bash tests finally exit non-0 on failure.
diff --git a/app-shells/bash/bash-5.4_alpha_pre20251124.ebuild b/app-shells/bash/bash-5.4_alpha_pre20251124.ebuild
index 9b9b34a1edba..abc3661059c3 100644
--- a/app-shells/bash/bash-5.4_alpha_pre20251124.ebuild
+++ b/app-shells/bash/bash-5.4_alpha_pre20251124.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 # As of 5.4_alpha_pre20251016, bash tests finally exit non-0 on failure.
diff --git a/app-shells/bash/bash-5.4_alpha_pre20251202.ebuild b/app-shells/bash/bash-5.4_alpha_pre20251202.ebuild
index 66dcec64880d..1eb61c65c23f 100644
--- a/app-shells/bash/bash-5.4_alpha_pre20251202.ebuild
+++ b/app-shells/bash/bash-5.4_alpha_pre20251202.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 # As of 5.4_alpha_pre20251016, bash tests finally exit non-0 on failure.
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 1a41666fa168..cf602fa80daa 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 # As of 5.4_alpha_pre20251016, bash tests finally exit non-0 on failure.
diff --git a/app-shells/dash/dash-0.5.12-r1.ebuild b/app-shells/dash/dash-0.5.12-r1.ebuild
index e9e20aa22110..842fb665b3bd 100644
--- a/app-shells/dash/dash-0.5.12-r1.ebuild
+++ b/app-shells/dash/dash-0.5.12-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/app-shells/dash/dash-0.5.13.1.ebuild b/app-shells/dash/dash-0.5.13.1.ebuild
index 51dc9f506c6e..a75237ee0d89 100644
--- a/app-shells/dash/dash-0.5.13.1.ebuild
+++ b/app-shells/dash/dash-0.5.13.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/app-shells/dash/dash-9999.ebuild b/app-shells/dash/dash-9999.ebuild
index ccd89c405927..1779af414917 100644
--- a/app-shells/dash/dash-9999.ebuild
+++ b/app-shells/dash/dash-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/app-shells/dsh/dsh-0.25.10-r2.ebuild b/app-shells/dsh/dsh-0.25.10-r2.ebuild
index e928ad2dbbf3..41252d1ab6b8 100644
--- a/app-shells/dsh/dsh-0.25.10-r2.ebuild
+++ b/app-shells/dsh/dsh-0.25.10-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 DEPEND="dev-libs/libdshconfig"
diff --git a/app-shells/fish/fish-3.7.1.ebuild b/app-shells/fish/fish-3.7.1.ebuild
index 27026f20dda8..2f84538911a8 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fish/fish-4.0.6.ebuild b/app-shells/fish/fish-4.0.6.ebuild
index ec4754022b3a..98de346d738c 100644
--- a/app-shells/fish/fish-4.0.6.ebuild
+++ b/app-shells/fish/fish-4.0.6.ebuild
@@ -27,7 +27,7 @@ else
 		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fish/fish-4.0.8.ebuild b/app-shells/fish/fish-4.0.8.ebuild
index ec4754022b3a..98de346d738c 100644
--- a/app-shells/fish/fish-4.0.8.ebuild
+++ b/app-shells/fish/fish-4.0.8.ebuild
@@ -27,7 +27,7 @@ else
 		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fish/fish-4.1.0.ebuild b/app-shells/fish/fish-4.1.0.ebuild
index 9831329254fa..b573c7b0be13 100644
--- a/app-shells/fish/fish-4.1.0.ebuild
+++ b/app-shells/fish/fish-4.1.0.ebuild
@@ -27,7 +27,7 @@ else
 		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fish/fish-4.1.1.ebuild b/app-shells/fish/fish-4.1.1.ebuild
index 8688f99786cd..f37b812f42bf 100644
--- a/app-shells/fish/fish-4.1.1.ebuild
+++ b/app-shells/fish/fish-4.1.1.ebuild
@@ -27,7 +27,7 @@ else
 		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fish/fish-4.1.2.ebuild b/app-shells/fish/fish-4.1.2.ebuild
index 5396efb1ef03..6132e0ec1930 100644
--- a/app-shells/fish/fish-4.1.2.ebuild
+++ b/app-shells/fish/fish-4.1.2.ebuild
@@ -27,7 +27,7 @@ else
 		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fish/fish-4.2.0.ebuild b/app-shells/fish/fish-4.2.0.ebuild
index 2d2868c136e4..96be1ae3e679 100644
--- a/app-shells/fish/fish-4.2.0.ebuild
+++ b/app-shells/fish/fish-4.2.0.ebuild
@@ -28,7 +28,7 @@ else
 		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fish/fish-4.2.1.ebuild b/app-shells/fish/fish-4.2.1.ebuild
index 2d2868c136e4..96be1ae3e679 100644
--- a/app-shells/fish/fish-4.2.1.ebuild
+++ b/app-shells/fish/fish-4.2.1.ebuild
@@ -28,7 +28,7 @@ else
 		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 9831329254fa..b573c7b0be13 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -27,7 +27,7 @@ else
 		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240625.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240625.ebuild
index cdff41ed34a9..161d41713133 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240625.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240625.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20250620.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20250620.ebuild
index cdff41ed34a9..161d41713133 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20250620.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20250620.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
index bd8ea4b5eab9..472c6ccbc607 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20220112.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20230117.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20230117.ebuild
index bd8ea4b5eab9..472c6ccbc607 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20230117.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20230117.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
index b9da30d7f7b8..f46c5e812986 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-59c.ebuild
index c447e8a195c0..8a12e55f6592 100644
--- a/app-shells/mksh/mksh-59c.ebuild
+++ b/app-shells/mksh/mksh-59c.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit cvs
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index 5c43ce0c33a5..184fff78f758 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit cvs
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/powerline/powerline-2.8.4.ebuild b/app-shells/powerline/powerline-2.8.4.ebuild
index 94e33ca0f8dc..b4d44d717765 100644
--- a/app-shells/powerline/powerline-2.8.4.ebuild
+++ b/app-shells/powerline/powerline-2.8.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-shells/powerline/powerline-9999.ebuild b/app-shells/powerline/powerline-9999.ebuild
index 0d967459eb7a..0e8ab0f0f785 100644
--- a/app-shells/powerline/powerline-9999.ebuild
+++ b/app-shells/powerline/powerline-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-shells/push/push-3.4.ebuild b/app-shells/push/push-3.4.ebuild
index 9b8e2397a993..4d9579ba1721 100644
--- a/app-shells/push/push-3.4.ebuild
+++ b/app-shells/push/push-3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_compile() { :; }
 
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
index b4b9dcf44c5f..ede9828632ea 100644
--- a/app-shells/quoter/quoter-4.2.ebuild
+++ b/app-shells/quoter/quoter-4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_configure() {
 	tc-export CC
diff --git a/app-shells/tcsh/tcsh-6.24.15.ebuild b/app-shells/tcsh/tcsh-6.24.15.ebuild
index 5e298ef20114..c2ce9074c23a 100644
--- a/app-shells/tcsh/tcsh-6.24.15.ebuild
+++ b/app-shells/tcsh/tcsh-6.24.15.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls man"
 RESTRICT="test"
 
diff --git a/app-shells/tcsh/tcsh-6.24.16.ebuild b/app-shells/tcsh/tcsh-6.24.16.ebuild
index 75eb0cdb1897..c6d5bbc5d2f7 100644
--- a/app-shells/tcsh/tcsh-6.24.16.ebuild
+++ b/app-shells/tcsh/tcsh-6.24.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls man"
 RESTRICT="test"
 
diff --git a/app-shells/zsh/zsh-5.9-r6.ebuild b/app-shells/zsh/zsh-5.9-r6.ebuild
index ffc06799acf4..251b75d01ce9 100644
--- a/app-shells/zsh/zsh-5.9-r6.ebuild
+++ b/app-shells/zsh/zsh-5.9-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit autotools flag-o-matic prefix
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 	https://www.zsh.org/pub/old/${P}.tar.xz
diff --git a/app-shells/zsh/zsh-5.9-r7.ebuild b/app-shells/zsh/zsh-5.9-r7.ebuild
index 346bda2452ef..5e3f8535f148 100644
--- a/app-shells/zsh/zsh-5.9-r7.ebuild
+++ b/app-shells/zsh/zsh-5.9-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit autotools flag-o-matic prefix
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 	https://www.zsh.org/pub/old/${P}.tar.xz
diff --git a/app-shells/zsh/zsh-5.9.0.3-r2.ebuild b/app-shells/zsh/zsh-5.9.0.3-r2.ebuild
index b28d4a9acba9..9d0cfcc6e0ea 100644
--- a/app-shells/zsh/zsh-5.9.0.3-r2.ebuild
+++ b/app-shells/zsh/zsh-5.9.0.3-r2.ebuild
@@ -13,7 +13,7 @@ else
 	SRC_URI="https://downloads.sourceforge.net/zsh/zsh-test/${PV}-test/${P}-test.tar.xz
 		doc? ( https://downloads.sourceforge.net/zsh/zsh-test/${P}-test-doc.tar.xz )"
 	S="${WORKDIR}/${P}-test"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 749bda0f989f..a1e435d62ec1 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
diff --git a/app-text/a2ps/a2ps-4.15.5-r1.ebuild b/app-text/a2ps/a2ps-4.15.5-r1.ebuild
index 82abbd06c9c9..1421153777ee 100644
--- a/app-text/a2ps/a2ps-4.15.5-r1.ebuild
+++ b/app-text/a2ps/a2ps-4.15.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cjk emacs latex nls static-libs vanilla"
 
 # a2ps-lpr-wrapper needs bash
diff --git a/app-text/a2ps/a2ps-4.15.6.ebuild b/app-text/a2ps/a2ps-4.15.6.ebuild
index bbaf4f6f5ea2..7b725e521fc7 100644
--- a/app-text/a2ps/a2ps-4.15.6.ebuild
+++ b/app-text/a2ps/a2ps-4.15.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cjk emacs latex nls static-libs vanilla"
 
 # a2ps-lpr-wrapper needs bash
diff --git a/app-text/a2ps/a2ps-4.15.7.ebuild b/app-text/a2ps/a2ps-4.15.7.ebuild
index 657260b6008a..e715fc264375 100644
--- a/app-text/a2ps/a2ps-4.15.7.ebuild
+++ b/app-text/a2ps/a2ps-4.15.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cjk emacs latex nls static-libs vanilla"
 
 # a2ps-lpr-wrapper needs bash
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild
index 1cc4f21ec070..c9713e4d14ea 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/antiword/antiword-0.37-r2.ebuild b/app-text/antiword/antiword-0.37-r2.ebuild
index 2c14eb558fe1..864817607c19 100644
--- a/app-text/antiword/antiword-0.37-r2.ebuild
+++ b/app-text/antiword/antiword-0.37-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${WORKDIR}"/${PN}-gentoo-patches-${PATCHVER}
diff --git a/app-text/asciidoc/asciidoc-10.2.1.ebuild b/app-text/asciidoc/asciidoc-10.2.1.ebuild
index b1940b11079b..cfd71dfd8700 100644
--- a/app-text/asciidoc/asciidoc-10.2.1.ebuild
+++ b/app-text/asciidoc/asciidoc-10.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-text/docbook-xml-dtd:4.5
diff --git a/app-text/aspell/aspell-0.60.8.1-r1.ebuild b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
index 5e7ca0550b5c..2c5ab56ac483 100644
--- a/app-text/aspell/aspell-0.60.8.1-r1.ebuild
+++ b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="nls unicode"
 
 # All available language app-dicts/aspell-* packages.
diff --git a/app-text/barcode/barcode-0.99-r2.ebuild b/app-text/barcode/barcode-0.99-r2.ebuild
index 89904228d363..ecad0d14abe5 100644
--- a/app-text/barcode/barcode-0.99-r2.ebuild
+++ b/app-text/barcode/barcode-0.99-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/barcode/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="app-text/libpaper"
 DEPEND="${RDEPEND}"
diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
index 660c9dcf049f..8c2faec49011 100644
--- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ulrik.haugen.se/pub/unix/bogosort/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/xmalloc.patch
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
index c61806eaee27..4f48e2461676 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
index 7c61372ae8b7..868df2f6fbc3 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/c2ps/c2ps-4.0.ebuild b/app-text/c2ps/c2ps-4.0.ebuild
index c80c0e79a1aa..5c915bd911a8 100644
--- a/app-text/c2ps/c2ps-4.0.ebuild
+++ b/app-text/c2ps/c2ps-4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cs.technion.ac.il/users/c2ps/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-LDFLAGS.patch" )
diff --git a/app-text/catdoc/catdoc-0.95-r1.ebuild b/app-text/catdoc/catdoc-0.95-r1.ebuild
index f0d4b65fba58..d9456152de86 100644
--- a/app-text/catdoc/catdoc-0.95-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.95-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~x64-solaris"
 IUSE="tk"
 
 DEPEND="tk? ( >=dev-lang/tk-8.1 )"
diff --git a/app-text/code2html/code2html-0.9.1-r2.ebuild b/app-text/code2html/code2html-0.9.1-r2.ebuild
index addbfe53b588..e3a5da396837 100644
--- a/app-text/code2html/code2html-0.9.1-r2.ebuild
+++ b/app-text/code2html/code2html-0.9.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.palfrader.org/code2html/all/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 RDEPEND=">=dev-lang/perl-5"
 
diff --git a/app-text/convertlit/convertlit-1.8-r4.ebuild b/app-text/convertlit/convertlit-1.8-r4.ebuild
index 3568cbc083fa..1ee0af7452a2 100644
--- a/app-text/convertlit/convertlit-1.8-r4.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
 DEPEND="${RDEPEND}"
diff --git a/app-text/cwtext/cwtext-0.96-r2.ebuild b/app-text/cwtext/cwtext-0.96-r2.ebuild
index 3b637eaa5321..bc62294a1c65 100644
--- a/app-text/cwtext/cwtext-0.96-r2.ebuild
+++ b/app-text/cwtext/cwtext-0.96-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.96-pcm.patch
diff --git a/app-text/dictd/dictd-1.13.3.ebuild b/app-text/dictd/dictd-1.13.3.ebuild
index 94ad745133b9..09d5d56cdc35 100644
--- a/app-text/dictd/dictd-1.13.3.ebuild
+++ b/app-text/dictd/dictd-1.13.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/dict/${P}.tar.gz"
 
 LICENSE="GPL-1+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="dbi judy minimal selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/diction/diction-1.14.ebuild b/app-text/diction/diction-1.14.ebuild
index 12ba4279b679..99a1a64520f1 100644
--- a/app-text/diction/diction-1.14.ebuild
+++ b/app-text/diction/diction-1.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86 ~x64-macos"
 
 DEPEND="
 	sys-devel/gettext
diff --git a/app-text/djvu/djvu-3.5.29.ebuild b/app-text/djvu/djvu-3.5.29.ebuild
index 4437b391542b..1d2128da0b11 100644
--- a/app-text/djvu/djvu-3.5.29.ebuild
+++ b/app-text/djvu/djvu-3.5.29.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P%%.3}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index dcb851c4f1c5..95b1736d032e 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
index cda733fd1b51..ecefa4af0e1b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
index cda733fd1b51..ecefa4af0e1b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
index cda733fd1b51..ecefa4af0e1b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild
index 203e5161e8f0..3b399a8e0dda 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
index 6b3ab4f683f3..d9d6cde39d6c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
index 54e46a60aa87..73a3ce4b50a3 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
index bec383fe49d0..6fffd33ff7a0 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
index 27764691b456..bd7a51464f3e 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild
index f5fc49fdf251..3abdeab84dba 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index d2219ee8ef31..b5c75f07722b 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index e0abed4631e9..c4bc6bf50265 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index e0abed4631e9..c4bc6bf50265 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index 5518627bc856..402f3d5949ee 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index 5518627bc856..402f3d5949ee 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index e05edd36be6a..f5f1a790fcf5 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index 9239634ebfb5..66db21f3c0bd 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index 69eb28f890eb..d8ac0460a9a8 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
index a46af6d82a83..58c0af4d815b 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="ruby"
 # Makefile is broken since 1.76.0
 RESTRICT="test"
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild
index 0f73cdfb06e1..5a1c864ab128 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/docbook2x/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/dos2unix/dos2unix-7.5.2.ebuild b/app-text/dos2unix/dos2unix-7.5.2.ebuild
index b2ed294aa7e1..0f2f970458a3 100644
--- a/app-text/dos2unix/dos2unix-7.5.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.5.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P/_/-}
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="debug nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dos2unix/dos2unix-7.5.3.ebuild b/app-text/dos2unix/dos2unix-7.5.3.ebuild
index 578f670f7f42..8a05ebf9933e 100644
--- a/app-text/dos2unix/dos2unix-7.5.3.ebuild
+++ b/app-text/dos2unix/dos2unix-7.5.3.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P/_/-}
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="debug nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/doxygen/doxygen-1.13.2.ebuild b/app-text/doxygen/doxygen-1.13.2.ebuild
index 5d834dc7dac9..a4b1156c95d3 100644
--- a/app-text/doxygen/doxygen-1.13.2.ebuild
+++ b/app-text/doxygen/doxygen-1.13.2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
 	SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 # GPL-2 also for bundled libmscgen
diff --git a/app-text/doxygen/doxygen-1.14.0.ebuild b/app-text/doxygen/doxygen-1.14.0.ebuild
index 7104ede61158..be95e0a5c794 100644
--- a/app-text/doxygen/doxygen-1.14.0.ebuild
+++ b/app-text/doxygen/doxygen-1.14.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
 	SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 # GPL-2 also for bundled libmscgen
diff --git a/app-text/doxygen/doxygen-1.15.0-r1.ebuild b/app-text/doxygen/doxygen-1.15.0-r1.ebuild
index ac2b5b85453a..80bde982bb66 100644
--- a/app-text/doxygen/doxygen-1.15.0-r1.ebuild
+++ b/app-text/doxygen/doxygen-1.15.0-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
 	SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 # GPL-2 also for bundled libmscgen
diff --git a/app-text/doxygen/doxygen-1.15.0.ebuild b/app-text/doxygen/doxygen-1.15.0.ebuild
index 2a6feda9842e..7d543f91d9bc 100644
--- a/app-text/doxygen/doxygen-1.15.0.ebuild
+++ b/app-text/doxygen/doxygen-1.15.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
 	SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 # GPL-2 also for bundled libmscgen
diff --git a/app-text/doxygen/doxygen-9999.ebuild b/app-text/doxygen/doxygen-9999.ebuild
index 2a6feda9842e..7d543f91d9bc 100644
--- a/app-text/doxygen/doxygen-9999.ebuild
+++ b/app-text/doxygen/doxygen-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
 	SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 # GPL-2 also for bundled libmscgen
diff --git a/app-text/dvipng/dvipng-1.18.ebuild b/app-text/dvipng/dvipng-1.18.ebuild
index f3dceec58520..599e2e1228b5 100644
--- a/app-text/dvipng/dvipng-1.18.ebuild
+++ b/app-text/dvipng/dvipng-1.18.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild b/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild
index dc3f335cf11a..c72313dada7e 100644
--- a/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild
+++ b/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1:="
diff --git a/app-text/dvipsk/dvipsk-2024.03.11_p70015.ebuild b/app-text/dvipsk/dvipsk-2024.03.11_p70015.ebuild
index f2ec974ab4ca..850249d41882 100644
--- a/app-text/dvipsk/dvipsk-2024.03.11_p70015.ebuild
+++ b/app-text/dvipsk/dvipsk-2024.03.11_p70015.ebuild
@@ -24,7 +24,7 @@ SRC_URI+=" ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1:="
diff --git a/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
index a644f508d1c6..6b16542336e0 100644
--- a/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 
 # Tests don't work from ${WORKDIR}: kpathsea tries to search in relative
diff --git a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
index eafd5079295d..81eb62202342 100644
--- a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 # variant: Boost-1.0
 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvisvgm/dvisvgm-3.1.2.ebuild b/app-text/dvisvgm/dvisvgm-3.1.2.ebuild
index 1c645dc4f4de..4d975d44def8 100644
--- a/app-text/dvisvgm/dvisvgm-3.1.2.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 # variant: Boost-1.0
 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvisvgm/dvisvgm-3.1.ebuild b/app-text/dvisvgm/dvisvgm-3.1.ebuild
index 1c645dc4f4de..4d975d44def8 100644
--- a/app-text/dvisvgm/dvisvgm-3.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 # variant: Boost-1.0
 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvisvgm/dvisvgm-3.2.ebuild b/app-text/dvisvgm/dvisvgm-3.2.ebuild
index 1c645dc4f4de..4d975d44def8 100644
--- a/app-text/dvisvgm/dvisvgm-3.2.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 # variant: Boost-1.0
 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvisvgm/dvisvgm-3.3.ebuild b/app-text/dvisvgm/dvisvgm-3.3.ebuild
index e87e30cebd71..56f686763427 100644
--- a/app-text/dvisvgm/dvisvgm-3.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 # variant: Boost-1.0
 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvisvgm/dvisvgm-3.4.ebuild b/app-text/dvisvgm/dvisvgm-3.4.ebuild
index 08ea2ad59afe..40ff6af98852 100644
--- a/app-text/dvisvgm/dvisvgm-3.4.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 # variant: Boost-1.0
 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild
index c2d69e7f93ed..f5e4a917c7f3 100644
--- a/app-text/enchant/enchant-1.6.1-r2.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rrthomas/enchant/releases/download/${PN}-${MY_PV}/${
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aspell +hunspell test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.6.1-r1.ebuild b/app-text/enchant/enchant-2.6.1-r1.ebuild
index f558669d2427..1b779c29632a 100644
--- a/app-text/enchant/enchant-2.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-2.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rrthomas/enchant/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE="aspell +hunspell nuspell test voikko"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.8.12.ebuild b/app-text/enchant/enchant-2.8.12.ebuild
index 7a40cbaa1d62..59910c886957 100644
--- a/app-text/enchant/enchant-2.8.12.ebuild
+++ b/app-text/enchant/enchant-2.8.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rrthomas/enchant/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE="aspell +hunspell nuspell test voikko"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.8.14.ebuild b/app-text/enchant/enchant-2.8.14.ebuild
index 0bd21b2aa020..c59600f376ba 100644
--- a/app-text/enchant/enchant-2.8.14.ebuild
+++ b/app-text/enchant/enchant-2.8.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rrthomas/enchant/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 IUSE="aspell +hunspell nuspell test voikko"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enscript/enscript-1.6.6-r1.ebuild b/app-text/enscript/enscript-1.6.6-r1.ebuild
index e11d2004b76c..6864731e4769 100644
--- a/app-text/enscript/enscript-1.6.6-r1.ebuild
+++ b/app-text/enscript/enscript-1.6.6-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
 
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
diff --git a/app-text/enscript/enscript-1.6.6-r2.ebuild b/app-text/enscript/enscript-1.6.6-r2.ebuild
index 162bcae8b2a6..f9839888edbd 100644
--- a/app-text/enscript/enscript-1.6.6-r2.ebuild
+++ b/app-text/enscript/enscript-1.6.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls ruby"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-text/epspdf/epspdf-0.6.5.1.ebuild b/app-text/epspdf/epspdf-0.6.5.1.ebuild
index 999cba9af053..d7275387a43d 100644
--- a/app-text/epspdf/epspdf-0.6.5.1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.5.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc tk"
 
 RDEPEND="
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index b919f8319901..8f33f4d133ca 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/evince/evince-48.0-r2.ebuild b/app-text/evince/evince-48.0-r2.ebuild
index 4df7ca19ae40..6c222b0d3d52 100644
--- a/app-text/evince/evince-48.0-r2.ebuild
+++ b/app-text/evince/evince-48.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://apps.gnome.org/Evince/"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~x64-solaris"
 IUSE="X cups djvu dvi gstreamer gnome keyring gtk-doc +introspection postscript spell tiff wayland xps"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
diff --git a/app-text/evince/evince-48.1.ebuild b/app-text/evince/evince-48.1.ebuild
index 4186493faa3e..fb7e0f357231 100644
--- a/app-text/evince/evince-48.1.ebuild
+++ b/app-text/evince/evince-48.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://apps.gnome.org/Evince/"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~x64-solaris"
 IUSE="X cups djvu dvi gstreamer gnome keyring gtk-doc +introspection postscript spell tiff xps wayland"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
diff --git a/app-text/expander/expander-2.05-r3.ebuild b/app-text/expander/expander-2.05-r3.ebuild
index 02129e17f47d..b4d53d792b6c 100644
--- a/app-text/expander/expander-2.05-r3.ebuild
+++ b/app-text/expander/expander-2.05-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.05.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.05.1.ebuild
index 566004efefbc..6be36b204c2f 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.05.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.05.1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="cups cpu_flags_arm_neon dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.06.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.06.0.ebuild
index 7223381feacb..ce671c1f7e79 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.06.0.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.06.0.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="cups cpu_flags_arm_neon dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/grutatxt/grutatxt-2.200.0.ebuild b/app-text/grutatxt/grutatxt-2.200.0.ebuild
index 912b1f6ae615..3b17874c397f 100644
--- a/app-text/grutatxt/grutatxt-2.200.0.ebuild
+++ b/app-text/grutatxt/grutatxt-2.200.0.ebuild
@@ -15,4 +15,4 @@ SRC_URI="https://triptico.com/download/${PN}.tar.gz -> ${P}.tar.gz"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
diff --git a/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild
index dbcd90307d2f..87646213c0a4 100644
--- a/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	x11-libs/gtk+:2
diff --git a/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild
index 29c120f0fbae..36333fc4d18b 100644
--- a/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/gv/gv-3.7.4.ebuild b/app-text/gv/gv-3.7.4.ebuild
index 38a3c8ec5e41..b06340092549 100644
--- a/app-text/gv/gv-3.7.4.ebuild
+++ b/app-text/gv/gv-3.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.gnu.org/gnu/gv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/app-text/highlight/highlight-4.12.ebuild b/app-text/highlight/highlight-4.12.ebuild
index a7e42a00980f..f7880a5394ab 100644
--- a/app-text/highlight/highlight-4.12.ebuild
+++ b/app-text/highlight/highlight-4.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples gui test"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild b/app-text/hnb/hnb-1.9.18-r1.ebuild
index 394240c9f944..db244c6aa460 100644
--- a/app-text/hnb/hnb-1.9.18-r1.ebuild
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://hnb.sourceforge.net/.files/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}"
diff --git a/app-text/html-xml-utils/html-xml-utils-8.7-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-8.7-r1.ebuild
index 0cbe9d15def6..272ec4e870e1 100644
--- a/app-text/html-xml-utils/html-xml-utils-8.7-r1.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-8.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	net-dns/libidn2:=
diff --git a/app-text/html2text/html2text-2.2.3-r1.ebuild b/app-text/html2text/html2text-2.2.3-r1.ebuild
index c2eb6d0dc55c..b0d307e13bca 100644
--- a/app-text/html2text/html2text-2.2.3-r1.ebuild
+++ b/app-text/html2text/html2text-2.2.3-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
 else
 	SRC_URI="https://github.com/grobian/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTML to text converter"
diff --git a/app-text/html2text/html2text-2.4.0.ebuild b/app-text/html2text/html2text-2.4.0.ebuild
index 1aedfed1d455..7021e80f5f4f 100644
--- a/app-text/html2text/html2text-2.4.0.ebuild
+++ b/app-text/html2text/html2text-2.4.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/grobian/html2text.git"
 else
 	SRC_URI="https://gitlab.com/-/project/48313341/uploads/8526650dd42218b3493ce7ca0a3eeb1e/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTML to text converter, aimed at email for clients like Mutt"
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
index 654831b4a6ce..9bbe1470eba2 100644
--- a/app-text/html401/html401-19991224-r4.ebuild
+++ b/app-text/html401/html401-19991224-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.w3.org/TR/1999/REC-html401-${PV}/html40.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~s390 x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index 3f872c852043..8bae79b25c3d 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 S="${WORKDIR}/${PN}"
 PATCHES=(
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild
index c63925f357c6..88c37a23aec8 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0/58" # subslot is SOVERSION
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="deprecated test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/hunspell/hunspell-1.7.2-r1.ebuild b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
index 4d330ef79c6e..36fcf7449aa6 100644
--- a/app-text/hunspell/hunspell-1.7.2-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/libiconv
diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild
index e91a9caf82b9..71128b1e9633 100644
--- a/app-text/hunspell/hunspell-1.7.2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
diff --git a/app-text/iso-codes/iso-codes-4.18.0.ebuild b/app-text/iso-codes/iso-codes-4.18.0.ebuild
index f74d11277e1a..738dd520d4ad 100644
--- a/app-text/iso-codes/iso-codes-4.18.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.18.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/iso-codes/iso-codes-4.19.0.ebuild b/app-text/iso-codes/iso-codes-4.19.0.ebuild
index 842b029ce751..e50a25e94003 100644
--- a/app-text/iso-codes/iso-codes-4.19.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.19.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild
index 04642d5a7664..5dd01ab58e7a 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lcdf.org/type/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+kpathsea"
 
 RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )"
diff --git a/app-text/lesspipe/lesspipe-2.11-r1.ebuild b/app-text/lesspipe/lesspipe-2.11-r1.ebuild
index af3dc161a804..a807b2e710ee 100644
--- a/app-text/lesspipe/lesspipe-2.11-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-2.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Please check again on bumps! (bug #734896)
diff --git a/app-text/lesspipe/lesspipe-2.12.ebuild b/app-text/lesspipe/lesspipe-2.12.ebuild
index 89e7d86b512e..7307d297c38b 100644
--- a/app-text/lesspipe/lesspipe-2.12.ebuild
+++ b/app-text/lesspipe/lesspipe-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Please check again on bumps! (bug #734896)
diff --git a/app-text/lesspipe/lesspipe-2.13.ebuild b/app-text/lesspipe/lesspipe-2.13.ebuild
index 89e7d86b512e..7307d297c38b 100644
--- a/app-text/lesspipe/lesspipe-2.13.ebuild
+++ b/app-text/lesspipe/lesspipe-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Please check again on bumps! (bug #734896)
diff --git a/app-text/libexttextcat/libexttextcat-3.4.7-r1.ebuild b/app-text/libexttextcat/libexttextcat-3.4.7-r1.ebuild
index f497da882439..282596ad2fdc 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.7-r1.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.7-lto.patch
diff --git a/app-text/libexttextcat/libexttextcat-3.4.7.ebuild b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild
index a07bb26a3d45..b62dfe4d5e3b 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.7.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_configure() {
 	econf \
diff --git a/app-text/libodfgen/libodfgen-0.1.8-r1.ebuild b/app-text/libodfgen/libodfgen-0.1.8-r1.ebuild
index b711dbbe24ef..47768917c389 100644
--- a/app-text/libodfgen/libodfgen-0.1.8-r1.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.8-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/libwpd/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 5639e33a3ea5..e4305bb0c82e 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/libwpd/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/libpaper/libpaper-2.1.3.ebuild b/app-text/libpaper/libpaper-2.1.3.ebuild
index 4492f823c07b..bec66e0c58ed 100644
--- a/app-text/libpaper/libpaper-2.1.3.ebuild
+++ b/app-text/libpaper/libpaper-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.
 # paperspecs is public-domain
 LICENSE="LGPL-2.1+ GPL-3+ public-domain"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
 	# Gnulib false positives #898346
diff --git a/app-text/libspectre/libspectre-0.2.12.ebuild b/app-text/libspectre/libspectre-0.2.12.ebuild
index 3fee7b5dc639..0cbf6dcde657 100644
--- a/app-text/libspectre/libspectre-0.2.12.ebuild
+++ b/app-text/libspectre/libspectre-0.2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="debug doc"
 
 RDEPEND=">=app-text/ghostscript-gpl-9.53.0:="
diff --git a/app-text/lv/lv-4.51-r5.ebuild b/app-text/lv/lv-4.51-r5.ebuild
index c6b59ff479ab..3fec69551ff4 100644
--- a/app-text/lv/lv-4.51-r5.ebuild
+++ b/app-text/lv/lv-4.51-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="!app-editors/levee
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 3d1d70979a33..23d2e43a9b1e 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 S=${WORKDIR}
 
diff --git a/app-text/multitail/multitail-7.0.0.ebuild b/app-text/multitail/multitail-7.0.0.ebuild
index 373a4a68bf68..e05f1249aa45 100644
--- a/app-text/multitail/multitail-7.0.0.ebuild
+++ b/app-text/multitail/multitail-7.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="debug examples unicode"
 
 RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/app-text/multitail/multitail-7.1.2.ebuild b/app-text/multitail/multitail-7.1.2.ebuild
index 9e4caa1b538d..8c73ef0f1b96 100644
--- a/app-text/multitail/multitail-7.1.2.ebuild
+++ b/app-text/multitail/multitail-7.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="debug examples unicode"
 
 RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/app-text/multitail/multitail-7.1.5-r1.ebuild b/app-text/multitail/multitail-7.1.5-r1.ebuild
index b9b0ade07458..11450a531b09 100644
--- a/app-text/multitail/multitail-7.1.5-r1.ebuild
+++ b/app-text/multitail/multitail-7.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="debug examples unicode"
 
 RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/app-text/mythes/mythes-1.2.5.ebuild b/app-text/mythes/mythes-1.2.5.ebuild
index 1d2f70215835..c8883f045d20 100644
--- a/app-text/mythes/mythes-1.2.5.ebuild
+++ b/app-text/mythes/mythes-1.2.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/hunspell/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug"
 
 RDEPEND="app-text/hunspell:="
diff --git a/app-text/o3read/o3read-0.0.4.ebuild b/app-text/o3read/o3read-0.0.4.ebuild
index 103a5cb6dfdf..49d7a5120872 100644
--- a/app-text/o3read/o3read-0.0.4.ebuild
+++ b/app-text/o3read/o3read-0.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 RESTRICT="test"
 
 PATCHES=( "${FILESDIR}"/${P}-fix-buildsystem.patch )
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 860e95e2cf36..5af24067a81e 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-text/sgml-common
diff --git a/app-text/opensp/opensp-1.5.2-r10.ebuild b/app-text/opensp/opensp-1.5.2-r10.ebuild
index bcb80efdcea4..8cbcf74a3400 100644
--- a/app-text/opensp/opensp-1.5.2-r10.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r10.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/par/par-1.53.0.ebuild b/app-text/par/par-1.53.0.ebuild
index 1790599360ac..35e7ac398666 100644
--- a/app-text/par/par-1.53.0.ebuild
+++ b/app-text/par/par-1.53.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( MIT par )"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~mips ~sparc ~x86 ~x64-macos"
 
 src_compile() {
 	emake -f protoMakefile CC="$(tc-getCC) ${CFLAGS} -c" \
diff --git a/app-text/pdf2html/pdf2html-1.4.ebuild b/app-text/pdf2html/pdf2html-1.4.ebuild
index 5eb62390f0bf..3afbb6abe920 100644
--- a/app-text/pdf2html/pdf2html-1.4.ebuild
+++ b/app-text/pdf2html/pdf2html-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 DEPEND=">=media-libs/libpng-1.4
 	virtual/zlib:="
diff --git a/app-text/pdfjam/pdfjam-3.12.ebuild b/app-text/pdfjam/pdfjam-3.12.ebuild
index 72273687d756..4584f47ab7e9 100644
--- a/app-text/pdfjam/pdfjam-3.12.ebuild
+++ b/app-text/pdfjam/pdfjam-3.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 IUSE="extra test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/pdfjam/pdfjam-4.1.ebuild b/app-text/pdfjam/pdfjam-4.1.ebuild
index 854839985c7b..8f39fa70e683 100644
--- a/app-text/pdfjam/pdfjam-4.1.ebuild
+++ b/app-text/pdfjam/pdfjam-4.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 IUSE="extra test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index 58acba0b225c..53e8444e9426 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~mips ppc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/app-text/po4a/po4a-0.73-r1.ebuild b/app-text/po4a/po4a-0.73-r1.ebuild
index f20a94ef9608..b04a7bce787f 100644
--- a/app-text/po4a/po4a-0.73-r1.ebuild
+++ b/app-text/po4a/po4a-0.73-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.74-r1.ebuild b/app-text/po4a/po4a-0.74-r1.ebuild
index 83c07fd11d09..f611a043f051 100644
--- a/app-text/po4a/po4a-0.74-r1.ebuild
+++ b/app-text/po4a/po4a-0.74-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/poppler-data/poppler-data-0.4.12.ebuild b/app-text/poppler-data/poppler-data-0.4.12.ebuild
index f508a8db9df1..da3095c44fc5 100644
--- a/app-text/poppler-data/poppler-data-0.4.12.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPL
 # AGPL-3+ for the extra files needed by ghostscript, bug #844115
 LICENSE="AGPL-3+ BSD GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_install() {
 	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
diff --git a/app-text/poppler/poppler-25.11.0.ebuild b/app-text/poppler/poppler-25.11.0.ebuild
index 4352decd7b06..9f82f2b9134a 100644
--- a/app-text/poppler/poppler-25.11.0.ebuild
+++ b/app-text/poppler/poppler-25.11.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	SLOT="0/154"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-25.12.0.ebuild b/app-text/poppler/poppler-25.12.0.ebuild
index 8ab5dc78cf93..8317e4ec3bf0 100644
--- a/app-text/poppler/poppler-25.12.0.ebuild
+++ b/app-text/poppler/poppler-25.12.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	SLOT="0/155"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 8ab5dc78cf93..8317e4ec3bf0 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	SLOT="0/155"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index 2100721bc57a..28ae5baf2a15 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild
index a08792c2f429..a423245cecc4 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1:="
 RDEPEND="${DEPEND}"
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20240311.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20240311.ebuild
index 412e79b69859..795012e6d9a8 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20240311.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20240311.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1:="
 RDEPEND="${DEPEND}"
diff --git a/app-text/psutils/psutils-1.17-r5.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild
index 80bc74ccf27c..7f957a8f7aaf 100644
--- a/app-text/psutils/psutils-1.17-r5.ebuild
+++ b/app-text/psutils/psutils-1.17-r5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}.orig"
 
 LICENSE="psutils"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/app-text/psutils/psutils-2.09.ebuild b/app-text/psutils/psutils-2.09.ebuild
index cc4927a1c236..10f2f0a32262 100644
--- a/app-text/psutils/psutils-2.09.ebuild
+++ b/app-text/psutils/psutils-2.09.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rrthomas/psutils/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Newer libpaper needed for fork which provides 'paper'
 RDEPEND="
diff --git a/app-text/qpdf/qpdf-12.0.0.ebuild b/app-text/qpdf/qpdf-12.0.0.ebuild
index 83465ec89635..88ddcf283587 100644
--- a/app-text/qpdf/qpdf-12.0.0.ebuild
+++ b/app-text/qpdf/qpdf-12.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # Subslot for libqpdf soname version (just represent via major version)
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc examples gnutls test zopfli"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-12.1.0.ebuild b/app-text/qpdf/qpdf-12.1.0.ebuild
index 93f32faceb83..b2e0c046cc23 100644
--- a/app-text/qpdf/qpdf-12.1.0.ebuild
+++ b/app-text/qpdf/qpdf-12.1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # Subslot for libqpdf soname version (just represent via major version)
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc examples gnutls test zopfli"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-12.2.0.ebuild b/app-text/qpdf/qpdf-12.2.0.ebuild
index 83465ec89635..88ddcf283587 100644
--- a/app-text/qpdf/qpdf-12.2.0.ebuild
+++ b/app-text/qpdf/qpdf-12.2.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # Subslot for libqpdf soname version (just represent via major version)
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc examples gnutls test zopfli"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdfview/qpdfview-0.5_p20240423.ebuild b/app-text/qpdfview/qpdfview-0.5_p20240423.ebuild
index b4fa653e04b8..6e61c69aedac 100644
--- a/app-text/qpdfview/qpdfview-0.5_p20240423.ebuild
+++ b/app-text/qpdfview/qpdfview-0.5_p20240423.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bazaar.launchpad.net/~adamreichold/${PN}/trunk/tarball/${REVISI
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 
 REQUIRED_USE="?? ( fitz pdf )"
diff --git a/app-text/rarian/rarian-0.8.4.ebuild b/app-text/rarian/rarian-0.8.4.ebuild
index 0129c16d4418..5e669fc7b2b8 100644
--- a/app-text/rarian/rarian-0.8.4.ebuild
+++ b/app-text/rarian/rarian-0.8.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitlab.freedesktop.org/rarian/rarian/-/releases/${PV}/downloads
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/rarian/rarian-0.8.6-r1.ebuild b/app-text/rarian/rarian-0.8.6-r1.ebuild
index 2cc76f9ff625..31260380cab8 100644
--- a/app-text/rarian/rarian-0.8.6-r1.ebuild
+++ b/app-text/rarian/rarian-0.8.6-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitlab.freedesktop.org/rarian/rarian/-/releases/${PV}/downloads
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/recode/recode-3.7.14.ebuild b/app-text/recode/recode-3.7.14.ebuild
index 780cba1a9a55..033c0325af59 100644
--- a/app-text/recode/recode-3.7.14.ebuild
+++ b/app-text/recode/recode-3.7.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-3+"
 # librecode soname version
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/rman/rman-3.2-r2.ebuild b/app-text/rman/rman-3.2-r2.ebuild
index f22b2fc42425..6e782c3248ef 100644
--- a/app-text/rman/rman-3.2-r2.ebuild
+++ b/app-text/rman/rman-3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RESTRICT="test"
 
diff --git a/app-text/sablotron/sablotron-1.0.3-r3.ebuild b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
index 57627823b6c0..7c6ba52873bd 100644
--- a/app-text/sablotron/sablotron-1.0.3-r3.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="perl"
 
 DEPEND=">=dev-libs/expat-1.95.6-r1"
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild
index ef667477128b..19387064d3dc 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
 DEPEND="${RDEPEND}"
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index 1ee22c8a054c..54717a46c96d 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 
 LICENSE="FDL-1.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sgrep/sgrep-1.94a-r2.ebuild b/app-text/sgrep/sgrep-1.94a-r2.ebuild
index d5e7f5cd3ace..e2c06c9773d3 100644
--- a/app-text/sgrep/sgrep-1.94a-r2.ebuild
+++ b/app-text/sgrep/sgrep-1.94a-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-clang16.patch
diff --git a/app-text/sloccount/sloccount-2.26-r3.ebuild b/app-text/sloccount/sloccount-2.26-r3.ebuild
index fc162bba93c6..2a576c296451 100644
--- a/app-text/sloccount/sloccount-2.26-r3.ebuild
+++ b/app-text/sloccount/sloccount-2.26-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.dwheeler.com/sloccount/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/app-text/t1utils/t1utils-1.42-r1.ebuild b/app-text/t1utils/t1utils-1.42-r1.ebuild
index 0b461757ebbb..8f8663f8270b 100644
--- a/app-text/t1utils/t1utils-1.42-r1.ebuild
+++ b/app-text/t1utils/t1utils-1.42-r1.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://www.lcdf.org/type/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DOCS=( NEWS.md README.md )
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r2.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r2.ebuild
index 79f4a32fd8b1..85c3f0f87338 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r2.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.hyperrealm.com/talkfilters/packages/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
diff --git a/app-text/teckit/teckit-2.5.12.ebuild b/app-text/teckit/teckit-2.5.12.ebuild
index d7b96e385b3e..373aa1ca4649 100644
--- a/app-text/teckit/teckit-2.5.12.ebuild
+++ b/app-text/teckit/teckit-2.5.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index 05f637d721bf..52b4004a5942 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="unicode"
 RESTRICT="test" #411523
 
diff --git a/app-text/tree/tree-2.1.1-r1.ebuild b/app-text/tree/tree-2.1.1-r1.ebuild
index cfd1f5c46b9e..aba7e35ec4d9 100644
--- a/app-text/tree/tree-2.1.1-r1.ebuild
+++ b/app-text/tree/tree-2.1.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/unix-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 src_compile() {
 	append-lfs-flags
diff --git a/app-text/tree/tree-2.2.1.ebuild b/app-text/tree/tree-2.2.1.ebuild
index 4025124f9c86..f7d4f60aef6b 100644
--- a/app-text/tree/tree-2.2.1.ebuild
+++ b/app-text/tree/tree-2.2.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/unix-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 src_configure() {
 	tc-export CC
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild
index 1c882307b3a8..fd16896ba84e 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
 # ttf2tfm from freetype1, so block freetype1.
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20240311.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20240311.ebuild
index 1c882307b3a8..fd16896ba84e 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20240311.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20240311.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
 # ttf2tfm from freetype1, so block freetype1.
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
index 814c0bb09f15..7657f2b638ad 100644
--- a/app-text/txt2man/txt2man-1.7.1.ebuild
+++ b/app-text/txt2man/txt2man-1.7.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="app-shells/bash
diff --git a/app-text/txt2tags/txt2tags-3.9-r1.ebuild b/app-text/txt2tags/txt2tags-3.9-r1.ebuild
index bda9130e51a1..081ffc76f519 100644
--- a/app-text/txt2tags/txt2tags-3.9-r1.ebuild
+++ b/app-text/txt2tags/txt2tags-3.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~x64-macos"
 
 python_test() {
 	cd test || die
diff --git a/app-text/unrtf/unrtf-0.21.10-r1.ebuild b/app-text/unrtf/unrtf-0.21.10-r1.ebuild
index 4462ba39470a..52feeae6f6ea 100644
--- a/app-text/unrtf/unrtf-0.21.10-r1.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.21.10-use-_GNU_SOURCE.patch
diff --git a/app-text/uudeview/uudeview-0.5.20-r4.ebuild b/app-text/uudeview/uudeview-0.5.20-r4.ebuild
index f64137841163..7a0718814e5c 100644
--- a/app-text/uudeview/uudeview-0.5.20-r4.ebuild
+++ b/app-text/uudeview/uudeview-0.5.20-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-bugfixes.patch
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
index 959919d11185..c2eb37cdf0d4 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITID}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ppc ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="unicode"
 
 # Known test failures nobody cares about
diff --git a/app-text/wdiff/wdiff-1.2.2-r2.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
index 0ec42cc1e951..ccc535e5153f 100644
--- a/app-text/wdiff/wdiff-1.2.2-r2.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild
index 967ea74f9fb7..6e9bc8ef35ee 100644
--- a/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+ssl"
 
 PROPERTIES="test_network"
diff --git a/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild
index 74dbc80c2d07..cced264015c0 100644
--- a/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+ssl"
 
 PROPERTIES="test_network"
diff --git a/app-text/wgetpaste/wgetpaste-2.34.ebuild b/app-text/wgetpaste/wgetpaste-2.34.ebuild
index c1e88cb6c2f1..892adbfcc7bf 100644
--- a/app-text/wgetpaste/wgetpaste-2.34.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+ssl"
 
 PROPERTIES="test_network"
diff --git a/app-text/writerperfect/writerperfect-0.9.6.ebuild b/app-text/writerperfect/writerperfect-0.9.6.ebuild
index befcd33cd6e5..6892e757a8a7 100644
--- a/app-text/writerperfect/writerperfect-0.9.6.ebuild
+++ b/app-text/writerperfect/writerperfect-0.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/libwpd/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~x86-linux"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="abiword +cdr debug ebook epub freehand gsf keynote +mspub +mwaw pagemaker qxp +visio +wpd +wpg +wps zmf"
 
 # configure fails if no import library is selected...
diff --git a/app-text/wv/wv-1.2.9-r5.ebuild b/app-text/wv/wv-1.2.9-r5.ebuild
index 553a5e0151d4..4cae2aca8b6a 100644
--- a/app-text/wv/wv-1.2.9-r5.ebuild
+++ b/app-text/wv/wv-1.2.9-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="tools wmf"
 
 RDEPEND="
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index e65ca86b9b9f..23693917eae6 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}/texk/xdvik
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="motif neXt Xaw3d emacs"
 
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index ca2251914164..35d170a75b48 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/fe/${P}.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND="app-text/sgml-common
diff --git a/app-text/xhtml11/xhtml11-20101123.ebuild b/app-text/xhtml11/xhtml11-20101123.ebuild
index cfe66bb108b3..0f4327930fb7 100644
--- a/app-text/xhtml11/xhtml11-20101123.ebuild
+++ b/app-text/xhtml11/xhtml11-20101123.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.w3.org/TR/xhtml11/xhtml11.tgz -> ${P}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="app-text/sgml-common
diff --git a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
index 46da4e52b54a..a9eab33ef10d 100644
--- a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
+++ b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 PATCHES=(
 	"${WORKDIR}"/${PN}_${MY_PV}-${DEB_PR}.diff
diff --git a/app-text/xml2/xml2-0.5-r1.ebuild b/app-text/xml2/xml2-0.5-r1.ebuild
index e39514c60ab9..75eb621bbdd1 100644
--- a/app-text/xml2/xml2-0.5-r1.ebuild
+++ b/app-text/xml2/xml2-0.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.ofb.net/gale/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-libs/libxml2:="
 DEPEND="${RDEPEND}"
diff --git a/app-text/xmldiff/xmldiff-2.6.3-r1.ebuild b/app-text/xmldiff/xmldiff-2.6.3-r1.ebuild
index 8184b7bc7715..8950feb234db 100644
--- a/app-text/xmldiff/xmldiff-2.6.3-r1.ebuild
+++ b/app-text/xmldiff/xmldiff-2.6.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 RDEPEND="
 	>=dev-python/lxml-3.1.0[${PYTHON_USEDEP}]
diff --git a/app-text/xmlformat/xmlformat-1.04.ebuild b/app-text/xmlformat/xmlformat-1.04.ebuild
index ef0ecf914d9f..60ee9c3d9d87 100644
--- a/app-text/xmlformat/xmlformat-1.04.ebuild
+++ b/app-text/xmlformat/xmlformat-1.04.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kitebird.com/software/xmlformat/"
 
 LICENSE="xmlformat"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc ruby"
 
 DEPEND="
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r3.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r3.ebuild
index aeec950ab7e9..deeba329e979 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1-r3.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-libs/libxml2:=
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r4.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r4.ebuild
index cbe9b8a52320..709260111451 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1-r4.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-libs/libxml2:=
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r5.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r5.ebuild
index 7e0057023760..5b1c1567ceb2 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1-r5.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/libxml2:=
diff --git a/app-text/xmlto/xmlto-0.0.28-r11.ebuild b/app-text/xmlto/xmlto-0.0.28-r11.ebuild
index 35eaa4d5b09b..b880bdd30441 100644
--- a/app-text/xmlto/xmlto-0.0.28-r11.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="latex text"
 
 RDEPEND="
diff --git a/app-text/yelp-tools/yelp-tools-42.1-r1.ebuild b/app-text/yelp-tools/yelp-tools-42.1-r1.ebuild
index 06e80b8d6a4a..8ed57d023c68 100644
--- a/app-text/yelp-tools/yelp-tools-42.1-r1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-42.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
index 8ccbde58f647..fbbd51c12024 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~riscv x86"
 	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-ps/zathura-ps-0.2.8.ebuild b/app-text/zathura-ps/zathura-ps-0.2.8.ebuild
index c1ae56e65d36..ac1f3cdb8808 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.8.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~riscv x86"
 	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 9d5281752c26..444eeb133dd2 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/pwmt/zathura-ps.git"
 else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura/zathura-0.5.13.ebuild b/app-text/zathura/zathura-0.5.13.ebuild
index 9508572450f2..d64dd45de338 100644
--- a/app-text/zathura/zathura-0.5.13.ebuild
+++ b/app-text/zathura/zathura-0.5.13.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pwmt/zathura.git"
 else
 	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/app-text/zathura/zathura-0.5.14.ebuild b/app-text/zathura/zathura-0.5.14.ebuild
index 9508572450f2..d64dd45de338 100644
--- a/app-text/zathura/zathura-0.5.14.ebuild
+++ b/app-text/zathura/zathura-0.5.14.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pwmt/zathura.git"
 else
 	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/app-text/zathura/zathura-0.5.8.ebuild b/app-text/zathura/zathura-0.5.8.ebuild
index 323a84e4ba7b..912f87785ab3 100644
--- a/app-text/zathura/zathura-0.5.8.ebuild
+++ b/app-text/zathura/zathura-0.5.8.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="
 		https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
 	"
-	KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 9508572450f2..d64dd45de338 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pwmt/zathura.git"
 else
 	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/app-vim/alternate/alternate-2.18-r3.ebuild b/app-vim/alternate/alternate-2.18-r3.ebuild
index a127247fca5c..30714deff911 100644
--- a/app-vim/alternate/alternate-2.18-r3.ebuild
+++ b/app-vim/alternate/alternate-2.18-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 S="${WORKDIR}/a.vim-${PV}"
 
 LICENSE="alternate"
-KEYWORDS="~alpha amd64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~mips ppc ~sparc x86 ~x64-macos"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a new :A command which will switch between a .c
diff --git a/app-vim/ant_menu/ant_menu-0.5.7.1-r2.ebuild b/app-vim/ant_menu/ant_menu-0.5.7.1-r2.ebuild
index 23a6b4f4f785..5971e6179389 100644
--- a/app-vim/ant_menu/ant_menu-0.5.7.1-r2.ebuild
+++ b/app-vim/ant_menu/ant_menu-0.5.7.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Java ant build system integration"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=155"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64"
 
 RDEPEND="dev-java/ant"
 
diff --git a/app-vim/colorschemes/colorschemes-20140623-r2.ebuild b/app-vim/colorschemes/colorschemes-20140623-r2.ebuild
index d236a85d2851..ad3eeb877cc5 100644
--- a/app-vim/colorschemes/colorschemes-20140623-r2.ebuild
+++ b/app-vim/colorschemes/colorschemes-20140623-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
 HOMEPAGE="https://www.vim.org/"
 
 LICENSE="vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-macos"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a collection of color schemes for vim. To switch
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild
index 4a32f719e7df..86c5daa17683 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: eselect syntax highlighting, filetype and indent settin
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 VIM_PLUGIN_HELPFILES="${PN}"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild
index 94837d0bdb22..b4dfc9c53ecb 100644
--- a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: fluxbox files syntax and indent"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=679"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="app-vim/genindent"
 
diff --git a/app-vim/genindent/genindent-1.1-r2.ebuild b/app-vim/genindent/genindent-1.1-r2.ebuild
index b48ee6d41742..ba2adc484776 100644
--- a/app-vim/genindent/genindent-1.1-r2.ebuild
+++ b/app-vim/genindent/genindent-1.1-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: library for simplifying indent files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=678"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides library functions and is not intended to be used
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-16.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-16.ebuild
index be9064426a8d..a1fa63811605 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-16.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index f4efb5f32488..9a90c908deb4 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
diff --git a/app-vim/nerdcommenter/nerdcommenter-2.5.2.ebuild b/app-vim/nerdcommenter/nerdcommenter-2.5.2.ebuild
index 963dda736b5e..70e14d7e8881 100644
--- a/app-vim/nerdcommenter/nerdcommenter-2.5.2.ebuild
+++ b/app-vim/nerdcommenter/nerdcommenter-2.5.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/preservim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
diff --git a/app-vim/nerdcommenter/nerdcommenter-9999.ebuild b/app-vim/nerdcommenter/nerdcommenter-9999.ebuild
index c0deec4a9101..66336deab704 100644
--- a/app-vim/nerdcommenter/nerdcommenter-9999.ebuild
+++ b/app-vim/nerdcommenter/nerdcommenter-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/preservim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
diff --git a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
index 5408f35a6804..507c6f0b5f61 100644
--- a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
+++ b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Nginx configuration files syntax"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1886"
 LICENSE="vim"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
diff --git a/app-vim/perl-support/perl-support-5.4.ebuild b/app-vim/perl-support/perl-support-5.4.ebuild
index 4edb0944042f..a50441da1d7e 100644
--- a/app-vim/perl-support/perl-support-5.4.ebuild
+++ b/app-vim/perl-support/perl-support-5.4.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and h
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=556"
 SRC_URI="https://github.com/WolfgangMehner/perl-support/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 GPL-2+"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 VIM_PLUGIN_HELPFILES="perlsupport.txt"
 
diff --git a/app-vim/phpdocs/phpdocs-0.26-r2.ebuild b/app-vim/phpdocs/phpdocs-0.26-r2.ebuild
index e9407f6873b9..d67fa021c6ac 100644
--- a/app-vim/phpdocs/phpdocs-0.26-r2.ebuild
+++ b/app-vim/phpdocs/phpdocs-0.26-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: PHPDoc Support in VIM"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=520"
 
 LICENSE="vim"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=520"
 
diff --git a/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild b/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
index df161b445f56..a664c92f5e84 100644
--- a/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
+++ b/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: Puppet configuration files syntax"
 HOMEPAGE="http://puppetlabs.com/"
 SRC_URI="https://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for Puppet configuration
diff --git a/app-vim/taglist/taglist-4.6.ebuild b/app-vim/taglist/taglist-4.6.ebuild
index e459bde45aad..0955f53e8752 100644
--- a/app-vim/taglist/taglist-4.6.ebuild
+++ b/app-vim/taglist/taglist-4.6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: ctags-based source code browser"
 HOMEPAGE="https://vim-taglist.sourceforge.net/"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 
 RDEPEND="dev-util/ctags"
 
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild
index 9f3b271591e6..1bf80aa044e7 100644
--- a/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=830"
 
 LICENSE="vim"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for perl module Template-Toolkit"
diff --git a/app-vim/vcscommand/vcscommand-1.99.47.ebuild b/app-vim/vcscommand/vcscommand-1.99.47.ebuild
index 0d6d27171882..9e9da746fe04 100644
--- a/app-vim/vcscommand/vcscommand-1.99.47.ebuild
+++ b/app-vim/vcscommand/vcscommand-1.99.47.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=90"
 LICENSE="MIT"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86"
 
 RDEPEND="!app-vim/cvscommand"
 
diff --git a/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild b/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
index f0003f6aa906..7eafdf5504b2 100644
--- a/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://vim-latex.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv ~sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-vim/vim-spell-de/vim-spell-de-20080213-r2.ebuild b/app-vim/vim-spell-de/vim-spell-de-20080213-r2.ebuild
index bf59a2d23a40..f23a5d80779c 100644
--- a/app-vim/vim-spell-de/vim-spell-de-20080213-r2.ebuild
+++ b/app-vim/vim-spell-de/vim-spell-de-20080213-r2.ebuild
@@ -9,4 +9,4 @@ inherit vim-spell
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ppc ~sparc x86 ~x64-macos"
diff --git a/app-vim/vim-spell-en/vim-spell-en-20060123-r2.ebuild b/app-vim/vim-spell-en/vim-spell-en-20060123-r2.ebuild
index d78350d4ec7e..1082d20ac418 100644
--- a/app-vim/vim-spell-en/vim-spell-en-20060123-r2.ebuild
+++ b/app-vim/vim-spell-en/vim-spell-en-20060123-r2.ebuild
@@ -9,4 +9,4 @@ inherit vim-spell
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="BSD LGPL-2.1 public-domain"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~sparc x86"
diff --git a/app-vim/vim-spell-nl/vim-spell-nl-20051007-r2.ebuild b/app-vim/vim-spell-nl/vim-spell-nl-20051007-r2.ebuild
index ae634abf8501..0cda229884d9 100644
--- a/app-vim/vim-spell-nl/vim-spell-nl-20051007-r2.ebuild
+++ b/app-vim/vim-spell-nl/vim-spell-nl-20051007-r2.ebuild
@@ -9,4 +9,4 @@ inherit vim-spell
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
diff --git a/app-vim/vimcommander/vimcommander-0.81.ebuild b/app-vim/vimcommander/vimcommander-0.81.ebuild
index d9b990502d1c..8fc39e5912c8 100644
--- a/app-vim/vimcommander/vimcommander-0.81.ebuild
+++ b/app-vim/vimcommander/vimcommander-0.81.ebuild
@@ -7,6 +7,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Total Commander style file explorer"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=808"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild b/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild
index 8aeef3f4da47..a42e0793e7c6 100644
--- a/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild
+++ b/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # File collisions, bug #540246
 RDEPEND="
diff --git a/dev-build/autoconf-archive/autoconf-archive-2024.10.16-r1.ebuild b/dev-build/autoconf-archive/autoconf-archive-2024.10.16-r1.ebuild
index 7c12e6a32657..8111545027f2 100644
--- a/dev-build/autoconf-archive/autoconf-archive-2024.10.16-r1.ebuild
+++ b/dev-build/autoconf-archive/autoconf-archive-2024.10.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # File collisions, bug #540246
 RDEPEND="
diff --git a/dev-build/autoconf-archive/autoconf-archive-2024.10.16-r2.ebuild b/dev-build/autoconf-archive/autoconf-archive-2024.10.16-r2.ebuild
index ff56cad0d83d..14e86289e654 100644
--- a/dev-build/autoconf-archive/autoconf-archive-2024.10.16-r2.ebuild
+++ b/dev-build/autoconf-archive/autoconf-archive-2024.10.16-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # File collisions, bug #540246
 RDEPEND="
diff --git a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20230114.ebuild b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20230114.ebuild
index 00df33e7506e..eebee957bb2c 100644
--- a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20230114.ebuild
+++ b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20230114.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=sys-devel/m4-1.4.16
diff --git a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20231210.ebuild b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20231210.ebuild
index 00df33e7506e..eebee957bb2c 100644
--- a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20231210.ebuild
+++ b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20231210.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=sys-devel/m4-1.4.16
diff --git a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20240618.ebuild b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20240618.ebuild
index 00df33e7506e..eebee957bb2c 100644
--- a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20240618.ebuild
+++ b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20240618.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=sys-devel/m4-1.4.16
diff --git a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20250126.ebuild b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20250126.ebuild
index 02eb1acb6121..41020e9d5bc6 100644
--- a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20250126.ebuild
+++ b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20250126.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=sys-devel/m4-1.4.16
diff --git a/dev-build/autoconf-vanilla/autoconf-vanilla-2.13.ebuild b/dev-build/autoconf-vanilla/autoconf-vanilla-2.13.ebuild
index a93d3263e07c..aa2934b9dcff 100644
--- a/dev-build/autoconf-vanilla/autoconf-vanilla-2.13.ebuild
+++ b/dev-build/autoconf-vanilla/autoconf-vanilla-2.13.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-build/autoconf-vanilla/autoconf-vanilla-2.69-r1.ebuild b/dev-build/autoconf-vanilla/autoconf-vanilla-2.69-r1.ebuild
index 07c6698ca323..8228a5a23e07 100644
--- a/dev-build/autoconf-vanilla/autoconf-vanilla-2.69-r1.ebuild
+++ b/dev-build/autoconf-vanilla/autoconf-vanilla-2.69-r1.ebuild
@@ -22,7 +22,7 @@ else
 		https://dev.gentoo.org/~polynomial-c/dist/${MY_P}-runstatedir_patches.tar.xz
 		verify-sig? ( mirror://gnu/${MY_PN}/${MY_P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-m4 )"
 fi
diff --git a/dev-build/autoconf-vanilla/autoconf-vanilla-2.71-r1.ebuild b/dev-build/autoconf-vanilla/autoconf-vanilla-2.71-r1.ebuild
index b67c1a7ef2fa..2f22834880e8 100644
--- a/dev-build/autoconf-vanilla/autoconf-vanilla-2.71-r1.ebuild
+++ b/dev-build/autoconf-vanilla/autoconf-vanilla-2.71-r1.ebuild
@@ -19,7 +19,7 @@ else
 	"
 
 	if ! [[ ${PV} == *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 	S="${WORKDIR}"/${MY_P}
 fi
diff --git a/dev-build/autoconf-vanilla/autoconf-vanilla-2.72-r1.ebuild b/dev-build/autoconf-vanilla/autoconf-vanilla-2.72-r1.ebuild
index d85309f4d620..29e6d58190b7 100644
--- a/dev-build/autoconf-vanilla/autoconf-vanilla-2.72-r1.ebuild
+++ b/dev-build/autoconf-vanilla/autoconf-vanilla-2.72-r1.ebuild
@@ -28,7 +28,7 @@ else
 	 S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
diff --git a/dev-build/autoconf-vanilla/autoconf-vanilla-9999.ebuild b/dev-build/autoconf-vanilla/autoconf-vanilla-9999.ebuild
index 26cf74406094..84b20d7e7418 100644
--- a/dev-build/autoconf-vanilla/autoconf-vanilla-9999.ebuild
+++ b/dev-build/autoconf-vanilla/autoconf-vanilla-9999.ebuild
@@ -28,7 +28,7 @@ else
 	 S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
diff --git a/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild b/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild
index 0cb9c1a6f484..3acaa4308269 100644
--- a/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild
+++ b/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
index 8f8026e9b817..c9a396206d4f 100644
--- a/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
+++ b/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-build/autoconf/autoconf-2.13-r8.ebuild b/dev-build/autoconf/autoconf-2.13-r8.ebuild
index c6dd7cec8417..f18291336063 100644
--- a/dev-build/autoconf/autoconf-2.13-r8.ebuild
+++ b/dev-build/autoconf/autoconf-2.13-r8.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-build/autoconf/autoconf-2.69-r10.ebuild b/dev-build/autoconf/autoconf-2.69-r10.ebuild
index 5e2ea266f3f6..fbcb629182ab 100644
--- a/dev-build/autoconf/autoconf-2.69-r10.ebuild
+++ b/dev-build/autoconf/autoconf-2.69-r10.ebuild
@@ -17,7 +17,7 @@ else
 		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-m4 )"
 fi
diff --git a/dev-build/autoconf/autoconf-2.71-r6.ebuild b/dev-build/autoconf/autoconf-2.71-r6.ebuild
index feaffebcaadd..9d2597c5574c 100644
--- a/dev-build/autoconf/autoconf-2.71-r6.ebuild
+++ b/dev-build/autoconf/autoconf-2.71-r6.ebuild
@@ -16,7 +16,7 @@ else
 	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
 
 	if ! [[ ${PV} == *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 	S="${WORKDIR}"/${MY_P}
 fi
diff --git a/dev-build/autoconf/autoconf-2.71-r8.ebuild b/dev-build/autoconf/autoconf-2.71-r8.ebuild
index cb025ebb142e..c55177336a62 100644
--- a/dev-build/autoconf/autoconf-2.71-r8.ebuild
+++ b/dev-build/autoconf/autoconf-2.71-r8.ebuild
@@ -24,7 +24,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if ! [[ ${PV} == *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
diff --git a/dev-build/autoconf/autoconf-2.72-r1.ebuild b/dev-build/autoconf/autoconf-2.72-r1.ebuild
index b80c46d9b622..d9838276756e 100644
--- a/dev-build/autoconf/autoconf-2.72-r1.ebuild
+++ b/dev-build/autoconf/autoconf-2.72-r1.ebuild
@@ -29,7 +29,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
diff --git a/dev-build/autoconf/autoconf-2.72-r4.ebuild b/dev-build/autoconf/autoconf-2.72-r4.ebuild
index dc6febd6a237..5e5ee6c5ea98 100644
--- a/dev-build/autoconf/autoconf-2.72-r4.ebuild
+++ b/dev-build/autoconf/autoconf-2.72-r4.ebuild
@@ -29,7 +29,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
diff --git a/dev-build/autoconf/autoconf-2.72-r5.ebuild b/dev-build/autoconf/autoconf-2.72-r5.ebuild
index cb36ed8eefa5..700e34aa7eff 100644
--- a/dev-build/autoconf/autoconf-2.72-r5.ebuild
+++ b/dev-build/autoconf/autoconf-2.72-r5.ebuild
@@ -29,7 +29,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
diff --git a/dev-build/autoconf/autoconf-9999.ebuild b/dev-build/autoconf/autoconf-9999.ebuild
index 67bb4d29ae06..f4d209e67603 100644
--- a/dev-build/autoconf/autoconf-9999.ebuild
+++ b/dev-build/autoconf/autoconf-9999.ebuild
@@ -29,7 +29,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
diff --git a/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild b/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild
index 9977ba8cfc4f..808a95e7c34e 100644
--- a/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild
+++ b/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-build/automake-wrapper/automake-wrapper-20250528.ebuild b/dev-build/automake-wrapper/automake-wrapper-20250528.ebuild
index 9977ba8cfc4f..808a95e7c34e 100644
--- a/dev-build/automake-wrapper/automake-wrapper-20250528.ebuild
+++ b/dev-build/automake-wrapper/automake-wrapper-20250528.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild b/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild
index a08c3698337c..c965d04d8ff0 100644
--- a/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild
+++ b/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-build/automake/automake-1.17-r2.ebuild b/dev-build/automake/automake-1.17-r2.ebuild
index 1640703ae6e8..ad8bc5642327 100644
--- a/dev-build/automake/automake-1.17-r2.ebuild
+++ b/dev-build/automake/automake-1.17-r2.ebuild
@@ -35,7 +35,7 @@ else
 				mirror://gnu/${PN}/${P}.tar.xz.sig
 			)
 		"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/automake/automake-1.18.1.ebuild b/dev-build/automake/automake-1.18.1.ebuild
index 6fcb9149c31b..c8668492bc51 100644
--- a/dev-build/automake/automake-1.18.1.ebuild
+++ b/dev-build/automake/automake-1.18.1.ebuild
@@ -35,7 +35,7 @@ else
 				mirror://gnu/${PN}/${P}.tar.xz.sig
 			)
 		"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index f96e3db9fa52..c43cf2af5554 100644
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
@@ -35,7 +35,7 @@ else
 				mirror://gnu/${PN}/${P}.tar.xz.sig
 			)
 		"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/b2/b2-5.3.2.ebuild b/dev-build/b2/b2-5.3.2.ebuild
index 53687b9b5863..fa24205f7681 100644
--- a/dev-build/b2/b2-5.3.2.ebuild
+++ b/dev-build/b2/b2-5.3.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-build/b2/b2-5.3.3.ebuild b/dev-build/b2/b2-5.3.3.ebuild
index 46b7ac7d95ed..610e8ab5cbf0 100644
--- a/dev-build/b2/b2-5.3.3.ebuild
+++ b/dev-build/b2/b2-5.3.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild b/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild
index c3dfdcfe86f8..da81e72f6269 100644
--- a/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild
+++ b/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN/-/.}-${BOOST_COMMIT}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 # boost.m4 has a buildsystem, but the distributer didn't use make dist
 # so we'd have to eautoreconf to use it. Also, its ./configure script
diff --git a/dev-build/cmake/cmake-3.31.10.ebuild b/dev-build/cmake/cmake-3.31.10.ebuild
index b0ab190af494..7ad596d0cf37 100644
--- a/dev-build/cmake/cmake-3.31.10.ebuild
+++ b/dev-build/cmake/cmake-3.31.10.ebuild
@@ -49,7 +49,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
 	fi
diff --git a/dev-build/cmake/cmake-3.31.9-r1.ebuild b/dev-build/cmake/cmake-3.31.9-r1.ebuild
index 0e854addd220..c3b31535ab74 100644
--- a/dev-build/cmake/cmake-3.31.9-r1.ebuild
+++ b/dev-build/cmake/cmake-3.31.9-r1.ebuild
@@ -49,7 +49,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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
 	fi
diff --git a/dev-build/cmake/cmake-4.1.2-r1.ebuild b/dev-build/cmake/cmake-4.1.2-r1.ebuild
index 160e92b78bfc..5ecd2a49b833 100644
--- a/dev-build/cmake/cmake-4.1.2-r1.ebuild
+++ b/dev-build/cmake/cmake-4.1.2-r1.ebuild
@@ -53,7 +53,7 @@ else
 	)"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20250904 )"
diff --git a/dev-build/cmake/cmake-4.1.3.ebuild b/dev-build/cmake/cmake-4.1.3.ebuild
index 110350fd675a..0467e0f8e2a6 100644
--- a/dev-build/cmake/cmake-4.1.3.ebuild
+++ b/dev-build/cmake/cmake-4.1.3.ebuild
@@ -53,7 +53,7 @@ else
 	)"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20250904 )"
diff --git a/dev-build/cmake/cmake-4.1.4.ebuild b/dev-build/cmake/cmake-4.1.4.ebuild
index 110350fd675a..0467e0f8e2a6 100644
--- a/dev-build/cmake/cmake-4.1.4.ebuild
+++ b/dev-build/cmake/cmake-4.1.4.ebuild
@@ -53,7 +53,7 @@ else
 	)"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20250904 )"
diff --git a/dev-build/cmake/cmake-4.2.1.ebuild b/dev-build/cmake/cmake-4.2.1.ebuild
index b81fe573d86d..663ef0d644dc 100644
--- a/dev-build/cmake/cmake-4.2.1.ebuild
+++ b/dev-build/cmake/cmake-4.2.1.ebuild
@@ -53,7 +53,7 @@ else
 	)"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20250904 )"
diff --git a/dev-build/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild
index 110350fd675a..0467e0f8e2a6 100644
--- a/dev-build/cmake/cmake-9999.ebuild
+++ b/dev-build/cmake/cmake-9999.ebuild
@@ -53,7 +53,7 @@ else
 	)"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20250904 )"
diff --git a/dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild b/dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
index 5d85c69a4db6..11decceabc84 100644
--- a/dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
+++ b/dev-build/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<dev-util/gtk-doc-${PV}"
 PDEPEND="virtual/pkgconfig"
diff --git a/dev-build/gtk-doc-am/gtk-doc-am-1.34.0.ebuild b/dev-build/gtk-doc-am/gtk-doc-am-1.34.0.ebuild
index 2b3b11d2eb48..bab7d9e36e5c 100644
--- a/dev-build/gtk-doc-am/gtk-doc-am-1.34.0.ebuild
+++ b/dev-build/gtk-doc-am/gtk-doc-am-1.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gtk-doc"
 
 LICENSE="GPL-2+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<dev-util/gtk-doc-${PV}"
 PDEPEND="virtual/pkgconfig"
diff --git a/dev-build/libtool/libtool-2.5.4.ebuild b/dev-build/libtool/libtool-2.5.4.ebuild
index 0e1cb7f77f89..01567ffc793d 100644
--- a/dev-build/libtool/libtool-2.5.4.ebuild
+++ b/dev-build/libtool/libtool-2.5.4.ebuild
@@ -17,7 +17,7 @@ elif false && ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/dev-build/libtool/libtool-2.6.0.ebuild b/dev-build/libtool/libtool-2.6.0.ebuild
index a31ce2c36338..f7106f6f6ba8 100644
--- a/dev-build/libtool/libtool-2.6.0.ebuild
+++ b/dev-build/libtool/libtool-2.6.0.ebuild
@@ -18,7 +18,7 @@ elif true || ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/dev-build/libtool/libtool-9999.ebuild b/dev-build/libtool/libtool-9999.ebuild
index 01f91498709f..3fbdd5dd71c2 100644
--- a/dev-build/libtool/libtool-9999.ebuild
+++ b/dev-build/libtool/libtool-9999.ebuild
@@ -17,7 +17,7 @@ elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/dev-build/make/make-4.4.1-r100.ebuild b/dev-build/make/make-4.4.1-r100.ebuild
index 1c2cdb0469dc..7f7c774f6694 100644
--- a/dev-build/make/make-4.4.1-r100.ebuild
+++ b/dev-build/make/make-4.4.1-r100.ebuild
@@ -18,7 +18,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.lz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/dev-build/make/make-4.4.1-r101.ebuild b/dev-build/make/make-4.4.1-r101.ebuild
index cadba2384375..7a48ec68d94e 100644
--- a/dev-build/make/make-4.4.1-r101.ebuild
+++ b/dev-build/make/make-4.4.1-r101.ebuild
@@ -18,7 +18,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.lz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/dev-build/make/make-4.4.1-r102.ebuild b/dev-build/make/make-4.4.1-r102.ebuild
index 420a65c15334..72dd7812016b 100644
--- a/dev-build/make/make-4.4.1-r102.ebuild
+++ b/dev-build/make/make-4.4.1-r102.ebuild
@@ -18,7 +18,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.lz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/dev-build/make/make-9999.ebuild b/dev-build/make/make-9999.ebuild
index de14782112a6..21e2c9546c2f 100644
--- a/dev-build/make/make-9999.ebuild
+++ b/dev-build/make/make-9999.ebuild
@@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.lz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/dev-build/meson-format-array/meson-format-array-0.ebuild b/dev-build/meson-format-array/meson-format-array-0.ebuild
index 6fdd283981c6..6db5a6213f61 100644
--- a/dev-build/meson-format-array/meson-format-array-0.ebuild
+++ b/dev-build/meson-format-array/meson-format-array-0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-build/meson/meson-1.1.1.ebuild b/dev-build/meson/meson-1.1.1.ebuild
index 0f927d0f2aaf..76850ff97526 100644
--- a/dev-build/meson/meson-1.1.1.ebuild
+++ b/dev-build/meson/meson-1.1.1.ebuild
@@ -24,7 +24,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.10.0_rc2.ebuild b/dev-build/meson/meson-1.10.0_rc2.ebuild
index 9bbce0369ed2..d6479e2e5a7c 100644
--- a/dev-build/meson/meson-1.10.0_rc2.ebuild
+++ b/dev-build/meson/meson-1.10.0_rc2.ebuild
@@ -37,7 +37,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.2.3.ebuild b/dev-build/meson/meson-1.2.3.ebuild
index 4c85cc94b3c8..0f224856e43f 100644
--- a/dev-build/meson/meson-1.2.3.ebuild
+++ b/dev-build/meson/meson-1.2.3.ebuild
@@ -24,7 +24,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
index f3856e7fee12..a6f1cf8ebcaa 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -24,7 +24,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index ed3edd1eb65b..3045d66bbb5c 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -33,7 +33,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.5.2.ebuild b/dev-build/meson/meson-1.5.2.ebuild
index 3ea22ded2cbf..b3882be5ccd2 100644
--- a/dev-build/meson/meson-1.5.2.ebuild
+++ b/dev-build/meson/meson-1.5.2.ebuild
@@ -33,7 +33,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.6.1.ebuild b/dev-build/meson/meson-1.6.1.ebuild
index d07877e9338c..f0b7aaf713d0 100644
--- a/dev-build/meson/meson-1.6.1.ebuild
+++ b/dev-build/meson/meson-1.6.1.ebuild
@@ -33,7 +33,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.7.2.ebuild b/dev-build/meson/meson-1.7.2.ebuild
index e7e92222bb7c..b49c4b5b84a6 100644
--- a/dev-build/meson/meson-1.7.2.ebuild
+++ b/dev-build/meson/meson-1.7.2.ebuild
@@ -36,7 +36,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eschwartz.asc
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.8.5.ebuild b/dev-build/meson/meson-1.8.5.ebuild
index 3d726afdf403..20b5cab3933c 100644
--- a/dev-build/meson/meson-1.8.5.ebuild
+++ b/dev-build/meson/meson-1.8.5.ebuild
@@ -37,7 +37,7 @@ else
 	#VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.9.1.ebuild b/dev-build/meson/meson-1.9.1.ebuild
index 8403206d7cad..f3b1db77320f 100644
--- a/dev-build/meson/meson-1.9.1.ebuild
+++ b/dev-build/meson/meson-1.9.1.ebuild
@@ -37,7 +37,7 @@ else
 	#VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-1.9.2.ebuild b/dev-build/meson/meson-1.9.2.ebuild
index 91a613fda2c8..59d302bd8341 100644
--- a/dev-build/meson/meson-1.9.2.ebuild
+++ b/dev-build/meson/meson-1.9.2.ebuild
@@ -37,7 +37,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index 9bbce0369ed2..d6479e2e5a7c 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -37,7 +37,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-build/ninja/ninja-1.13.1.ebuild b/dev-build/ninja/ninja-1.13.1.ebuild
index 1a518d92b503..ff1e6134e3d0 100644
--- a/dev-build/ninja/ninja-1.13.1.ebuild
+++ b/dev-build/ninja/ninja-1.13.1.ebuild
@@ -15,7 +15,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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 GTEST_VER=1.16.0
diff --git a/dev-build/ninja/ninja-1.13.2-r1.ebuild b/dev-build/ninja/ninja-1.13.2-r1.ebuild
index 95b23e968e01..2290412da8db 100644
--- a/dev-build/ninja/ninja-1.13.2-r1.ebuild
+++ b/dev-build/ninja/ninja-1.13.2-r1.ebuild
@@ -15,7 +15,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 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 GTEST_VER=1.16.0
diff --git a/dev-build/ninja/ninja-1.13.2.ebuild b/dev-build/ninja/ninja-1.13.2.ebuild
index d5e02b3a6d2b..2324ea73d5b6 100644
--- a/dev-build/ninja/ninja-1.13.2.ebuild
+++ b/dev-build/ninja/ninja-1.13.2.ebuild
@@ -15,7 +15,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 GTEST_VER=1.16.0
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index d5e02b3a6d2b..2324ea73d5b6 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -15,7 +15,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 GTEST_VER=1.16.0
diff --git a/dev-build/pmake/pmake-1.111.3.3-r1.ebuild b/dev-build/pmake/pmake-1.111.3.3-r1.ebuild
index c4e89161b8b3..ffe5d785b0a0 100644
--- a/dev-build/pmake/pmake-1.111.3.3-r1.ebuild
+++ b/dev-build/pmake/pmake-1.111.3.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/dev-build/scons/scons-4.10.1.ebuild b/dev-build/scons/scons-4.10.1.ebuild
index 8528697359c2..f83ade525ab3 100644
--- a/dev-build/scons/scons-4.10.1.ebuild
+++ b/dev-build/scons/scons-4.10.1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.20.0.ebuild b/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.20.0.ebuild
index 5b64643bb4e1..fea4a05cdcfc 100644
--- a/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.20.0.ebuild
+++ b/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.20.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.72.0
diff --git a/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.21.0.ebuild b/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.21.0.ebuild
index 994bf69f520f..9e47cb07761d 100644
--- a/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.21.0.ebuild
+++ b/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.72.0
diff --git a/dev-cpp/atkmm/atkmm-2.28.4.ebuild b/dev-cpp/atkmm/atkmm-2.28.4.ebuild
index 2868cebc7021..a54b4344c8e9 100644
--- a/dev-cpp/atkmm/atkmm-2.28.4.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc"
 
 DEPEND="
diff --git a/dev-cpp/atkmm/atkmm-2.36.3.ebuild b/dev-cpp/atkmm/atkmm-2.36.3.ebuild
index 13643833916e..a7ae4416dfe1 100644
--- a/dev-cpp/atkmm/atkmm-2.36.3.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org https://gitlab.gnome.org/GNOME/atkmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc"
 
 DEPEND="
diff --git a/dev-cpp/cairomm/cairomm-1.14.4.ebuild b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
index 48ad3937a5ae..d15df823ede4 100644
--- a/dev-cpp/cairomm/cairomm-1.14.4.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/cairomm/cairomm-1.14.5.ebuild b/dev-cpp/cairomm/cairomm-1.14.5.ebuild
index 4fcceb7496cc..5dac5d53f44d 100644
--- a/dev-cpp/cairomm/cairomm-1.14.5.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/cairomm/cairomm-1.18.0.ebuild b/dev-cpp/cairomm/cairomm-1.18.0.ebuild
index 69c53f026d3d..665d85557553 100644
--- a/dev-cpp/cairomm/cairomm-1.18.0.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
index 0918f508d3ef..5066acaafa71 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r10.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug doc static-libs"
 RESTRICT="test"
 
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r11.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r11.ebuild
index e228968dd31a..a8ab0d6b1534 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r11.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug doc static-libs"
 RESTRICT="test"
 
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
index 2414fa893b54..5c9fd42d9b1c 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug doc static-libs"
 RESTRICT="test"
 
diff --git a/dev-cpp/ctemplate/ctemplate-2.4.ebuild b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
index 8224d19db62c..6dcc9f3b5507 100644
--- a/dev-cpp/ctemplate/ctemplate-2.4.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/ctemplate-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="doc emacs vim-syntax static-libs test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
index e2b24e2292dd..a5a1b947ff72 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
@@ -20,7 +20,7 @@ else
 		https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 		test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild
index 2e9953fb7c2f..a1abfd74c566 100644
--- a/dev-cpp/eigen/eigen-9999.ebuild
+++ b/dev-cpp/eigen/eigen-9999.ebuild
@@ -20,7 +20,7 @@ else
 		https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 		test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-cpp/gflags/gflags-2.2.2-r1.ebuild b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
index 828e155ac4e1..6beca478a0f5 100644
--- a/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 2dca97cfe29b..9cfbb3ca8e00 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/glibmm/glibmm-2.66.8.ebuild b/dev-cpp/glibmm/glibmm-2.66.8.ebuild
index 1885132f0402..53396aa2a4ed 100644
--- a/dev-cpp/glibmm/glibmm-2.66.8.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glibmm/glibmm-2.84.0.ebuild b/dev-cpp/glibmm/glibmm-2.84.0.ebuild
index 2aa632148bc3..ecb9e9308f08 100644
--- a/dev-cpp/glibmm/glibmm-2.84.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.84.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.68"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index 4a54a63a949a..a77fce16b22e 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/glog-0.6.0-r1.ebuild b/dev-cpp/glog/glog-0.6.0-r1.ebuild
index 7b3f727eaae1..ee9f161d6d89 100644
--- a/dev-cpp/glog/glog-0.6.0-r1.ebuild
+++ b/dev-cpp/glog/glog-0.6.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-cpp/glog/glog-0.6.0.ebuild b/dev-cpp/glog/glog-0.6.0.ebuild
index 1f7acaf083da..259c361ffcf9 100644
--- a/dev-cpp/glog/glog-0.6.0.ebuild
+++ b/dev-cpp/glog/glog-0.6.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/glog-0.7.1.ebuild b/dev-cpp/glog/glog-0.7.1.ebuild
index 478208ff7077..51cde4ee2d29 100644
--- a/dev-cpp/glog/glog-0.7.1.ebuild
+++ b/dev-cpp/glog/glog-0.7.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-cpp/gpgmepp/gpgmepp-2.0.0-r1.ebuild b/dev-cpp/gpgmepp/gpgmepp-2.0.0-r1.ebuild
index f7d8827bb46d..512e86f96f23 100644
--- a/dev-cpp/gpgmepp/gpgmepp-2.0.0-r1.ebuild
+++ b/dev-cpp/gpgmepp/gpgmepp-2.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="LGPL-2+ test? ( GPL-2 GPL-2+ LGPL-2.1+ )"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtest/gtest-1.14.0-r2.ebuild b/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
index 7f370738b39a..e5e6ff5cb59a 100644
--- a/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
+++ b/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/gtest/gtest-1.17.0.ebuild b/dev-cpp/gtest/gtest-1.17.0.ebuild
index c791efe88bca..e391487ab7d1 100644
--- a/dev-cpp/gtest/gtest-1.17.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.17.0.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index c791efe88bca..e391487ab7d1 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
index c3b92de82f9f..c66676038fe6 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.10.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.10.ebuild
index 3eeb397b5304..8cf60b1573a2 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.10.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua gtk-doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
index 771fe27f5cda..7453dd53493a 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua gtk-doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
index 66ab225ec7e8..e95b8148ebba 100644
--- a/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
index c05ee71c93fa..d7ca3fda51e8 100644
--- a/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.20.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.20.0.ebuild
index e169a2ec775b..5e260f620bed 100644
--- a/dev-cpp/gtkmm/gtkmm-4.20.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.20.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/libcmis/libcmis-0.6.2-r2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2-r2.ebuild
index 69bdcfdaf58e..7b096ee60f1b 100644
--- a/dev-cpp/libcmis/libcmis-0.6.2-r2.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.6.2-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 fi
 inherit autotools flag-o-matic
 
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index ec3f5237a89b..196087c0dff6 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 inherit autotools flag-o-matic
 
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
index 644634db56e4..4ee9b505f993 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~x64-macos"
 
 PATCHES=(
 	# bug #718808
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.42.3.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.42.3.ebuild
index c2a48a8c136e..b15a164bf152 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.42.3.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.42.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/libxmlpp/libxmlpp-5.0.4.ebuild b/dev-cpp/libxmlpp/libxmlpp-5.0.4.ebuild
index e09554845299..1a8baef4fc0d 100644
--- a/dev-cpp/libxmlpp/libxmlpp-5.0.4.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-5.0.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="5.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/libxmlpp/libxmlpp-5.4.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-5.4.0.ebuild
index 55a4b530eede..bca45beea177 100644
--- a/dev-cpp/libxmlpp/libxmlpp-5.4.0.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-5.4.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="5.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
index e5e33b3bb52d..2a9ec41d2ccb 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.t
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 IUSE="+boost doc examples test"
 
 REQUIRED_USE="test? ( boost )"
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
index 41fc11872df3..010a3e7f2563 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.t
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="+boost doc examples test"
 
 REQUIRED_USE="test? ( boost )"
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
index e5e33b3bb52d..2a9ec41d2ccb 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.t
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 IUSE="+boost doc examples test"
 
 REQUIRED_USE="test? ( boost )"
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
index e5e33b3bb52d..2a9ec41d2ccb 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.t
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 IUSE="+boost doc examples test"
 
 REQUIRED_USE="test? ( boost )"
diff --git a/dev-cpp/muParser/muParser-2.3.4-r1.ebuild b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
index fd0c807383f3..4b118c52d79f 100644
--- a/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/muparser-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/muParser/muParser-2.3.5.ebuild b/dev-cpp/muParser/muParser-2.3.5.ebuild
index e931b6d1d585..b232b6f3a524 100644
--- a/dev-cpp/muParser/muParser-2.3.5.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/muparser-${PV}
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/pangomm/pangomm-2.46.4.ebuild b/dev-cpp/pangomm/pangomm-2.46.4.ebuild
index ab3d0061ba4a..0d414fc6deb5 100644
--- a/dev-cpp/pangomm/pangomm-2.46.4.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.46.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/dev-cpp/pangomm/pangomm-2.50.2.ebuild b/dev-cpp/pangomm/pangomm-2.50.2.ebuild
index e560f83045f3..8faae9457e63 100644
--- a/dev-cpp/pangomm/pangomm-2.50.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/dev-cpp/pangomm/pangomm-2.56.1.ebuild b/dev-cpp/pangomm/pangomm-2.56.1.ebuild
index 5a83b35fea8c..95daa2a26409 100644
--- a/dev-cpp/pangomm/pangomm-2.56.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.56.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
index eb0a80c4bc0f..acb2560d7dd1 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-buildsystem.patch )
 
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index a4a8523b1c41..aab01a10281a 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/oneapi-src/oneTBB"
 SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug examples"
 
 S="${WORKDIR}/oneTBB-${MY_PV}"
diff --git a/dev-cpp/tbb/tbb-2021.12.0.ebuild b/dev-cpp/tbb/tbb-2021.12.0.ebuild
index c4ce0e2090fb..578a4c67d5d2 100644
--- a/dev-cpp/tbb/tbb-2021.12.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.12.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.13.0.ebuild b/dev-cpp/tbb/tbb-2021.13.0.ebuild
index c4ce0e2090fb..578a4c67d5d2 100644
--- a/dev-cpp/tbb/tbb-2021.13.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.13.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
index 4ce310a4a962..49a6f1bea630 100644
--- a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 50bdf21a1491..daeaf3583eeb 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild b/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild
index 84afb72b85a1..1cf5886f8a39 100644
--- a/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.14-2.14-3.14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2022.1.0.ebuild b/dev-cpp/tbb/tbb-2022.1.0.ebuild
index 13a1bb769145..cfff646ce21b 100644
--- a/dev-cpp/tbb/tbb-2022.1.0.ebuild
+++ b/dev-cpp/tbb/tbb-2022.1.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.15-2.15-3.15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tbb/tbb-2022.3.0.ebuild b/dev-cpp/tbb/tbb-2022.3.0.ebuild
index e1263b783771..a1e07f99581e 100644
--- a/dev-cpp/tbb/tbb-2022.3.0.ebuild
+++ b/dev-cpp/tbb/tbb-2022.3.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.15-2.15-3.15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/tclap/tclap-1.2.5.ebuild b/dev-cpp/tclap/tclap-1.2.5.ebuild
index 00a83fe2b21e..df9c0be4bc31 100644
--- a/dev-cpp/tclap/tclap-1.2.5.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/dev-cpp/tree/tree-3.18.ebuild b/dev-cpp/tree/tree-3.18.ebuild
index 34179375cedd..4696070fe62e 100644
--- a/dev-cpp/tree/tree-3.18.ebuild
+++ b/dev-cpp/tree/tree-3.18.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.hh-${PV}"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86"
 
 src_configure() {
 	tc-export CXX
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
index 21f8f1065c53..9b71a0395c63 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jbeder/yaml-cpp/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/0.8"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r2.ebuild
index 79b960d262b4..19c0b23865bd 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r2.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jbeder/yaml-cpp/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/0.8"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 26f1efba1908..fa6aa6fc1ea3 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="!dev-db/tinycdb"
diff --git a/dev-db/cdb/cdb-0.75-r5.ebuild b/dev-db/cdb/cdb-0.75-r5.ebuild
index 7833bed7e611..913ccaffb625 100644
--- a/dev-db/cdb/cdb-0.75-r5.ebuild
+++ b/dev-db/cdb/cdb-0.75-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="!dev-db/tinycdb"
diff --git a/dev-db/gqlplus/gqlplus-1.16-r2.ebuild b/dev-db/gqlplus/gqlplus-1.16-r2.ebuild
index ea1d31916619..d80888586ffb 100644
--- a/dev-db/gqlplus/gqlplus-1.16-r2.ebuild
+++ b/dev-db/gqlplus/gqlplus-1.16-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~x64-macos"
 IUSE=""
 
 DEPEND="sys-libs/readline:="
diff --git a/dev-db/hsqldb/hsqldb-2.7.4.ebuild b/dev-db/hsqldb/hsqldb-2.7.4.ebuild
index 10e1d58ef0eb..853aec845818 100644
--- a/dev-db/hsqldb/hsqldb-2.7.4.ebuild
+++ b/dev-db/hsqldb/hsqldb-2.7.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.80.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.80.ebuild
index 5214469644ef..e72e1196de79 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.80.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.80.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dbmx.net/kyotocabinet/pkg/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug doc examples +lzma +lzo static-libs"
 
 DEPEND="virtual/zlib:=[static-libs?]
diff --git a/dev-db/libiodbc/libiodbc-3.52.15-r1.ebuild b/dev-db/libiodbc/libiodbc-3.52.15-r1.ebuild
index c5c382d7604c..c499e59848a2 100644
--- a/dev-db/libiodbc/libiodbc-3.52.15-r1.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.15-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( LGPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/dev-db/lmdb/lmdb-0.9.33.ebuild b/dev-db/lmdb/lmdb-0.9.33.ebuild
index 3822b4f9d392..b7789f923492 100644
--- a/dev-db/lmdb/lmdb-0.9.33.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.33.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openldap-${MY_P}/libraries/liblmdb"
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-db/mysql++/mysql++-3.3.0.ebuild b/dev-db/mysql++/mysql++-3.3.0.ebuild
index 1f4cd7b94bae..74ec4226f885 100644
--- a/dev-db/mysql++/mysql++-3.3.0.ebuild
+++ b/dev-db/mysql++/mysql++-3.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND="|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )"
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.42-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.42-r1.ebuild
index c322c6c56dcb..585b06ac5832 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.42-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.42-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.43.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.43.ebuild
index 363a39ad4328..f00421b0ccc2 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.43.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.43.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.44.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.44.ebuild
index 363a39ad4328..f00421b0ccc2 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.44.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.44.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/mysql/mysql-8.0.42.ebuild b/dev-db/mysql/mysql-8.0.42.ebuild
index 57f68aefcca7..7998b90d5fc0 100644
--- a/dev-db/mysql/mysql-8.0.42.ebuild
+++ b/dev-db/mysql/mysql-8.0.42.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/mysql"
 LICENSE="GPL-2"
 SLOT="8.0"
 # -ppc for bug #761715
-KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test test-install"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mysql/mysql-8.0.43.ebuild b/dev-db/mysql/mysql-8.0.43.ebuild
index 2ee8eeb0ae64..5de660d16904 100644
--- a/dev-db/mysql/mysql-8.0.43.ebuild
+++ b/dev-db/mysql/mysql-8.0.43.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/mysql"
 LICENSE="GPL-2"
 SLOT="8.0"
 # -ppc for bug #761715
-KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test test-install"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mysql/mysql-8.0.44.ebuild b/dev-db/mysql/mysql-8.0.44.ebuild
index a7c71385ab9c..64ebe8d7e546 100644
--- a/dev-db/mysql/mysql-8.0.44.ebuild
+++ b/dev-db/mysql/mysql-8.0.44.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/mysql"
 LICENSE="GPL-2"
 SLOT="8.0"
 # -ppc for bug #761715
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test test-install"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mysql/mysql-8.4.6.ebuild b/dev-db/mysql/mysql-8.4.6.ebuild
index f2678282a745..8b1e2e28c088 100644
--- a/dev-db/mysql/mysql-8.4.6.ebuild
+++ b/dev-db/mysql/mysql-8.4.6.ebuild
@@ -43,7 +43,7 @@ SLOT="$(ver_cut 1-2)"
 # https://github.com/mysql/mysql-server/commit/07bf1bdb620daf62c02ead0d5439d65c7c34aa00
 # -arm -hppa -mips -ppc -x86 -x86-linux
 # -ppc for bug #761715
-KEYWORDS="~amd64 -arm ~arm64 -hppa -mips -ppc ~ppc64 ~riscv ~s390 ~sparc -x86 ~amd64-linux -x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 -arm ~arm64 -hppa -mips -ppc ~ppc64 ~riscv ~s390 ~sparc -x86 ~x64-macos ~x64-solaris"
 IUSE="cjk cracklib debug jemalloc numa +perl profiling router selinux +server tcmalloc test test-install"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mysql/mysql-8.4.7.ebuild b/dev-db/mysql/mysql-8.4.7.ebuild
index 6e2fcf009954..10f120855c4a 100644
--- a/dev-db/mysql/mysql-8.4.7.ebuild
+++ b/dev-db/mysql/mysql-8.4.7.ebuild
@@ -43,7 +43,7 @@ SLOT="$(ver_cut 1-2)"
 # https://github.com/mysql/mysql-server/commit/07bf1bdb620daf62c02ead0d5439d65c7c34aa00
 # -arm -hppa -mips -ppc -x86 -x86-linux
 # -ppc for bug #761715
-KEYWORDS="~amd64 -arm ~arm64 -hppa -mips -ppc ~ppc64 ~riscv ~s390 ~sparc -x86 ~amd64-linux -x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 -arm ~arm64 -hppa -mips -ppc ~ppc64 ~riscv ~s390 ~sparc -x86 ~x64-macos ~x64-solaris"
 IUSE="cjk cracklib debug jemalloc numa +perl profiling router selinux +server tcmalloc test test-install"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/postgis/postgis-3.3.7-r2.ebuild b/dev-db/postgis/postgis-3.3.7-r2.ebuild
index c84e91495039..5cee936b315f 100644
--- a/dev-db/postgis/postgis-3.3.7-r2.ebuild
+++ b/dev-db/postgis/postgis-3.3.7-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/postgis/postgis-3.3.8-r1.ebuild b/dev-db/postgis/postgis-3.3.8-r1.ebuild
index 73dc00ffa49c..a1975a76329f 100644
--- a/dev-db/postgis/postgis-3.3.8-r1.ebuild
+++ b/dev-db/postgis/postgis-3.3.8-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/postgis/postgis-3.4.4-r1.ebuild b/dev-db/postgis/postgis-3.4.4-r1.ebuild
index 96a6f41ef0de..4ea5c666b36b 100644
--- a/dev-db/postgis/postgis-3.4.4-r1.ebuild
+++ b/dev-db/postgis/postgis-3.4.4-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/postgis/postgis-3.5.2-r1.ebuild b/dev-db/postgis/postgis-3.5.2-r1.ebuild
index d0dd1c30fc32..acd7527a5d38 100644
--- a/dev-db/postgis/postgis-3.5.2-r1.ebuild
+++ b/dev-db/postgis/postgis-3.5.2-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/postgis/postgis-3.5.3-r2.ebuild b/dev-db/postgis/postgis-3.5.3-r2.ebuild
index e338fca0537b..7ca89671715a 100644
--- a/dev-db/postgis/postgis-3.5.3-r2.ebuild
+++ b/dev-db/postgis/postgis-3.5.3-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/postgis/postgis-3.6.0.ebuild b/dev-db/postgis/postgis-3.6.0.ebuild
index 10f9f2367f9c..c8bb40b99723 100644
--- a/dev-db/postgis/postgis-3.6.0.ebuild
+++ b/dev-db/postgis/postgis-3.6.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	PGIS="$(ver_cut 1-2)"
 	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/postgresql/postgresql-14.20.ebuild b/dev-db/postgresql/postgresql-14.20.ebuild
index 965df0b1a716..0aacd0d3d32a 100644
--- a/dev-db/postgresql/postgresql-14.20.ebuild
+++ b/dev-db/postgresql/postgresql-14.20.ebuild
@@ -9,7 +9,7 @@ LLVM_OPTIONAL=1
 
 inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
diff --git a/dev-db/postgresql/postgresql-15.15.ebuild b/dev-db/postgresql/postgresql-15.15.ebuild
index b20dba0eab88..5584a6b9daa9 100644
--- a/dev-db/postgresql/postgresql-15.15.ebuild
+++ b/dev-db/postgresql/postgresql-15.15.ebuild
@@ -9,7 +9,7 @@ LLVM_OPTIONAL=1
 
 inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
diff --git a/dev-db/postgresql/postgresql-16.11.ebuild b/dev-db/postgresql/postgresql-16.11.ebuild
index 9600df02762d..7838329955ab 100644
--- a/dev-db/postgresql/postgresql-16.11.ebuild
+++ b/dev-db/postgresql/postgresql-16.11.ebuild
@@ -9,7 +9,7 @@ LLVM_OPTIONAL=1
 
 inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
diff --git a/dev-db/postgresql/postgresql-17.7.ebuild b/dev-db/postgresql/postgresql-17.7.ebuild
index 6f64d71f4618..765349e67216 100644
--- a/dev-db/postgresql/postgresql-17.7.ebuild
+++ b/dev-db/postgresql/postgresql-17.7.ebuild
@@ -9,7 +9,7 @@ LLVM_OPTIONAL=1
 
 inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
diff --git a/dev-db/postgresql/postgresql-18.1.ebuild b/dev-db/postgresql/postgresql-18.1.ebuild
index 85a940aea50f..feb34b8c8f1d 100644
--- a/dev-db/postgresql/postgresql-18.1.ebuild
+++ b/dev-db/postgresql/postgresql-18.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="POSTGRESQL GPL-2"
 SLOT=$(ver_cut 1)
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="debug doc +icu kerberos ldap llvm +lz4 +numa nls oauth pam perl python
 	+readline selinux +server systemd ssl static-libs tcl uuid +uring
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 245b28a91a7c..2eecdf33568c 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -20,7 +20,7 @@ if [[ $PV = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.postgresql.org/git/postgresql.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 	MY_PV=${PV/_/}
 	SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
diff --git a/dev-db/redis/redis-6.2.20.ebuild b/dev-db/redis/redis-6.2.20.ebuild
index 8130e25d39f5..9376a429dccc 100644
--- a/dev-db/redis/redis-6.2.20.ebuild
+++ b/dev-db/redis/redis-6.2.20.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-6.2.21.ebuild b/dev-db/redis/redis-6.2.21.ebuild
index 020bac82ceb3..603db45dedeb 100644
--- a/dev-db/redis/redis-6.2.21.ebuild
+++ b/dev-db/redis/redis-6.2.21.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-7.2.11.ebuild b/dev-db/redis/redis-7.2.11.ebuild
index e30e5a7a580d..bf657c33da8a 100644
--- a/dev-db/redis/redis-7.2.11.ebuild
+++ b/dev-db/redis/redis-7.2.11.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD Boost-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-7.2.12.ebuild b/dev-db/redis/redis-7.2.12.ebuild
index ef3d218a7133..f552bdb43d41 100644
--- a/dev-db/redis/redis-7.2.12.ebuild
+++ b/dev-db/redis/redis-7.2.12.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD Boost-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-7.4.6.ebuild b/dev-db/redis/redis-7.4.6.ebuild
index f845cefecdcb..518cd0fbaad9 100644
--- a/dev-db/redis/redis-7.4.6.ebuild
+++ b/dev-db/redis/redis-7.4.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( RSAL-2 SSPL-1 ) Boost-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-7.4.7.ebuild b/dev-db/redis/redis-7.4.7.ebuild
index da2295b6100e..893608630213 100644
--- a/dev-db/redis/redis-7.4.7.ebuild
+++ b/dev-db/redis/redis-7.4.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( RSAL-2 SSPL-1 ) Boost-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-8.0.4.ebuild b/dev-db/redis/redis-8.0.4.ebuild
index 9ff9c95cd710..1cd23b121b28 100644
--- a/dev-db/redis/redis-8.0.4.ebuild
+++ b/dev-db/redis/redis-8.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( AGPL-3 RSAL-2 SSPL-1 ) Boost-1.0 MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-8.0.5.ebuild b/dev-db/redis/redis-8.0.5.ebuild
index 3fd1b7e2cc0b..f018690dbf24 100644
--- a/dev-db/redis/redis-8.0.5.ebuild
+++ b/dev-db/redis/redis-8.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( AGPL-3 RSAL-2 SSPL-1 ) Boost-1.0 MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-8.2.2.ebuild b/dev-db/redis/redis-8.2.2.ebuild
index f4142bd65f88..0b4a72b9b106 100644
--- a/dev-db/redis/redis-8.2.2.ebuild
+++ b/dev-db/redis/redis-8.2.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( AGPL-3 RSAL-2 SSPL-1 ) Boost-1.0 MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-8.2.3.ebuild b/dev-db/redis/redis-8.2.3.ebuild
index 772ca12f4753..85464ac19838 100644
--- a/dev-db/redis/redis-8.2.3.ebuild
+++ b/dev-db/redis/redis-8.2.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( AGPL-3 RSAL-2 SSPL-1 ) Boost-1.0 MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/sqlite/sqlite-3.50.4.ebuild b/dev-db/sqlite/sqlite-3.50.4.ebuild
index ffcf261395df..daa1b6ce2446 100644
--- a/dev-db/sqlite/sqlite-3.50.4.ebuild
+++ b/dev-db/sqlite/sqlite-3.50.4.ebuild
@@ -24,7 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="public-domain"
diff --git a/dev-db/sqlite/sqlite-3.51.0.ebuild b/dev-db/sqlite/sqlite-3.51.0.ebuild
index 4a2f68ac1d4a..e0cf37ae80c9 100644
--- a/dev-db/sqlite/sqlite-3.51.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.51.0.ebuild
@@ -24,7 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="public-domain"
diff --git a/dev-db/sqlite/sqlite-3.51.1.ebuild b/dev-db/sqlite/sqlite-3.51.1.ebuild
index 4a2f68ac1d4a..e0cf37ae80c9 100644
--- a/dev-db/sqlite/sqlite-3.51.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.51.1.ebuild
@@ -24,7 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="public-domain"
diff --git a/dev-db/sqlite/sqlite-9999.ebuild b/dev-db/sqlite/sqlite-9999.ebuild
index a097b8f4d499..009295ba563e 100644
--- a/dev-db/sqlite/sqlite-9999.ebuild
+++ b/dev-db/sqlite/sqlite-9999.ebuild
@@ -24,7 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="public-domain"
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r3.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r3.ebuild
index ebd0db1d02a3..5e947feba8f5 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r3.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fallabs.com/tokyocabinet/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="bzip2 debug doc examples threads zlib"
 
 DEPEND="
diff --git a/dev-db/unixODBC/unixODBC-2.3.12-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.12-r1.ebuild
index 9964793c575b..2f5802151eb1 100644
--- a/dev-db/unixODBC/unixODBC-2.3.12-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.unixodbc.org/unixODBC-${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-db/unixODBC/unixODBC-2.3.12-r2.ebuild b/dev-db/unixODBC/unixODBC-2.3.12-r2.ebuild
index 3a25f64741fb..e2b440b45a91 100644
--- a/dev-db/unixODBC/unixODBC-2.3.12-r2.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.unixodbc.org/unixODBC-${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-db/unixODBC/unixODBC-2.3.14.ebuild b/dev-db/unixODBC/unixODBC-2.3.14.ebuild
index c3335bc2a660..0c6d8bd81b9a 100644
--- a/dev-db/unixODBC/unixODBC-2.3.14.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.unixodbc.org/unixODBC-${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-debug/cgdb/cgdb-0.8.0.ebuild b/dev-debug/cgdb/cgdb-0.8.0.ebuild
index 4c8395ac8b3f..f7e94fa4e4d3 100644
--- a/dev-debug/cgdb/cgdb-0.8.0.ebuild
+++ b/dev-debug/cgdb/cgdb-0.8.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ppc ppc64 x86"
 fi
 
 inherit autotools multilib-minimal
diff --git a/dev-debug/cgdb/cgdb-9999.ebuild b/dev-debug/cgdb/cgdb-9999.ebuild
index cc40b4433455..0567e31f4ac4 100644
--- a/dev-debug/cgdb/cgdb-9999.ebuild
+++ b/dev-debug/cgdb/cgdb-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
 inherit autotools multilib-minimal
diff --git a/dev-debug/ddd/ddd-3.3.12-r5.ebuild b/dev-debug/ddd/ddd-3.3.12-r5.ebuild
index 821ecd16bddc..730e4ac6d261 100644
--- a/dev-debug/ddd/ddd-3.3.12-r5.ebuild
+++ b/dev-debug/ddd/ddd-3.3.12-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="readline"
 
 RESTRICT="test"
diff --git a/dev-debug/ddd/ddd-3.4.1.ebuild b/dev-debug/ddd/ddd-3.4.1.ebuild
index 4eb709ac12cc..c7182039dedd 100644
--- a/dev-debug/ddd/ddd-3.4.1.ebuild
+++ b/dev-debug/ddd/ddd-3.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="readline"
 
 RESTRICT="test"
diff --git a/dev-debug/gdb/gdb-16.3.ebuild b/dev-debug/gdb/gdb-16.3.ebuild
index 9700d3980937..4c3594666404 100644
--- a/dev-debug/gdb/gdb-16.3.ebuild
+++ b/dev-debug/gdb/gdb-16.3.ebuild
@@ -79,7 +79,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="babeltrace cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 REQUIRED_USE="
 	guile? ( ${GUILE_REQUIRED_USE} )
diff --git a/dev-debug/gdb/gdb-9999.ebuild b/dev-debug/gdb/gdb-9999.ebuild
index 300c0fa0053f..cc7c270112cb 100644
--- a/dev-debug/gdb/gdb-9999.ebuild
+++ b/dev-debug/gdb/gdb-9999.ebuild
@@ -79,7 +79,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="babeltrace cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla +xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 REQUIRED_USE="
 	guile? ( ${GUILE_REQUIRED_USE} )
diff --git a/dev-debug/strace/strace-6.16.ebuild b/dev-debug/strace/strace-6.16.ebuild
index c7ff39d3ba99..9cb61932f360 100644
--- a/dev-debug/strace/strace-6.16.ebuild
+++ b/dev-debug/strace/strace-6.16.ebuild
@@ -16,7 +16,7 @@ else
 		https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc
diff --git a/dev-debug/strace/strace-6.17.ebuild b/dev-debug/strace/strace-6.17.ebuild
index c7ff39d3ba99..9cb61932f360 100644
--- a/dev-debug/strace/strace-6.17.ebuild
+++ b/dev-debug/strace/strace-6.17.ebuild
@@ -16,7 +16,7 @@ else
 		https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc
diff --git a/dev-debug/strace/strace-6.18.ebuild b/dev-debug/strace/strace-6.18.ebuild
index 1c2af7cc0108..1f92cf7fe7e2 100644
--- a/dev-debug/strace/strace-6.18.ebuild
+++ b/dev-debug/strace/strace-6.18.ebuild
@@ -16,7 +16,7 @@ else
 		https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc
diff --git a/dev-debug/strace/strace-9999.ebuild b/dev-debug/strace/strace-9999.ebuild
index 1c2af7cc0108..1f92cf7fe7e2 100644
--- a/dev-debug/strace/strace-9999.ebuild
+++ b/dev-debug/strace/strace-9999.ebuild
@@ -16,7 +16,7 @@ else
 		https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc
diff --git a/dev-debug/valgrind/valgrind-3.24.0_p3.ebuild b/dev-debug/valgrind/valgrind-3.24.0_p3.ebuild
index 417a87c7bc03..39157c46527a 100644
--- a/dev-debug/valgrind/valgrind-3.24.0_p3.ebuild
+++ b/dev-debug/valgrind/valgrind-3.24.0_p3.ebuild
@@ -39,7 +39,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-debug/valgrind/valgrind-3.25.1.ebuild b/dev-debug/valgrind/valgrind-3.25.1.ebuild
index 0e1f32590207..ae64c47c9d6b 100644
--- a/dev-debug/valgrind/valgrind-3.25.1.ebuild
+++ b/dev-debug/valgrind/valgrind-3.25.1.ebuild
@@ -42,7 +42,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-debug/valgrind/valgrind-3.26.0.ebuild b/dev-debug/valgrind/valgrind-3.26.0.ebuild
index 79961384253f..4413746612ac 100644
--- a/dev-debug/valgrind/valgrind-3.26.0.ebuild
+++ b/dev-debug/valgrind/valgrind-3.26.0.ebuild
@@ -42,7 +42,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-debug/valgrind/valgrind-9999.ebuild b/dev-debug/valgrind/valgrind-9999.ebuild
index 89714fd9ab2c..e0233e6d293b 100644
--- a/dev-debug/valgrind/valgrind-9999.ebuild
+++ b/dev-debug/valgrind/valgrind-9999.ebuild
@@ -42,7 +42,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r4.ebuild b/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r4.ebuild
index 1e3aeb11a5b3..7849a2d84aa9 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r4.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="cairo"
 #skip tests due https://bugs.gentoo.org/687784
 RESTRICT="test"
diff --git a/dev-dotnet/libgdiplus/libgdiplus-6.2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-6.2.ebuild
index 787a0699e598..7a12fd9afdf8 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-6.2.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.mono-project.com"
 SRC_URI="https://dev.gentoo.org/~sam/distfiles/dev-dotnet/libgdiplus/libgdiplus-6.2.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-games/ode/ode-0.14-r1.ebuild b/dev-games/ode/ode-0.14-r1.ebuild
index 4b47cc5c5a34..8cb9528169c7 100644
--- a/dev-games/ode/ode-0.14-r1.ebuild
+++ b/dev-games/ode/ode-0.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/odedevs/ode/downloads/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1+ BSD )"
 SLOT="0/6"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug doc double-precision examples gyroscopic static-libs"
 
 RDEPEND="
diff --git a/dev-go/go-dep-tarball/go-dep-tarball-0.1.ebuild b/dev-go/go-dep-tarball/go-dep-tarball-0.1.ebuild
index 6c960737ddb4..0266b1c15af1 100644
--- a/dev-go/go-dep-tarball/go-dep-tarball-0.1.ebuild
+++ b/dev-go/go-dep-tarball/go-dep-tarball-0.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 
 src_install() {
 	newbin "${FILESDIR}/go-dep-tarball-${PV}" go-dep-tarball
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
index e313b921e66f..5257d0316ba9 100644
--- a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
+++ b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
index d3e947626240..8c1e7cd1920d 100644
--- a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
+++ b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild
index 149b0d0369e2..871c892da1d1 100644
--- a/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild
+++ b/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/binary/binary-0.8.8.0-r1.ebuild b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
index 14a25e4b94b0..14dab152fbea 100644
--- a/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
+++ b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/kolmodin/binary"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
 
diff --git a/dev-haskell/binary/binary-0.8.9.0-r1.ebuild b/dev-haskell/binary/binary-0.8.9.0-r1.ebuild
index c94c8c12207c..e23e43487ccb 100644
--- a/dev-haskell/binary/binary-0.8.9.0-r1.ebuild
+++ b/dev-haskell/binary/binary-0.8.9.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/kolmodin/binary"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
 
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild
index 89eb41c70f59..3188ff8ad27d 100644
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/bos/bloomfilter"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.1.0-ghc-9_2-fix.patch"
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
index 53f7f16682cf..6a777dc188a6 100644
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index c6ebea07bfda..d827f7d3dad6 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
index a02c111f84c2..8bdd2d814ab3 100644
--- a/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.haskell.org/cabal/"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
 
diff --git a/dev-haskell/cabal/cabal-3.6.3.0.ebuild b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
index 45f63629ee03..14237f7aae10 100644
--- a/dev-haskell/cabal/cabal-3.6.3.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.haskell.org/cabal/"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-lang/ghc-9.2.4:= <dev-lang/ghc-9.3:=
diff --git a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
index 7d0c5b0d74c3..243209b0670f 100644
--- a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
+++ b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=[profile?]
diff --git a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
index 6084087fe8f9..4600efbe33bb 100644
--- a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
index a5628d309def..151a2f9e89b8 100644
--- a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
index d03268b545a6..6ccc5fa1431d 100644
--- a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default/data-default-0.7.1.1.ebuild b/dev-haskell/data-default/data-default-0.7.1.1.ebuild
index 7e319cb77826..a207986986f9 100644
--- a/dev-haskell/data-default/data-default-0.7.1.1.ebuild
+++ b/dev-haskell/data-default/data-default-0.7.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
diff --git a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
index ac633b9b6fa0..1c0a77e4a591 100644
--- a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
+++ b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
index bc9ed7d15433..0ba8b570cd6d 100644
--- a/dev-haskell/digest/digest-0.0.1.2.ebuild
+++ b/dev-haskell/digest/digest-0.0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/digest/digest-0.0.1.3.ebuild b/dev-haskell/digest/digest-0.0.1.3.ebuild
index a161e9e15117..cb0bf9a2ff39 100644
--- a/dev-haskell/digest/digest-0.0.1.3.ebuild
+++ b/dev-haskell/digest/digest-0.0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 	virtual/zlib:=
diff --git a/dev-haskell/dlist/dlist-1.0.ebuild b/dev-haskell/dlist/dlist-1.0.ebuild
index 442adfa1269c..a580daab3554 100644
--- a/dev-haskell/dlist/dlist-1.0.ebuild
+++ b/dev-haskell/dlist/dlist-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="werror"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
index 9e8d1256db26..809f6fd3fafe 100644
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+++ b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/random-1.0:=[profile?]
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
index 56d4d22c7e3e..f5a4a959b0d4 100644
--- a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+++ b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
index a6704fc29cb6..bfdfee0137ec 100644
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ b/dev-haskell/fail/fail-4.9.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild b/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
index 24f7e08f71c3..71b1b672201c 100644
--- a/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
+++ b/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.haskell.org/haddock/"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 CABAL_CHDEPS=(
 	'hspec                          >= 2.4.4    && < 2.8' 'hspec >=2.4.4'
diff --git a/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild b/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild
index 298125f5440d..bb57674cd318 100644
--- a/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/judah/haskeline"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+terminfo"
 
 RESTRICT=test # test requires example executable which does not work correctly
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
index e929cf6b6a3a..29b5777e383f 100644
--- a/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
+++ b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/haskell-hvr/hslogger/wiki"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2
diff --git a/dev-haskell/html/html-1.0.1.2-r1.ebuild b/dev-haskell/html/html-1.0.1.2-r1.ebuild
index f98a45dc6ad9..a960a0e5e463 100644
--- a/dev-haskell/html/html-1.0.1.2-r1.ebuild
+++ b/dev-haskell/html/html-1.0.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
index cee5a3dac48b..e3b89f7973d0 100644
--- a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
+++ b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
index 2ac79d790b0d..94b122d23c7e 100644
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
+++ b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?]
diff --git a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
index 041ea07b6bba..e5ef900df776 100644
--- a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
+++ b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://hackage.haskell.org/package/MissingH"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RESTRICT=test # tests are present for removed modules
 
diff --git a/dev-haskell/missingh/missingh-1.6.0.0.ebuild b/dev-haskell/missingh/missingh-1.6.0.0.ebuild
index ccd03c06605a..beab72ca4397 100644
--- a/dev-haskell/missingh/missingh-1.6.0.0.ebuild
+++ b/dev-haskell/missingh/missingh-1.6.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://hackage.haskell.org/package/MissingH"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
 	>=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
index c2f901641a53..f9ad6cb37e6e 100644
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 # IUSE="test"
 IUSE=""
 
diff --git a/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild b/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
index 4aed8891e631..91c2fe079b6a 100644
--- a/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
+++ b/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
diff --git a/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild b/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild
index 096011c07e8b..1aa8d34c8808 100644
--- a/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild
+++ b/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
 	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
diff --git a/dev-haskell/mtl/mtl-2.2.2-r1.ebuild b/dev-haskell/mtl/mtl-2.2.2-r1.ebuild
index a6f8569f56fb..96a5d17a136f 100644
--- a/dev-haskell/mtl/mtl-2.2.2-r1.ebuild
+++ b/dev-haskell/mtl/mtl-2.2.2-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/haskell/mtl"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-lang/ghc-8.10.6:=
diff --git a/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild b/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
index b0cc1fa78574..13951f01a76a 100644
--- a/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
+++ b/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RESTRICT=test # circular depend: network-uri[test]->criterion->js-flot->http->network-uri
 
diff --git a/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild b/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild
index 78efe4ef49f6..a3f618cbc57d 100644
--- a/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild
+++ b/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/haskell/network-uri"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-haskell/th-compat-0.1.1:=[profile?] <dev-haskell/th-compat-1.0:=[profile?]
diff --git a/dev-haskell/network/network-3.1.2.5.ebuild b/dev-haskell/network/network-3.1.2.5.ebuild
index 43ac31bb6513..c8357f94021a 100644
--- a/dev-haskell/network/network-3.1.2.5.ebuild
+++ b/dev-haskell/network/network-3.1.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="devel"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/network/network-3.1.3.0.ebuild b/dev-haskell/network/network-3.1.3.0.ebuild
index caff0339fd4c..da7d3c2ff5b0 100644
--- a/dev-haskell/network/network-3.1.3.0.ebuild
+++ b/dev-haskell/network/network-3.1.3.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/haskell/network"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="devel"
 
 RDEPEND=">=dev-lang/ghc-8.8.1:=
diff --git a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
index 8496c4c3d09b..640403f8de9f 100644
--- a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
+++ b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
index 7ef44a7fd238..e43b894f65c4 100644
--- a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
+++ b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
diff --git a/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild b/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
index b3b9084fe52a..8a50b3848628 100644
--- a/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/haskell/parsec"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
 
diff --git a/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild
index e31e8cee36c8..b2dccc2874a4 100644
--- a/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/haskell/parsec"
 LICENSE="BSD-2"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
 
diff --git a/dev-haskell/primitive/primitive-0.7.3.0.ebuild b/dev-haskell/primitive/primitive-0.7.3.0.ebuild
index 89d25287ca6e..a2d458eb6038 100644
--- a/dev-haskell/primitive/primitive-0.7.3.0.ebuild
+++ b/dev-haskell/primitive/primitive-0.7.3.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/haskell/primitive"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RESTRICT=test # circular depends: primitive[test]->tasty->wcwidth->attoparsec->scientific->primitive
 
diff --git a/dev-haskell/primitive/primitive-0.7.4.0.ebuild b/dev-haskell/primitive/primitive-0.7.4.0.ebuild
index 1a4f19a9b655..c347aba5db70 100644
--- a/dev-haskell/primitive/primitive-0.7.4.0.ebuild
+++ b/dev-haskell/primitive/primitive-0.7.4.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/haskell/primitive"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 CABAL_CHDEPS=(
 	'tasty ^>= 1.2 || ^>= 1.3 || ^>= 1.4' 'tasty >= 1.2'
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
index 5ed92e250c7e..c52af4777777 100644
--- a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+template-haskell"
 
 RDEPEND=">=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
index 6af1c5d02f8f..8364af73fac1 100644
--- a/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nick8325/quickcheck"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+template-haskell"
 
 RDEPEND=">=dev-haskell/random-1.2.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
diff --git a/dev-haskell/random/random-1.2.1.1.ebuild b/dev-haskell/random/random-1.2.1.1.ebuild
index 9bb6d3c15166..3c521a2bab57 100644
--- a/dev-haskell/random/random-1.2.1.1.ebuild
+++ b/dev-haskell/random/random-1.2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 # circular depend: random[test]->mwc-random->math-functions[test]->vector-th-unbox->vector->random
 RESTRICT=test
diff --git a/dev-haskell/random/random-1.2.1.ebuild b/dev-haskell/random/random-1.2.1.ebuild
index 69de77fd891b..c8dd47917452 100644
--- a/dev-haskell/random/random-1.2.1.ebuild
+++ b/dev-haskell/random/random-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 # circular depend: random[test]->mwc-random->math-functions[test]->vector-th-unbox->vector->random
 RESTRICT=test
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
index 607d4ebba01e..dcd65939e8bb 100644
--- a/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
+++ b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild
index 03825e430e88..869ee52125c7 100644
--- a/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild
+++ b/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
index 52efe53d1383..bcf3f16a6e24 100644
--- a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
+++ b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://hackage.haskell.org/package/regex-posix"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild
index 5caa19ce22d0..3c4b697ba779 100644
--- a/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild
+++ b/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://hackage.haskell.org/package/regex-posix"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
index 19c4592ac702..ba0496d6f79d 100644
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/stm:=[profile?]
diff --git a/dev-haskell/sha/sha-1.6.4.4.ebuild b/dev-haskell/sha/sha-1.6.4.4.ebuild
index 1a3074b605b1..a42962e2c18a 100644
--- a/dev-haskell/sha/sha-1.6.4.4.ebuild
+++ b/dev-haskell/sha/sha-1.6.4.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="exe"
 
 RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/stm/stm-2.5.0.1-r1.ebuild b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
index bac45f1e1224..5fc7b647a0ed 100644
--- a/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
+++ b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.haskell.org/Software_transactional_memory"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 CABAL_CHDEPS=(
 	'base  >= 4.3 && < 4.15' 'base >= 4.3'
diff --git a/dev-haskell/stm/stm-2.5.0.2-r1.ebuild b/dev-haskell/stm/stm-2.5.0.2-r1.ebuild
index 46353f326a3f..5f0c24e8ec47 100644
--- a/dev-haskell/stm/stm-2.5.0.2-r1.ebuild
+++ b/dev-haskell/stm/stm-2.5.0.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.haskell.org/Software_transactional_memory"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-lang/ghc-9.2.4:=
diff --git a/dev-haskell/syb/syb-0.7.2.1.ebuild b/dev-haskell/syb/syb-0.7.2.1.ebuild
index 51399b962673..9904b7746c6c 100644
--- a/dev-haskell/syb/syb-0.7.2.1.ebuild
+++ b/dev-haskell/syb/syb-0.7.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/syb/syb-0.7.2.4.ebuild b/dev-haskell/syb/syb-0.7.2.4.ebuild
index 4908a67d58a4..3f9c867085bf 100644
--- a/dev-haskell/syb/syb-0.7.2.4.ebuild
+++ b/dev-haskell/syb/syb-0.7.2.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/dreixel/syb"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.8.1:=
 "
diff --git a/dev-haskell/text/text-1.2.5.0-r1.ebuild b/dev-haskell/text/text-1.2.5.0-r1.ebuild
index 8b21259adcc9..d432ba7b10b5 100644
--- a/dev-haskell/text/text-1.2.5.0-r1.ebuild
+++ b/dev-haskell/text/text-1.2.5.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/haskell/text"
 LICENSE="BSD-2"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 # break cyclic dependencies:
 RESTRICT=test
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
index 45d173e0a8d1..e0e7af651631 100644
--- a/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
+++ b/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+orphaninstances"
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild
index da39d1d66a8b..33336c5868af 100644
--- a/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild
+++ b/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/mvv/transformers-base"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+orphaninstances"
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
index 547ea1d9efda..1e8fb92fe9c7 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
index 36e1b3237168..1728e4219fd4 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ekmett/transformers-compat/"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild b/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild
index 9db0a37be295..ac6f039f6c1e 100644
--- a/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild
+++ b/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://hackage.haskell.org/package/transformers"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-lang/ghc-8.10.6:=
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
index 5096489d3eb6..671bdfa84bda 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild
index 937afaa77e8f..3c6305cd9d24 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/x11/x11-1.10.2.ebuild b/dev-haskell/x11/x11-1.10.2.ebuild
index 0458dc74d72a..af968a874826 100644
--- a/dev-haskell/x11/x11-1.10.2.ebuild
+++ b/dev-haskell/x11/x11-1.10.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/xmonad/X11"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+xinerama"
 
 # add +xinerama to IUSE and RDEPEND on libXScrnSaver and libXinerama below
diff --git a/dev-java/ant/ant-1.10.15.ebuild b/dev-java/ant/ant-1.10.15.ebuild
index 4b01dce5cd4b..92e9ebaa2874 100644
--- a/dev-java/ant/ant-1.10.15.ebuild
+++ b/dev-java/ant/ant-1.10.15.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 IUSE="antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend
 	jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz"
 
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index 88a93668baf1..cc33ac1e7399 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr-tool/antlr-tool-4.13.2-r1.ebuild b/dev-java/antlr-tool/antlr-tool-4.13.2-r1.ebuild
index 99b51502ade0..8e73341db74c 100644
--- a/dev-java/antlr-tool/antlr-tool-4.13.2-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.13.2-r1.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_PN}4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-2.7.7-r10.ebuild b/dev-java/antlr/antlr-2.7.7-r10.ebuild
index 86a3333fddf1..c8caf6ed429d 100644
--- a/dev-java/antlr/antlr-2.7.7-r10.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r10.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/antlr/antlr-3.2-r2.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild
index 16052030afcf..d7d6da91d945 100644
--- a/dev-java/antlr/antlr-3.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.2-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 RESTRICT="!test? ( test )"
 
 CP_DEPEND=">=dev-java/antlr-2.7.7-r7:0
diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index c8b458f4acef..c61d1440241e 100644
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/antlr/antlr-4.13.2.ebuild b/dev-java/antlr/antlr-4.13.2.ebuild
index 7a19da2ad21b..79118c3ebbf1 100644
--- a/dev-java/antlr/antlr-4.13.2.ebuild
+++ b/dev-java/antlr/antlr-4.13.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
index 8cd8ff2e5ac9..f9dd44793a5d 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
 LICENSE="public-domain"
 SLOT="1"
 
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 IUSE=""
 
diff --git a/dev-java/bcel/bcel-6.10.0-r2.ebuild b/dev-java/bcel/bcel-6.10.0-r2.ebuild
index b7088b3d6a80..bfe622437f00 100644
--- a/dev-java/bcel/bcel-6.10.0-r2.ebuild
+++ b/dev-java/bcel/bcel-6.10.0-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/bsf/bsf-2.4.0-r7.ebuild b/dev-java/bsf/bsf-2.4.0-r7.ebuild
index 778447e72226..9fb04c64b5c5 100644
--- a/dev-java/bsf/bsf-2.4.0-r7.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 # If you add new ones, add them to ant-apache-bsf too for use dependencies
 IUSE="javascript tcl"
diff --git a/dev-java/bsh/bsh-2.1.1-r2.ebuild b/dev-java/bsh/bsh-2.1.1-r2.ebuild
index a4b22492e299..d61fba244315 100644
--- a/dev-java/bsh/bsh-2.1.1-r2.ebuild
+++ b/dev-java/bsh/bsh-2.1.1-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/beanshell-${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 # There was 1 failure:
 # 1) do_not_access_non_open_methods(bsh.Java_9_Test)
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
index 5878283bc742..7ca5ac2ae3bd 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}.src"
 
 LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64"
 
 CP_DEPEND="
 	dev-java/log4j-12-api:2
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild
index 4e658eb94ee9..f50330171213 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 IUSE="log4j"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild
index 5ddf7fbbcc1b..bbced5733489 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="1.7"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-cli/commons-cli-1.10.0.ebuild b/dev-java/commons-cli/commons-cli-1.10.0.ebuild
index 963892ca608e..771cbc819ff2 100644
--- a/dev-java/commons-cli/commons-cli-1.10.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.10.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
diff --git a/dev-java/commons-codec/commons-codec-1.19.0.ebuild b/dev-java/commons-codec/commons-codec-1.19.0.ebuild
index dbc2d8b3042c..7f6f92b508b1 100644
--- a/dev-java/commons-codec/commons-codec-1.19.0.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.19.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
index 626e8277d402..00b6b71dfaa6 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
index 434aab011045..4aebdc406066 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 # Tests run: 2036,  Failures: 91
 RESTRICT="test"
diff --git a/dev-java/commons-io/commons-io-2.18.0.ebuild b/dev-java/commons-io/commons-io-2.18.0.ebuild
index 07616c52470e..791d91de614d 100644
--- a/dev-java/commons-io/commons-io-2.18.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.18.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-io/commons-io-2.20.0.ebuild b/dev-java/commons-io/commons-io-2.20.0.ebuild
index 516e89317f6a..9614848ccefe 100644
--- a/dev-java/commons-io/commons-io-2.20.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.20.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
diff --git a/dev-java/commons-lang/commons-lang-3.17.0.ebuild b/dev-java/commons-lang/commons-lang-3.17.0.ebuild
index f673a72e60f8..3995719dda75 100644
--- a/dev-java/commons-lang/commons-lang-3.17.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.17.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}3-${PV}-src"
 
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
diff --git a/dev-java/commons-lang/commons-lang-3.19.0.ebuild b/dev-java/commons-lang/commons-lang-3.19.0.ebuild
index 95f276cc3963..aba206a984f4 100644
--- a/dev-java/commons-lang/commons-lang-3.19.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.19.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}3-${PV}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
diff --git a/dev-java/commons-logging/commons-logging-1.3.5.ebuild b/dev-java/commons-logging/commons-logging-1.3.5.ebuild
index 1a7860dd0658..a99279c04f4c 100644
--- a/dev-java/commons-logging/commons-logging-1.3.5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 IUSE="log4j"
 
 # src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26:
diff --git a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
index 7f37b0cdfbc0..9681ddaa9e17 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
@@ -20,6 +20,6 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 JAVA_AUTOMATIC_MODULE_NAME="commons.math3"
diff --git a/dev-java/commons-net/commons-net-3.12.0.ebuild b/dev-java/commons-net/commons-net-3.12.0.ebuild
index 86a0258cc73f..28fc2ae60392 100644
--- a/dev-java/commons-net/commons-net-3.12.0.ebuild
+++ b/dev-java/commons-net/commons-net-3.12.0.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )"
 
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
index f83938ac5b4d..a334d1d7e660 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/core"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/ant-1.10.14-r3:0
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
index f04cdbf18d65..50e7df50bd3a 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CDEPEND="dev-java/java-getopt:1"
 
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
index 4dacae9bd323..72eee6edbe84 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
index 3e2838dfdbaa..72a3837fca5f 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/iso-relax/iso-relax-20050331-r7.ebuild b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
index 67b897129b08..d1810571aaca 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/jackcess/jackcess-4.0.7.ebuild b/dev-java/jackcess/jackcess-4.0.7.ebuild
index d5750f410b6c..abd0a20315a6 100644
--- a/dev-java/jackcess/jackcess-4.0.7.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/commons-lang-3.17:3.6
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild
index b29d5409c34b..fcd573521886 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
index 40b7666e2294..9e856e8728b0 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-1.1"
 SLOT="${PV}"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="<virtual/jdk-26:*" # bug #965859
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/java-config/java-config-2.3.4.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild
index 2fa1b5ba2760..3f9ad96709c4 100644
--- a/dev-java/java-config/java-config-2.3.4.ebuild
+++ b/dev-java/java-config/java-config-2.3.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index cc07b792e26e..3e80b64c5c4b 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild b/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild
index e625aef044cc..84320db162b4 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/javacup/javacup-11b_p20160615-r2.ebuild b/dev-java/javacup/javacup-11b_p20160615-r2.ebuild
index 63e1a59fb52f..a5cde5ef488b 100644
--- a/dev-java/javacup/javacup-11b_p20160615-r2.ebuild
+++ b/dev-java/javacup/javacup-11b_p20160615-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${PV/_p/-}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 IUSE="ant-task"
 
 DEPEND="
diff --git a/dev-java/javassist/javassist-3.30.2-r1.ebuild b/dev-java/javassist/javassist-3.30.2-r1.ebuild
index 1c6b68352db9..9af856d93ad5 100644
--- a/dev-java/javassist/javassist-3.30.2-r1.ebuild
+++ b/dev-java/javassist/javassist-3.30.2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
 
 LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
 SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 # src/main/javassist/tools/rmi/ObjectImporter.java:99: error: package java.applet does not exist
 #     public ObjectImporter(@SuppressWarnings("deprecation") java.applet.Applet applet) {
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.10.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.10.ebuild
index 8b1b79107cd9..7ecc451d9152 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.10.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~sparc ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~sparc ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
index 8331f33005c7..ffea8938a449 100644
--- a/dev-java/javax-inject/javax-inject-1-r4.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jdepend/jdepend-2.10-r1.ebuild b/dev-java/jdepend/jdepend-2.10-r1.ebuild
index ee2e7a366996..c4e81e5e8f58 100644
--- a/dev-java/jdepend/jdepend-2.10-r1.ebuild
+++ b/dev-java/jdepend/jdepend-2.10-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 RESTRICT="test" #921147
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jmock/jmock-1.2.0-r3.ebuild b/dev-java/jmock/jmock-1.2.0-r3.ebuild
index 1e1907f70851..e4ecd04cb34e 100644
--- a/dev-java/jmock/jmock-1.2.0-r3.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 CP_DEPEND="dev-java/junit:0"
 
diff --git a/dev-java/joda-time/joda-time-2.13.0.ebuild b/dev-java/joda-time/joda-time-2.13.0.ebuild
index 68aec550a687..953b382a9f71 100644
--- a/dev-java/joda-time/joda-time-2.13.0.ebuild
+++ b/dev-java/joda-time/joda-time-2.13.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	dev-java/joda-convert:0
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 0c211b2600ee..0c4baf46e39c 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/junit${PV}"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 58e6bbc34ee0..c8bb1759613c 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}"
 
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="dev-java/hamcrest-core:1.3"
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/jzlib/jzlib-1.1.3-r3.ebuild b/dev-java/jzlib/jzlib-1.1.3-r3.ebuild
index cff504d9eebc..5bec9d74d0d7 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r3.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
index fdb19fa6e8e7..c216e4e62d98 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
 HOMEPAGE="https://relaxng.org/"
 SRC_URI="https://repo1.maven.org/maven2/relaxngDatatype/relaxngDatatype/${PV}/relaxngDatatype-${PV}-sources.jar"
 
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-java/sax/sax-2.2.1-r5.ebuild b/dev-java/sax/sax-2.2.1-r5.ebuild
index 1e399bafab12..5264c5d488a9 100644
--- a/dev-java/sax/sax-2.2.1-r5.ebuild
+++ b/dev-java/sax/sax-2.2.1-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}.zip -> ${P}.zip"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*"
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
index 217db7a0df22..8a5ce4f447f5 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}3-${MY_COMMIT}"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 CP_DEPEND="dev-java/antlr:0"
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index cbdea375ff50..3d78efe68787 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -23,7 +23,7 @@ TARBALL_S="${S}/${PN}4-ST4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-solaris"
 
 CP_DEPEND="
 	dev-java/antlr-runtime:3.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
index 5afbc0580e61..16503dd35a8d 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}/servletapi"
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
index cfde20ba2931..b11848671f3d 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/xalan-j_${PV//./_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xalan/xalan-2.7.3-r3.ebuild b/dev-java/xalan/xalan-2.7.3-r3.ebuild
index 95c72882eb9f..c1da9ccdc5cf 100644
--- a/dev-java/xalan/xalan-2.7.3-r3.ebuild
+++ b/dev-java/xalan/xalan-2.7.3-r3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/xalan-j_${PV//./_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 # https://bugs.gentoo.org/936274 - for x86 we provide the precompiled java-cup
 COMMON_DEPEND="
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.ebuild
index 9b715ef5f9f6..c6038253e387 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.
 
 LICENSE="Apache-2.0"
 SLOT="1.4"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 BDEPEND="source? ( app-arch/zip )"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
index 12a3bc7f746f..882f6332a72b 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/xerces/xml-commons/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xom/xom-1.3.9.ebuild b/dev-java/xom/xom-1.3.9.ebuild
index ca9fbc5f328b..bdee7ef324e6 100644
--- a/dev-java/xom/xom-1.3.9.ebuild
+++ b/dev-java/xom/xom-1.3.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.g
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 # Bug #905215 Without 'test_network',there are 14 test failures like:
 #java.net.UnknownHostException: raw.githubusercontent.com
diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
index 71cfb086458c..79cda029d924 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-1.1 IBM"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 # Some failures, partly because we haven't patched Xerces but probably
 # also because this software is ancient. :(
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
index f7e5ace5b558..71fb107abea2 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 # Restriction to java 1.8
 # Otherwise jdk 11+ would fail to build javadoc:
diff --git a/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild b/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild
index 7124d953a062..9f481aaee6d7 100644
--- a/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild
+++ b/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/msv-msv-${PV}/xsdlib"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
 
 CP_DEPEND="dev-java/relaxng-datatype:0"
 
diff --git a/dev-lang/R/R-4.4.1.ebuild b/dev-lang/R/R-4.4.1.ebuild
index a955e3a40d49..1eb0dd5f437e 100644
--- a/dev-lang/R/R-4.4.1.ebuild
+++ b/dev-lang/R/R-4.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm64 ~hppa ~loong ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo doc icu java jpeg +libdeflate lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-lang/R/R-4.4.3.ebuild b/dev-lang/R/R-4.4.3.ebuild
index 1c633dbcea23..c3290df0c01e 100644
--- a/dev-lang/R/R-4.4.3.ebuild
+++ b/dev-lang/R/R-4.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo doc icu java jpeg +libdeflate lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-lang/R/R-4.5.0.ebuild b/dev-lang/R/R-4.5.0.ebuild
index b5a17de010e1..935e00c20602 100644
--- a/dev-lang/R/R-4.5.0.ebuild
+++ b/dev-lang/R/R-4.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm64 ~hppa ~loong ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo doc icu java jpeg +libdeflate lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-lang/R/R-4.5.2.ebuild b/dev-lang/R/R-4.5.2.ebuild
index 7f63800b4d4c..df67e8614b0d 100644
--- a/dev-lang/R/R-4.5.2.ebuild
+++ b/dev-lang/R/R-4.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo doc icu java jpeg +libdeflate lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-lang/cfortran/cfortran-20110621.ebuild b/dev-lang/cfortran/cfortran-20110621.ebuild
index 4a71853fd687..2b76520d5fc5 100644
--- a/dev-lang/cfortran/cfortran-20110621.ebuild
+++ b/dev-lang/cfortran/cfortran-20110621.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/cfortran/cfortran-20210827.ebuild b/dev-lang/cfortran/cfortran-20210827.ebuild
index 6da90b782a5a..4353a8907ca8 100644
--- a/dev-lang/cfortran/cfortran-20210827.ebuild
+++ b/dev-lang/cfortran/cfortran-20210827.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" mirror://debian/pool/main/c/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.xz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/cfortran/cfortran-4.4-r4.ebuild b/dev-lang/cfortran/cfortran-4.4-r4.ebuild
index bb61fb7d2eaf..14871d1f6577 100644
--- a/dev-lang/cfortran/cfortran-4.4-r4.ebuild
+++ b/dev-lang/cfortran/cfortran-4.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples"
 
 PATCHES=( "${WORKDIR}"/${PN}_${PV}-${DEB_PR}.diff )
diff --git a/dev-lang/cll1h/cll1h-0.6-r1.ebuild b/dev-lang/cll1h/cll1h-0.6-r1.ebuild
index 6c5ac2707b93..d601a403fccc 100644
--- a/dev-lang/cll1h/cll1h-0.6-r1.ebuild
+++ b/dev-lang/cll1h/cll1h-0.6-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://gpl.arachne.cz/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 
 RDEPEND="sys-devel/gcc"
 
diff --git a/dev-lang/clojure/clojure-1.12.3.ebuild b/dev-lang/clojure/clojure-1.12.3.ebuild
index ffb2cb87df74..f81cbaf260d9 100644
--- a/dev-lang/clojure/clojure-1.12.3.ebuild
+++ b/dev-lang/clojure/clojure-1.12.3.ebuild
@@ -47,7 +47,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="EPL-1.0 Apache-2.0 BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~x86-linux"
+KEYWORDS="amd64"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
diff --git a/dev-lang/clojure/clojure-1.12.4.ebuild b/dev-lang/clojure/clojure-1.12.4.ebuild
index c97b582c6c2f..2c64f29d744a 100644
--- a/dev-lang/clojure/clojure-1.12.4.ebuild
+++ b/dev-lang/clojure/clojure-1.12.4.ebuild
@@ -47,7 +47,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="EPL-1.0 Apache-2.0 BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86-linux"
+KEYWORDS="~amd64"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
diff --git a/dev-lang/erlang/erlang-26.2.1-r1.ebuild b/dev-lang/erlang/erlang-26.2.1-r1.ebuild
index 5912a5b2fbae..f57e6dabdb9f 100644
--- a/dev-lang/erlang/erlang-26.2.1-r1.ebuild
+++ b/dev-lang/erlang/erlang-26.2.1-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-26.2.5.14.ebuild b/dev-lang/erlang/erlang-26.2.5.14.ebuild
index c77f7fdb577d..dad1d56300ad 100644
--- a/dev-lang/erlang/erlang-26.2.5.14.ebuild
+++ b/dev-lang/erlang/erlang-26.2.5.14.ebuild
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-26.2.5.15.ebuild b/dev-lang/erlang/erlang-26.2.5.15.ebuild
index c77f7fdb577d..dad1d56300ad 100644
--- a/dev-lang/erlang/erlang-26.2.5.15.ebuild
+++ b/dev-lang/erlang/erlang-26.2.5.15.ebuild
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-27.3.4.2.ebuild b/dev-lang/erlang/erlang-27.3.4.2.ebuild
index 9cc365c952b5..0ab2ece3fa63 100644
--- a/dev-lang/erlang/erlang-27.3.4.2.ebuild
+++ b/dev-lang/erlang/erlang-27.3.4.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-27.3.4.3.ebuild b/dev-lang/erlang/erlang-27.3.4.3.ebuild
index 9cc365c952b5..0ab2ece3fa63 100644
--- a/dev-lang/erlang/erlang-27.3.4.3.ebuild
+++ b/dev-lang/erlang/erlang-27.3.4.3.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-28.0.2.ebuild b/dev-lang/erlang/erlang-28.0.2.ebuild
index 9cc365c952b5..0ab2ece3fa63 100644
--- a/dev-lang/erlang/erlang-28.0.2.ebuild
+++ b/dev-lang/erlang/erlang-28.0.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-28.0.4.ebuild b/dev-lang/erlang/erlang-28.0.4.ebuild
index 9cc365c952b5..0ab2ece3fa63 100644
--- a/dev-lang/erlang/erlang-28.0.4.ebuild
+++ b/dev-lang/erlang/erlang-28.0.4.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-28.1.ebuild b/dev-lang/erlang/erlang-28.1.ebuild
index 6b3a6f57eebb..6e45807b5f83 100644
--- a/dev-lang/erlang/erlang-28.1.ebuild
+++ b/dev-lang/erlang/erlang-28.1.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/f2c/f2c-20240312.ebuild b/dev-lang/f2c/f2c-20240312.ebuild
index 91cf5f4f3612..0b2526c57447 100644
--- a/dev-lang/f2c/f2c-20240312.ebuild
+++ b/dev-lang/f2c/f2c-20240312.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND=">=dev-libs/libf2c-20130927-r1"
 
diff --git a/dev-lang/gdl/gdl-1.0.4-r2.ebuild b/dev-lang/gdl/gdl-1.0.4-r2.ebuild
index ec071ae2085d..bc403280c73e 100644
--- a/dev-lang/gdl/gdl-1.0.4-r2.ebuild
+++ b/dev-lang/gdl/gdl-1.0.4-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="
 	+eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf
 	openmp png proj postscript python shapelib tiff udunits wxwidgets
diff --git a/dev-lang/gforth/gforth-0.7.3-r2.ebuild b/dev-lang/gforth/gforth-0.7.3-r2.ebuild
index 8d1967124734..787766bd2e9f 100644
--- a/dev-lang/gforth/gforth-0.7.3-r2.ebuild
+++ b/dev-lang/gforth/gforth-0.7.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gforth/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x64-macos"
 IUSE="+check emacs"
 
 DEPEND="dev-libs/ffcall
diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.20.14.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.20.14.ebuild
index 1de686a27655..9cac5f9161d6 100644
--- a/dev-lang/go-bootstrap/go-bootstrap-1.20.14.ebuild
+++ b/dev-lang/go-bootstrap/go-bootstrap-1.20.14.ebuild
@@ -35,7 +35,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="abi_mips_n64 abi_mips_o32 big-endian"
 RESTRICT="strip"
 QA_PREBUILT="*"
diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild
index 828daf7be44f..a59037c92d9f 100644
--- a/dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild
+++ b/dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild
@@ -35,7 +35,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="abi_mips_n64 abi_mips_o32 big-endian"
 RESTRICT="strip"
 QA_PREBUILT="*"
diff --git a/dev-lang/go/go-1.24.10.ebuild b/dev-lang/go/go-1.24.10.ebuild
index a83581377f7f..48d51f271485 100644
--- a/dev-lang/go/go-1.24.10.ebuild
+++ b/dev-lang/go/go-1.24.10.ebuild
@@ -20,7 +20,7 @@ case ${PV}  in
 *)
 	SRC_URI="https://go.dev/dl/go${MY_PV}.src.tar.gz "
 	S="${WORKDIR}"/go
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~x64-macos ~x64-solaris"
 	;;
 esac
 
diff --git a/dev-lang/go/go-1.24.11.ebuild b/dev-lang/go/go-1.24.11.ebuild
index 8cd2ee273c64..8e2a906df106 100644
--- a/dev-lang/go/go-1.24.11.ebuild
+++ b/dev-lang/go/go-1.24.11.ebuild
@@ -20,7 +20,7 @@ case ${PV}  in
 *)
 	SRC_URI="https://go.dev/dl/go${MY_PV}.src.tar.gz "
 	S="${WORKDIR}"/go
-	KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 	;;
 esac
 
diff --git a/dev-lang/go/go-1.24.9.ebuild b/dev-lang/go/go-1.24.9.ebuild
index 3d6ed30afada..cb73b19d0b0e 100644
--- a/dev-lang/go/go-1.24.9.ebuild
+++ b/dev-lang/go/go-1.24.9.ebuild
@@ -20,7 +20,7 @@ case ${PV}  in
 *)
 	SRC_URI="https://go.dev/dl/go${MY_PV}.src.tar.gz "
 	S="${WORKDIR}"/go
-	KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 	;;
 esac
 
diff --git a/dev-lang/go/go-1.25.3.ebuild b/dev-lang/go/go-1.25.3.ebuild
index 4f6f1729fb20..03eaefd08857 100644
--- a/dev-lang/go/go-1.25.3.ebuild
+++ b/dev-lang/go/go-1.25.3.ebuild
@@ -20,7 +20,7 @@ case ${PV}  in
 *)
 	SRC_URI="https://go.dev/dl/go${MY_PV}.src.tar.gz "
 	S="${WORKDIR}"/go
-	KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 	;;
 esac
 
diff --git a/dev-lang/go/go-1.25.4-r1.ebuild b/dev-lang/go/go-1.25.4-r1.ebuild
index 27e0f8a95020..f23e06761b03 100644
--- a/dev-lang/go/go-1.25.4-r1.ebuild
+++ b/dev-lang/go/go-1.25.4-r1.ebuild
@@ -20,7 +20,7 @@ case ${PV}  in
 *)
 	SRC_URI="https://go.dev/dl/go${MY_PV}.src.tar.gz "
 	S="${WORKDIR}"/go
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~x64-macos ~x64-solaris"
 	;;
 esac
 
diff --git a/dev-lang/go/go-1.25.4.ebuild b/dev-lang/go/go-1.25.4.ebuild
index db79fcb9053b..3e98518b4262 100644
--- a/dev-lang/go/go-1.25.4.ebuild
+++ b/dev-lang/go/go-1.25.4.ebuild
@@ -20,7 +20,7 @@ case ${PV}  in
 *)
 	SRC_URI="https://go.dev/dl/go${MY_PV}.src.tar.gz "
 	S="${WORKDIR}"/go
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~x64-macos ~x64-solaris"
 	;;
 esac
 
diff --git a/dev-lang/go/go-1.25.5.ebuild b/dev-lang/go/go-1.25.5.ebuild
index 701187ce2d47..21b21ffb02b9 100644
--- a/dev-lang/go/go-1.25.5.ebuild
+++ b/dev-lang/go/go-1.25.5.ebuild
@@ -20,7 +20,7 @@ case ${PV}  in
 *)
 	SRC_URI="https://go.dev/dl/go${MY_PV}.src.tar.gz "
 	S="${WORKDIR}"/go
-	KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 	;;
 esac
 
diff --git a/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild b/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild
index 8cd8b250de05..e967d17eb639 100644
--- a/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild
+++ b/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="debug doc examples"
 
 PATCHES=(
diff --git a/dev-lang/icon/icon-9.5.22e.ebuild b/dev-lang/icon/icon-9.5.22e.ebuild
index 6489d6d1b5b7..36f62c63d530 100644
--- a/dev-lang/icon/icon-9.5.22e.ebuild
+++ b/dev-lang/icon/icon-9.5.22e.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gtownsend/icon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="X"
 
 S="${WORKDIR}/icon-${PV}"
diff --git a/dev-lang/icon/icon-9.5.24b-r1.ebuild b/dev-lang/icon/icon-9.5.24b-r1.ebuild
index 2e5d25d2b122..3195f22a0fb6 100644
--- a/dev-lang/icon/icon-9.5.24b-r1.ebuild
+++ b/dev-lang/icon/icon-9.5.24b-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/icon-${PV}"
 
 LICENSE="public-domain HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 
 IUSE="X"
 
diff --git a/dev-lang/icon/icon-9.5.24b.ebuild b/dev-lang/icon/icon-9.5.24b.ebuild
index 4ac54ddac7b5..f327afed4215 100644
--- a/dev-lang/icon/icon-9.5.24b.ebuild
+++ b/dev-lang/icon/icon-9.5.24b.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/icon-${PV}"
 
 LICENSE="public-domain HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 
 IUSE="X"
 
diff --git a/dev-lang/inform/inform-6.33.1_p2.ebuild b/dev-lang/inform/inform-6.33.1_p2.ebuild
index 036ef9bc43f0..431506caa2d9 100644
--- a/dev-lang/inform/inform-6.33.1_p2.ebuild
+++ b/dev-lang/inform/inform-6.33.1_p2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic-2 Inform"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="emacs"
 
 PDEPEND="emacs? ( app-emacs/inform-mode )"
diff --git a/dev-lang/inform/inform-6.35_p4.ebuild b/dev-lang/inform/inform-6.35_p4.ebuild
index e12a99fa4a06..6b88611e2856 100644
--- a/dev-lang/inform/inform-6.35_p4.ebuild
+++ b/dev-lang/inform/inform-6.35_p4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic-2 Inform"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="emacs tools"
 # non-interactive tests use ruby, seem broken, and return true even on failure
 RESTRICT="test"
diff --git a/dev-lang/inform/inform-6.42_p4.ebuild b/dev-lang/inform/inform-6.42_p4.ebuild
index 6abf47b172b4..c2056699c876 100644
--- a/dev-lang/inform/inform-6.42_p4.ebuild
+++ b/dev-lang/inform/inform-6.42_p4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic-2 Inform"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="emacs tools"
 # non-interactive tests use ruby, seem broken, and return true even on failure
 RESTRICT="test"
diff --git a/dev-lang/lua/lua-5.1.5-r200.ebuild b/dev-lang/lua/lua-5.1.5-r200.ebuild
index d42646c4fe6f..c2e920d5e7c0 100644
--- a/dev-lang/lua/lua-5.1.5-r200.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r200.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="5.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+deprecated readline"
 
 DEPEND="
diff --git a/dev-lang/lua/lua-5.3.6-r102.ebuild b/dev-lang/lua/lua-5.3.6-r102.ebuild
index fa7e4226c9ea..963b4be068b9 100644
--- a/dev-lang/lua/lua-5.3.6-r102.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r102.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="5.3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+deprecated readline"
 
 DEPEND="
diff --git a/dev-lang/lua/lua-5.4.6.ebuild b/dev-lang/lua/lua-5.4.6.ebuild
index 46d226afec94..02ca755c5576 100644
--- a/dev-lang/lua/lua-5.4.6.ebuild
+++ b/dev-lang/lua/lua-5.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="5.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+deprecated readline"
 
 DEPEND="
diff --git a/dev-lang/lua/lua-5.4.8.ebuild b/dev-lang/lua/lua-5.4.8.ebuild
index 8b3ca1e12234..ca17f8773e15 100644
--- a/dev-lang/lua/lua-5.4.8.ebuild
+++ b/dev-lang/lua/lua-5.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="5.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+deprecated readline"
 
 DEPEND="
diff --git a/dev-lang/luajit/luajit-2.1.1716656478-r1.ebuild b/dev-lang/luajit/luajit-2.1.1716656478-r1.ebuild
index 424e0583af3a..925685418c5d 100644
--- a/dev-lang/luajit/luajit-2.1.1716656478-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1716656478-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2/${PV}"
-KEYWORDS="amd64 arm arm64 -hppa ~mips ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 -hppa ~mips ppc -riscv -sparc x86"
 IUSE="lua52compat static-libs"
 
 _emake() {
diff --git a/dev-lang/luajit/luajit-2.1.1731601260.ebuild b/dev-lang/luajit/luajit-2.1.1731601260.ebuild
index c0764916d352..d6c6f9e1cf69 100644
--- a/dev-lang/luajit/luajit-2.1.1731601260.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1731601260.ebuild
@@ -36,7 +36,7 @@ else
 	SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 
-	KEYWORDS="amd64 arm arm64 -hppa ~mips ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 -hppa ~mips ppc -riscv -sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-lang/luajit/luajit-2.1.9999999999.ebuild b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
index 7face85c3f9b..c4e7857022a6 100644
--- a/dev-lang/luajit/luajit-2.1.9999999999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
@@ -36,7 +36,7 @@ else
 	SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-lang/maude/maude-3.1-r1.ebuild b/dev-lang/maude/maude-3.1-r1.ebuild
index dbc9dab3347c..655aed540a58 100644
--- a/dev-lang/maude/maude-3.1-r1.ebuild
+++ b/dev-lang/maude/maude-3.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-lang/mono/mono-6.12.0.199-r2.ebuild b/dev-lang/mono/mono-6.12.0.199-r2.ebuild
index 68f5b0fe335b..5e0ea73e1ce0 100644
--- a/dev-lang/mono/mono-6.12.0.199-r2.ebuild
+++ b/dev-lang/mono/mono-6.12.0.199-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.mono-project.com/sources/mono/${P}.tar.xz"
 
 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
 IUSE="doc minimal nls pax-kernel selinux xen"
 
 # Note: mono works incorrect with older versions of libgdiplus
diff --git a/dev-lang/mono/mono-6.14.1.ebuild b/dev-lang/mono/mono-6.14.1.ebuild
index 05e6fefab517..ef93d2f8d767 100644
--- a/dev-lang/mono/mono-6.14.1.ebuild
+++ b/dev-lang/mono/mono-6.14.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dl.winehq.org/mono/sources/mono/${P}.tar.xz"
 
 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86"
 IUSE="doc minimal nls pax-kernel selinux xen"
 
 # Note: mono works incorrect with older versions of libgdiplus
diff --git a/dev-lang/mujs/mujs-1.3.6.ebuild b/dev-lang/mujs/mujs-1.3.6.ebuild
index 7a8a88546ba8..66a320fa680a 100644
--- a/dev-lang/mujs/mujs-1.3.6.ebuild
+++ b/dev-lang/mujs/mujs-1.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.gz"
 LICENSE="ISC"
 # The subslot matches the SONAME
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="sys-libs/readline:="
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/mujs/mujs-1.3.7-r1.ebuild b/dev-lang/mujs/mujs-1.3.7-r1.ebuild
index 16c95e510c32..42e92f4d053b 100644
--- a/dev-lang/mujs/mujs-1.3.7-r1.ebuild
+++ b/dev-lang/mujs/mujs-1.3.7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="ISC"
 # The subslot matches the SONAME
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="${PYTHON_DEPS}"
 RDEPEND="sys-libs/readline:="
diff --git a/dev-lang/nasm/nasm-2.16.03.ebuild b/dev-lang/nasm/nasm-2.16.03.ebuild
index 2543c5ac05d2..e9685fd52d8a 100644
--- a/dev-lang/nasm/nasm-2.16.03.ebuild
+++ b/dev-lang/nasm/nasm-2.16.03.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 IUSE="doc"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/dev-lang/nasm/nasm-3.01.ebuild b/dev-lang/nasm/nasm-3.01.ebuild
index 0cf132cacfdc..7ff1e5c14437 100644
--- a/dev-lang/nasm/nasm-3.01.ebuild
+++ b/dev-lang/nasm/nasm-3.01.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${P/_}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 IUSE="doc"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/dev-lang/ocaml/ocaml-4.14.2.ebuild b/dev-lang/ocaml/ocaml-4.14.2.ebuild
index cd894a8d8496..a2a03a92718c 100644
--- a/dev-lang/ocaml/ocaml-4.14.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="emacs flambda latex +ocamlopt xemacs"
 
 RDEPEND="sys-libs/binutils-libs:="
diff --git a/dev-lang/ocaml/ocaml-5.3.0-r1.ebuild b/dev-lang/ocaml/ocaml-5.3.0-r1.ebuild
index 824fb8b51fc3..6ce667255b23 100644
--- a/dev-lang/ocaml/ocaml-5.3.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-5.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="emacs flambda latex +ocamlopt test xemacs"
 
 RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/ocaml/ocaml-5.4.0.ebuild b/dev-lang/ocaml/ocaml-5.4.0.ebuild
index 2efc40a811da..21c1d1427e13 100644
--- a/dev-lang/ocaml/ocaml-5.4.0.ebuild
+++ b/dev-lang/ocaml/ocaml-5.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="emacs flambda latex +ocamlopt test xemacs"
 
 RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/orc/orc-0.4.38.ebuild b/dev-lang/orc/orc-0.4.38.ebuild
index e9e65d4e1056..a5f25355aeaa 100644
--- a/dev-lang/orc/orc-0.4.38.ebuild
+++ b/dev-lang/orc/orc-0.4.38.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-lang/orc/orc-0.4.40-r1.ebuild b/dev-lang/orc/orc-0.4.40-r1.ebuild
index 26da7d0a1218..3bc7c8e7d20b 100644
--- a/dev-lang/orc/orc-0.4.40-r1.ebuild
+++ b/dev-lang/orc/orc-0.4.40-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-lang/orc/orc-0.4.40.ebuild b/dev-lang/orc/orc-0.4.40.ebuild
index c3cb3cb71f28..5a8d8561d71f 100644
--- a/dev-lang/orc/orc-0.4.40.ebuild
+++ b/dev-lang/orc/orc-0.4.40.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-lang/orc/orc-0.4.41.ebuild b/dev-lang/orc/orc-0.4.41.ebuild
index 75270cfccb36..4f5670b65a3e 100644
--- a/dev-lang/orc/orc-0.4.41.ebuild
+++ b/dev-lang/orc/orc-0.4.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-lang/parrot/parrot-8.1.0-r4.ebuild b/dev-lang/parrot/parrot-8.1.0-r4.ebuild
index 894b83f6c162..8ba6be08f28b 100644
--- a/dev-lang/parrot/parrot-8.1.0-r4.ebuild
+++ b/dev-lang/parrot/parrot-8.1.0-r4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.parrot.org/releases/all/${PV}/${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
 
 # weird failures
diff --git a/dev-lang/perl/perl-5.40.0-r1.ebuild b/dev-lang/perl/perl-5.40.0-r1.ebuild
index 94a528988297..2b4c76bb9def 100644
--- a/dev-lang/perl/perl-5.40.0-r1.ebuild
+++ b/dev-lang/perl/perl-5.40.0-r1.ebuild
@@ -55,7 +55,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath"
diff --git a/dev-lang/perl/perl-5.40.1.ebuild b/dev-lang/perl/perl-5.40.1.ebuild
index d7b16ee630cc..a5eba21c6abb 100644
--- a/dev-lang/perl/perl-5.40.1.ebuild
+++ b/dev-lang/perl/perl-5.40.1.ebuild
@@ -55,7 +55,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath"
diff --git a/dev-lang/perl/perl-5.40.2.ebuild b/dev-lang/perl/perl-5.40.2.ebuild
index 0c484ff0044e..b54c9b487edc 100644
--- a/dev-lang/perl/perl-5.40.2.ebuild
+++ b/dev-lang/perl/perl-5.40.2.ebuild
@@ -55,7 +55,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath"
diff --git a/dev-lang/perl/perl-5.42.0-r1.ebuild b/dev-lang/perl/perl-5.42.0-r1.ebuild
index 85d99ef26131..445607f07449 100644
--- a/dev-lang/perl/perl-5.42.0-r1.ebuild
+++ b/dev-lang/perl/perl-5.42.0-r1.ebuild
@@ -55,7 +55,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath"
diff --git a/dev-lang/perl/perl-5.42.0.ebuild b/dev-lang/perl/perl-5.42.0.ebuild
index 3e61b864df8b..2bd1cb3cf5ee 100644
--- a/dev-lang/perl/perl-5.42.0.ebuild
+++ b/dev-lang/perl/perl-5.42.0.ebuild
@@ -55,7 +55,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath"
diff --git a/dev-lang/php/php-8.2.29.ebuild b/dev-lang/php/php-8.2.29.ebuild
index bec5e997683b..837a19afc136 100644
--- a/dev-lang/php/php-8.2.29.ebuild
+++ b/dev-lang/php/php-8.2.29.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-8.3.26.ebuild b/dev-lang/php/php-8.3.26.ebuild
index 177d40813ebf..7c76f85eda65 100644
--- a/dev-lang/php/php-8.3.26.ebuild
+++ b/dev-lang/php/php-8.3.26.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-8.3.28-r1.ebuild b/dev-lang/php/php-8.3.28-r1.ebuild
index 783e19a9aa0b..08cb7a9af531 100644
--- a/dev-lang/php/php-8.3.28-r1.ebuild
+++ b/dev-lang/php/php-8.3.28-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-8.4.15-r1.ebuild b/dev-lang/php/php-8.4.15-r1.ebuild
index 14ced26200e9..b8d4d836df6f 100644
--- a/dev-lang/php/php-8.4.15-r1.ebuild
+++ b/dev-lang/php/php-8.4.15-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-8.5.0-r1.ebuild b/dev-lang/php/php-8.5.0-r1.ebuild
index 5bfc225ae78d..d6b7d3f85cb6 100644
--- a/dev-lang/php/php-8.5.0-r1.ebuild
+++ b/dev-lang/php/php-8.5.0-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/pypy/pypy-2.7.7.3.20.ebuild b/dev-lang/pypy/pypy-2.7.7.3.20.ebuild
index ae0295f37ce5..0d0c3393acb6 100644
--- a/dev-lang/pypy/pypy-2.7.7.3.20.ebuild
+++ b/dev-lang/pypy/pypy-2.7.7.3.20.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="${PYVER}/73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
 RESTRICT="test"
 
diff --git a/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.20.ebuild b/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.20.ebuild
index a2c9e6fc95cc..ac2825ed1f56 100644
--- a/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.20.ebuild
+++ b/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.20.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND="
diff --git a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
index 5506f587461b..f5097e76d720 100644
--- a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
+++ b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
 
diff --git a/dev-lang/python-exec/python-exec-2.4.10.ebuild b/dev-lang/python-exec/python-exec-2.4.10.ebuild
index e39d80738875..a9327f8a18a1 100644
--- a/dev-lang/python-exec/python-exec-2.4.10.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/projg2/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test"
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/ruby/ruby-3.2.7.ebuild b/dev-lang/ruby/ruby-3.2.7.ebuild
index 01241122a5e0..c57e20c830b3 100644
--- a/dev-lang/ruby/ruby-3.2.7.ebuild
+++ b/dev-lang/ruby/ruby-3.2.7.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.2.8.ebuild b/dev-lang/ruby/ruby-3.2.8.ebuild
index 4ea0f13d6f49..082e8516e147 100644
--- a/dev-lang/ruby/ruby-3.2.8.ebuild
+++ b/dev-lang/ruby/ruby-3.2.8.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.2.9-r1.ebuild b/dev-lang/ruby/ruby-3.2.9-r1.ebuild
index 1e2e71e01bb7..1f00571cb50d 100644
--- a/dev-lang/ruby/ruby-3.2.9-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.2.9-r1.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.2.9.ebuild b/dev-lang/ruby/ruby-3.2.9.ebuild
index f444f1b235d3..f582e0cc6d04 100644
--- a/dev-lang/ruby/ruby-3.2.9.ebuild
+++ b/dev-lang/ruby/ruby-3.2.9.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.3.10-r1.ebuild b/dev-lang/ruby/ruby-3.3.10-r1.ebuild
index f324894fffc6..3a1e8e759e94 100644
--- a/dev-lang/ruby/ruby-3.3.10-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.3.10-r1.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.3.10.ebuild b/dev-lang/ruby/ruby-3.3.10.ebuild
index d97a324684c0..a7591e7b356a 100644
--- a/dev-lang/ruby/ruby-3.3.10.ebuild
+++ b/dev-lang/ruby/ruby-3.3.10.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.3.8.ebuild b/dev-lang/ruby/ruby-3.3.8.ebuild
index 0359aa478e0c..0d3b0fa5c167 100644
--- a/dev-lang/ruby/ruby-3.3.8.ebuild
+++ b/dev-lang/ruby/ruby-3.3.8.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.3.9.ebuild b/dev-lang/ruby/ruby-3.3.9.ebuild
index e3f22f9bba49..138e1286a022 100644
--- a/dev-lang/ruby/ruby-3.3.9.ebuild
+++ b/dev-lang/ruby/ruby-3.3.9.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.4.6.ebuild b/dev-lang/ruby/ruby-3.4.6.ebuild
index 363051469b4d..73a9ac154fb6 100644
--- a/dev-lang/ruby/ruby-3.4.6.ebuild
+++ b/dev-lang/ruby/ruby-3.4.6.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.4.7-r1.ebuild b/dev-lang/ruby/ruby-3.4.7-r1.ebuild
index 59425f37fff9..70e933459bb4 100644
--- a/dev-lang/ruby/ruby-3.4.7-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.4.7-r1.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.4.8.ebuild b/dev-lang/ruby/ruby-3.4.8.ebuild
index 59425f37fff9..70e933459bb4 100644
--- a/dev-lang/ruby/ruby-3.4.8.ebuild
+++ b/dev-lang/ruby/ruby-3.4.8.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/sassc/sassc-3.6.2.ebuild b/dev-lang/sassc/sassc-3.6.2.ebuild
index 9d5e637ad682..4ee8460c8e9e 100644
--- a/dev-lang/sassc/sassc-3.6.2.ebuild
+++ b/dev-lang/sassc/sassc-3.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND=">=dev-libs/libsass-3.6.5:="
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/swi-prolog/swi-prolog-9.3.25.ebuild b/dev-lang/swi-prolog/swi-prolog-9.3.25.ebuild
index 6e01ad4d71c2..abfea67387f9 100644
--- a/dev-lang/swi-prolog/swi-prolog-9.3.25.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-9.3.25.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://www.swi-prolog.org/download/devel/src/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-lang/swig/swig-4.1.1-r1.ebuild b/dev-lang/swig/swig-4.1.1-r1.ebuild
index bbf63afef7b5..6005fe897744 100644
--- a/dev-lang/swig/swig-4.1.1-r1.ebuild
+++ b/dev-lang/swig/swig-4.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="ccache doc pcre test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/swig/swig-4.2.1.ebuild b/dev-lang/swig/swig-4.2.1.ebuild
index 4afaae967f27..63d49485b5cc 100644
--- a/dev-lang/swig/swig-4.2.1.ebuild
+++ b/dev-lang/swig/swig-4.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="ccache doc pcre test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/swig/swig-4.3.1.ebuild b/dev-lang/swig/swig-4.3.1.ebuild
index 3869378b9a8d..2d4985d3b87c 100644
--- a/dev-lang/swig/swig-4.3.1.ebuild
+++ b/dev-lang/swig/swig-4.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="ccache doc pcre test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/tcc/tcc-0.9.27_p20211022.ebuild b/dev-lang/tcc/tcc-0.9.27_p20211022.ebuild
index c26113ad0aff..7c01677a55d2 100644
--- a/dev-lang/tcc/tcc-0.9.27_p20211022.ebuild
+++ b/dev-lang/tcc/tcc-0.9.27_p20211022.ebuild
@@ -22,7 +22,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 BDEPEND="dev-lang/perl" # doc generation
diff --git a/dev-lang/tcc/tcc-0.9.27_p20230223.ebuild b/dev-lang/tcc/tcc-0.9.27_p20230223.ebuild
index 700abda72d4c..b8ab7618db02 100644
--- a/dev-lang/tcc/tcc-0.9.27_p20230223.ebuild
+++ b/dev-lang/tcc/tcc-0.9.27_p20230223.ebuild
@@ -22,7 +22,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 BDEPEND="dev-lang/perl" # doc generation
diff --git a/dev-lang/tcc/tcc-0.9.27_p20250608.ebuild b/dev-lang/tcc/tcc-0.9.27_p20250608.ebuild
index 5f1234609d7b..84772838751b 100644
--- a/dev-lang/tcc/tcc-0.9.27_p20250608.ebuild
+++ b/dev-lang/tcc/tcc-0.9.27_p20250608.ebuild
@@ -22,7 +22,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 BDEPEND="dev-lang/perl" # doc generation
diff --git a/dev-lang/tcc/tcc-9999.ebuild b/dev-lang/tcc/tcc-9999.ebuild
index c9e9a83a18e4..d1d3f59d1237 100644
--- a/dev-lang/tcc/tcc-9999.ebuild
+++ b/dev-lang/tcc/tcc-9999.ebuild
@@ -22,7 +22,7 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 BDEPEND="dev-lang/perl" # doc generation
diff --git a/dev-lang/tcl/tcl-8.6.13-r1.ebuild b/dev-lang/tcl/tcl-8.6.13-r1.ebuild
index bb4bd4bee15d..ebe525b85d54 100644
--- a/dev-lang/tcl/tcl-8.6.13-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.6.13-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk Spencer-99"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=virtual/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.14.ebuild b/dev-lang/tcl/tcl-8.6.14.ebuild
index 143d0b47fc97..8718582df35f 100644
--- a/dev-lang/tcl/tcl-8.6.14.ebuild
+++ b/dev-lang/tcl/tcl-8.6.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk Spencer-99"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=virtual/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.15.ebuild b/dev-lang/tcl/tcl-8.6.15.ebuild
index 29949fc49bac..dabb62d11cd0 100644
--- a/dev-lang/tcl/tcl-8.6.15.ebuild
+++ b/dev-lang/tcl/tcl-8.6.15.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk Spencer-99"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=virtual/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.16.ebuild b/dev-lang/tcl/tcl-8.6.16.ebuild
index 29949fc49bac..dabb62d11cd0 100644
--- a/dev-lang/tcl/tcl-8.6.16.ebuild
+++ b/dev-lang/tcl/tcl-8.6.16.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk Spencer-99"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=virtual/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.17.ebuild b/dev-lang/tcl/tcl-8.6.17.ebuild
index c9c7c6877aeb..a488a256fa64 100644
--- a/dev-lang/tcl/tcl-8.6.17.ebuild
+++ b/dev-lang/tcl/tcl-8.6.17.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk Spencer-99"
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=virtual/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tk/tk-8.6.13.ebuild b/dev-lang/tk/tk-8.6.13.ebuild
index 6a70a409064b..8ab91692801b 100644
--- a/dev-lang/tk/tk-8.6.13.ebuild
+++ b/dev-lang/tk/tk-8.6.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/tk/tk-8.6.14.ebuild b/dev-lang/tk/tk-8.6.14.ebuild
index e31d4dfd0f75..0cd0e4ec72de 100644
--- a/dev-lang/tk/tk-8.6.14.ebuild
+++ b/dev-lang/tk/tk-8.6.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/tk/tk-8.6.15.ebuild b/dev-lang/tk/tk-8.6.15.ebuild
index ae97a8637844..b82fa1696148 100644
--- a/dev-lang/tk/tk-8.6.15.ebuild
+++ b/dev-lang/tk/tk-8.6.15.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/tk/tk-8.6.16.ebuild b/dev-lang/tk/tk-8.6.16.ebuild
index 8abd9d129c02..c793ae7bd107 100644
--- a/dev-lang/tk/tk-8.6.16.ebuild
+++ b/dev-lang/tk/tk-8.6.16.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/tk/tk-8.6.17.ebuild b/dev-lang/tk/tk-8.6.17.ebuild
index 2823b2d8d9f2..c3948cb5829c 100644
--- a/dev-lang/tk/tk-8.6.17.ebuild
+++ b/dev-lang/tk/tk-8.6.17.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.56.16.ebuild b/dev-lang/vala/vala-0.56.16.ebuild
index 8bb8b75a3419..10a5ddc1eff2 100644
--- a/dev-lang/vala/vala-0.56.16.ebuild
+++ b/dev-lang/vala/vala-0.56.16.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://vala.dev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.56"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.56.17.ebuild b/dev-lang/vala/vala-0.56.17.ebuild
index 8bb8b75a3419..10a5ddc1eff2 100644
--- a/dev-lang/vala/vala-0.56.17.ebuild
+++ b/dev-lang/vala/vala-0.56.17.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://vala.dev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.56"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.56.18.ebuild b/dev-lang/vala/vala-0.56.18.ebuild
index 8bb8b75a3419..10a5ddc1eff2 100644
--- a/dev-lang/vala/vala-0.56.18.ebuild
+++ b/dev-lang/vala/vala-0.56.18.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://vala.dev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.56"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/yasm/yasm-1.3.0-r2.ebuild b/dev-lang/yasm/yasm-1.3.0-r2.ebuild
index f489f09a68af..ba1e52472a17 100644
--- a/dev-lang/yasm/yasm-1.3.0-r2.ebuild
+++ b/dev-lang/yasm/yasm-1.3.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild
index 62c9bc7f471a..8b8073d6c45a 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.3.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.3.ebuild
index 61368a7f2ff0..702c8a5fe379 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.8.3.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gtk-doc fonts +introspection"
 
 RDEPEND="
diff --git a/dev-libs/apr-util/apr-util-1.6.3.ebuild b/dev-libs/apr-util/apr-util-1.6.3.ebuild
index d0c098f18bb2..6b57237e7266 100644
--- a/dev-libs/apr-util/apr-util-1.6.3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 
 RDEPEND="
diff --git a/dev-libs/apr/apr-1.7.4-r2.ebuild b/dev-libs/apr/apr-1.7.4-r2.ebuild
index da2269f67740..3ddf1c0abeda 100644
--- a/dev-libs/apr/apr-1.7.4-r2.ebuild
+++ b/dev-libs/apr/apr-1.7.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency
diff --git a/dev-libs/apr/apr-1.7.4-r3.ebuild b/dev-libs/apr/apr-1.7.4-r3.ebuild
index 81ebe5f61e31..9b9068058cff 100644
--- a/dev-libs/apr/apr-1.7.4-r3.ebuild
+++ b/dev-libs/apr/apr-1.7.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency
diff --git a/dev-libs/apr/apr-1.7.5.ebuild b/dev-libs/apr/apr-1.7.5.ebuild
index 123acf73b8cc..e67877a3a9e5 100644
--- a/dev-libs/apr/apr-1.7.5.ebuild
+++ b/dev-libs/apr/apr-1.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency
diff --git a/dev-libs/apr/apr-1.7.6.ebuild b/dev-libs/apr/apr-1.7.6.ebuild
index 60ce4567ca7f..8abfbfeaa32f 100644
--- a/dev-libs/apr/apr-1.7.6.ebuild
+++ b/dev-libs/apr/apr-1.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency
diff --git a/dev-libs/atk/atk-2.38.0.ebuild b/dev-libs/atk/atk-2.38.0.ebuild
index 0f252b582def..eb3b2e7a4dcc 100644
--- a/dev-libs/atk/atk-2.38.0.ebuild
+++ b/dev-libs/atk/atk-2.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/atk/atk-2.46.0.ebuild b/dev-libs/atk/atk-2.46.0.ebuild
index 073e93838ffa..3f5cfad420ac 100644
--- a/dev-libs/atk/atk-2.46.0.ebuild
+++ b/dev-libs/atk/atk-2.46.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+introspection"
 
 DEPEND=""
diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.10-r1.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.10-r1.ebuild
index d3b1a772171c..4773d907bfc9 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.2.10-r1.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.2.10-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="boehm-gc"
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
 # Don't keyword versions if upstream mark them as pre-release.
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="cxx +large static-libs +threads"
 
 RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.10.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.10.ebuild
index c86aa899778c..8ef2abd30140 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.2.10.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.2.10.ebuild
@@ -17,7 +17,7 @@ LICENSE="boehm-gc"
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
 # Don't keyword versions if upstream mark them as pre-release.
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="cxx +large static-libs +threads"
 
 RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild
index 02eded05b0c9..cd56aac085d8 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild
@@ -17,7 +17,7 @@ LICENSE="boehm-gc"
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
 # Don't keyword versions if upstream mark them as pre-release.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="cxx +large static-libs +threads"
 
 RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/boost/boost-1.88.0-r1.ebuild b/dev-libs/boost/boost-1.88.0-r1.ebuild
index 4dd2f963a735..c31c024d9316 100644
--- a/dev-libs/boost/boost-1.88.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.88.0-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 +context debug doc icu lzma +nls mpi numpy python +stacktrace test test-full tools zlib zstd"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/c-blosc/c-blosc-1.21.6-r1.ebuild b/dev-libs/c-blosc/c-blosc-1.21.6-r1.ebuild
index b929e459cc3a..646117ffc726 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.6-r1.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.6-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/c-blosc2/c-blosc2-2.21.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.21.2.ebuild
index 8b5cdd6754e8..20e3b9cb8abb 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.21.2.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.21.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test +zlib +zstd"
 REQUIRED_USE="test? ( zlib zstd )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/c-blosc2/c-blosc2-2.21.3.ebuild b/dev-libs/c-blosc2/c-blosc2-2.21.3.ebuild
index 8b5cdd6754e8..20e3b9cb8abb 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.21.3.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.21.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test +zlib +zstd"
 REQUIRED_USE="test? ( zlib zstd )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/c-blosc2/c-blosc2-2.22.0.ebuild b/dev-libs/c-blosc2/c-blosc2-2.22.0.ebuild
index a9093f09c3d3..6695d1df3d12 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.22.0.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.22.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test +zlib +zstd"
 REQUIRED_USE="test? ( zlib zstd )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/cdk/cdk-5.0.20230201-r2.ebuild b/dev-libs/cdk/cdk-5.0.20230201-r2.ebuild
index 6710a8369c8a..5256d77f6b28 100644
--- a/dev-libs/cdk/cdk-5.0.20230201-r2.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20230201-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/6.3.4" # subslot = soname version, check VERSION
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-libs/cdk/cdk-5.0.20230201.ebuild b/dev-libs/cdk/cdk-5.0.20230201.ebuild
index 05ac743efbdf..b2886303b843 100644
--- a/dev-libs/cdk/cdk-5.0.20230201.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20230201.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/6.3.4" # subslot = soname version, check VERSION
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-libs/cdk/cdk-5.0.20240331-r1.ebuild b/dev-libs/cdk/cdk-5.0.20240331-r1.ebuild
index 3a1b672a6ddc..c449d58545a7 100644
--- a/dev-libs/cdk/cdk-5.0.20240331-r1.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20240331-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/6.3.4" # subslot = soname version, check VERSION
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-libs/cdk/cdk-5.0.20240619-r2.ebuild b/dev-libs/cdk/cdk-5.0.20240619-r2.ebuild
index a7ad13f804f8..ecc62e3868c3 100644
--- a/dev-libs/cdk/cdk-5.0.20240619-r2.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20240619-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/6.3.4" # subslot = soname version, check VERSION
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-libs/cdk/cdk-5.0.20250116-r1.ebuild b/dev-libs/cdk/cdk-5.0.20250116-r1.ebuild
index e47fe399ca4b..82087b66b0c4 100644
--- a/dev-libs/cdk/cdk-5.0.20250116-r1.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20250116-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/6.3.5" # subslot = soname version, check VERSION
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-libs/cdk/cdk-5.0.20251014.ebuild b/dev-libs/cdk/cdk-5.0.20251014.ebuild
index cca70d2b1d78..af04bab75e99 100644
--- a/dev-libs/cdk/cdk-5.0.20251014.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20251014.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT GPL-3"
 SLOT="0/6.3.5" # subslot = soname version, check VERSION
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-libs/check/check-0.15.2-r2.ebuild b/dev-libs/check/check-0.15.2-r2.ebuild
index ae817e48610b..a846267bd98c 100644
--- a/dev-libs/check/check-0.15.2-r2.ebuild
+++ b/dev-libs/check/check-0.15.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc subunit test"
 
 # Tests seem to timeout on ppc* systems, #736661
diff --git a/dev-libs/confuse/confuse-3.3-r3.ebuild b/dev-libs/confuse/confuse-3.3-r3.ebuild
index 818e1198026c..c10defc78f9a 100644
--- a/dev-libs/confuse/confuse-3.3-r3.ebuild
+++ b/dev-libs/confuse/confuse-3.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libconfuse/libconfuse/releases/download/v${PV}/${P}.
 
 LICENSE="ISC"
 SLOT="0/2.1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/cudnn/cudnn-8.6.0.163.ebuild b/dev-libs/cudnn/cudnn-8.6.0.163.ebuild
index 318215eb1de8..2dc70ea45191 100644
--- a/dev-libs/cudnn/cudnn-8.6.0.163.ebuild
+++ b/dev-libs/cudnn/cudnn-8.6.0.163.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/cudnn-linux-x86_64-${PV}_cuda${CUDA_MA}-archive"
 
 LICENSE="NVIDIA-cuDNN"
 SLOT="0/8"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="~amd64"
 RESTRICT="mirror"
 
 RDEPEND="=dev-util/nvidia-cuda-toolkit-11*"
diff --git a/dev-libs/cudnn/cudnn-8.8.0.121.ebuild b/dev-libs/cudnn/cudnn-8.8.0.121.ebuild
index 8cd14f1c16a4..899c89ace6cb 100644
--- a/dev-libs/cudnn/cudnn-8.8.0.121.ebuild
+++ b/dev-libs/cudnn/cudnn-8.8.0.121.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/cudnn-linux-x86_64-${PV}_cuda${CUDA_MA}-archive"
 
 LICENSE="NVIDIA-cuDNN"
 SLOT="0/8"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="~amd64"
 RESTRICT="mirror"
 
 RDEPEND="=dev-util/nvidia-cuda-toolkit-12*"
diff --git a/dev-libs/cudnn/cudnn-8.9.7.29.ebuild b/dev-libs/cudnn/cudnn-8.9.7.29.ebuild
index a926d5d9dab3..9fa2b49241f0 100644
--- a/dev-libs/cudnn/cudnn-8.9.7.29.ebuild
+++ b/dev-libs/cudnn/cudnn-8.9.7.29.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-cuDNN"
 SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~arm64-linux"
+KEYWORDS="~amd64 ~arm64"
 RESTRICT="bindist test"
 
 RDEPEND="
diff --git a/dev-libs/cudnn/cudnn-9.8.0.87.ebuild b/dev-libs/cudnn/cudnn-9.8.0.87.ebuild
index a926d5d9dab3..9fa2b49241f0 100644
--- a/dev-libs/cudnn/cudnn-9.8.0.87.ebuild
+++ b/dev-libs/cudnn/cudnn-9.8.0.87.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-cuDNN"
 SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~arm64-linux"
+KEYWORDS="~amd64 ~arm64"
 RESTRICT="bindist test"
 
 RDEPEND="
diff --git a/dev-libs/cusparselt/cusparselt-0.7.1.0.ebuild b/dev-libs/cusparselt/cusparselt-0.7.1.0.ebuild
index 6ae6d3c2c939..23ee44bde05c 100644
--- a/dev-libs/cusparselt/cusparselt-0.7.1.0.ebuild
+++ b/dev-libs/cusparselt/cusparselt-0.7.1.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-SDK-v2020.10.12 NVIDIA-cuSPARSELt-v2020.10.12"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~arm64-linux"
+KEYWORDS="~amd64 ~arm64"
 RESTRICT="bindist mirror test"
 
 QA_PREBUILT="/opt/cuda*/targets/*-linux/lib/*"
diff --git a/dev-libs/cvector/cvector-1.0.3.1.ebuild b/dev-libs/cvector/cvector-1.0.3.1.ebuild
index db39343b5a49..ae9acdeda62c 100644
--- a/dev-libs/cvector/cvector-1.0.3.1.ebuild
+++ b/dev-libs/cvector/cvector-1.0.3.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-LDFLAGS.patch
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild
index ff150a68cf2a..556b79f2dd20 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~grobian/distfiles/${MY_PATCH_VER}.tar.xz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 REQUIRED_USE="ldapdb? ( openldap )"
 
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild
index c136211d9316..603972f06782 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~grobian/distfiles/${MY_PATCH_VER}.tar.xz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 REQUIRED_USE="ldapdb? ( openldap )"
 
diff --git a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
index db24860dd6d6..9b90809c7188 100644
--- a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
+++ b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 BDEPEND=""
diff --git a/dev-libs/dbus-glib/dbus-glib-0.114.ebuild b/dev-libs/dbus-glib/dbus-glib-0.114.ebuild
index 7eeb0cd25d0d..7c103b5de50c 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.114.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.114.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/dietlibc/dietlibc-0.34.ebuild b/dev-libs/dietlibc/dietlibc-0.34.ebuild
index 2943e05ab1be..b74a3a7ca52c 100644
--- a/dev-libs/dietlibc/dietlibc-0.34.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fefe.de/dietlibc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~mips ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~mips ~sparc x86"
 IUSE=""
 
 DEPEND=">=sys-devel/binutils-2.31.1-r4"
diff --git a/dev-libs/dietlibc/dietlibc-0.35.ebuild b/dev-libs/dietlibc/dietlibc-0.35.ebuild
index e7912b0c2959..473f5fd61de8 100644
--- a/dev-libs/dietlibc/dietlibc-0.35.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~sparc ~x86"
 
 DEPEND=">=sys-devel/binutils-2.31.1-r4"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-fefe )"
diff --git a/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild
index 2c1808bdc6bf..cd4278849752 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/SSSD/ding-libs/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/dotconf/dotconf-1.4.1.ebuild b/dev-libs/dotconf/dotconf-1.4.1.ebuild
index 13e745d3cb5e..16740a06e330 100644
--- a/dev-libs/dotconf/dotconf-1.4.1.ebuild
+++ b/dev-libs/dotconf/dotconf-1.4.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/williamh/dotconf.git"
 else
 	SRC_URI="https://github.com/williamh/dotconf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/dotconf/dotconf-9999.ebuild b/dev-libs/dotconf/dotconf-9999.ebuild
index b9e9dd68f11d..65ff2898aeb6 100644
--- a/dev-libs/dotconf/dotconf-9999.ebuild
+++ b/dev-libs/dotconf/dotconf-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/williamh/dotconf.git"
 else
 	SRC_URI="https://github.com/williamh/dotconf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/double-conversion/double-conversion-3.3.1.ebuild b/dev-libs/double-conversion/double-conversion-3.3.1.ebuild
index 406ecd4017cf..795efa9e7b72 100644
--- a/dev-libs/double-conversion/double-conversion-3.3.1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/double-conversion/double-conversion-3.4.0.ebuild b/dev-libs/double-conversion/double-conversion-3.4.0.ebuild
index 7065e3781abe..c5b801b9347c 100644
--- a/dev-libs/double-conversion/double-conversion-3.4.0.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/elfutils/elfutils-0.193-r1.ebuild b/dev-libs/elfutils/elfutils-0.193-r1.ebuild
index 67312849c8dc..af128279f7b6 100644
--- a/dev-libs/elfutils/elfutils-0.193-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.193-r1.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )"
 fi
diff --git a/dev-libs/elfutils/elfutils-0.194.ebuild b/dev-libs/elfutils/elfutils-0.194.ebuild
index 91998fe8b015..6f34b7612896 100644
--- a/dev-libs/elfutils/elfutils-0.194.ebuild
+++ b/dev-libs/elfutils/elfutils-0.194.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )"
 fi
diff --git a/dev-libs/elfutils/elfutils-9999.ebuild b/dev-libs/elfutils/elfutils-9999.ebuild
index fe6a1fad191f..1aa4e2bbb7d5 100644
--- a/dev-libs/elfutils/elfutils-9999.ebuild
+++ b/dev-libs/elfutils/elfutils-9999.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )"
 fi
diff --git a/dev-libs/expat/expat-2.6.3.ebuild b/dev-libs/expat/expat-2.6.3.ebuild
index f31c6a3da25c..167e8b0a4a92 100644
--- a/dev-libs/expat/expat-2.6.3.ebuild
+++ b/dev-libs/expat/expat-2.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples static-libs test unicode"
 RESTRICT="!test? ( test )"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/expat/expat-2.6.4.ebuild b/dev-libs/expat/expat-2.6.4.ebuild
index f31c6a3da25c..167e8b0a4a92 100644
--- a/dev-libs/expat/expat-2.6.4.ebuild
+++ b/dev-libs/expat/expat-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples static-libs test unicode"
 RESTRICT="!test? ( test )"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/expat/expat-2.7.0.ebuild b/dev-libs/expat/expat-2.7.0.ebuild
index f31c6a3da25c..167e8b0a4a92 100644
--- a/dev-libs/expat/expat-2.7.0.ebuild
+++ b/dev-libs/expat/expat-2.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples static-libs test unicode"
 RESTRICT="!test? ( test )"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/expat/expat-2.7.1.ebuild b/dev-libs/expat/expat-2.7.1.ebuild
index f31c6a3da25c..167e8b0a4a92 100644
--- a/dev-libs/expat/expat-2.7.1.ebuild
+++ b/dev-libs/expat/expat-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples static-libs test unicode"
 RESTRICT="!test? ( test )"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/expat/expat-2.7.2.ebuild b/dev-libs/expat/expat-2.7.2.ebuild
index 2329f0c2e768..7c2d7fa15708 100644
--- a/dev-libs/expat/expat-2.7.2.ebuild
+++ b/dev-libs/expat/expat-2.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples static-libs test unicode"
 RESTRICT="!test? ( test )"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/expat/expat-2.7.3.ebuild b/dev-libs/expat/expat-2.7.3.ebuild
index f31c6a3da25c..167e8b0a4a92 100644
--- a/dev-libs/expat/expat-2.7.3.ebuild
+++ b/dev-libs/expat/expat-2.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples static-libs test unicode"
 RESTRICT="!test? ( test )"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index c96dbe16836e..c72df83d9bca 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-$(ver_cut 1-3)-SNAP-$(ver_cut 5).tar.g
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="html"
 
 S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249"
diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild
index cf5e9372e48a..6d872bb4c5bc 100644
--- a/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild
+++ b/dev-libs/ferrisloki/ferrisloki-3.0.13-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/witme/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND=">=dev-libs/libsigc++-2.6:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/ffcall/ffcall-2.4-r1.ebuild b/dev-libs/ffcall/ffcall-2.4-r1.ebuild
index b8752ac5ea26..af58c1ae84ad 100644
--- a/dev-libs/ffcall/ffcall-2.4-r1.ebuild
+++ b/dev-libs/ffcall/ffcall-2.4-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=(
 	# bug 842915, drop on next version bump
diff --git a/dev-libs/ffcall/ffcall-2.4-r2.ebuild b/dev-libs/ffcall/ffcall-2.4-r2.ebuild
index c218057950bb..819261d68f2b 100644
--- a/dev-libs/ffcall/ffcall-2.4-r2.ebuild
+++ b/dev-libs/ffcall/ffcall-2.4-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 PATCHES=(
 	# bug 842915, drop on next version bump
diff --git a/dev-libs/ffcall/ffcall-2.4.ebuild b/dev-libs/ffcall/ffcall-2.4.ebuild
index 4559eb3c600c..b9a9f3429cd1 100644
--- a/dev-libs/ffcall/ffcall-2.4.ebuild
+++ b/dev-libs/ffcall/ffcall-2.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=(
 	# bug 842915, drop on next version bump
diff --git a/dev-libs/ffcall/ffcall-2.5.ebuild b/dev-libs/ffcall/ffcall-2.5.ebuild
index eedd5f940fae..13a914561627 100644
--- a/dev-libs/ffcall/ffcall-2.5.ebuild
+++ b/dev-libs/ffcall/ffcall-2.5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 src_prepare() {
 	# The build system is a strange mix of autogenerated
diff --git a/dev-libs/folks/folks-0.15.9-r1.ebuild b/dev-libs/folks/folks-0.15.9-r1.ebuild
index adb59d9197f2..66f0228c9797 100644
--- a/dev-libs/folks/folks-0.15.9-r1.ebuild
+++ b/dev-libs/folks/folks-0.15.9-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="bluetooth eds telepathy test utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/folks/folks-0.15.9-r2.ebuild b/dev-libs/folks/folks-0.15.9-r2.ebuild
index d38ae4c5da13..86fa700a952a 100644
--- a/dev-libs/folks/folks-0.15.9-r2.ebuild
+++ b/dev-libs/folks/folks-0.15.9-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="bluetooth eds test utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/fribidi/fribidi-1.0.13.ebuild b/dev-libs/fribidi/fribidi-1.0.13.ebuild
index 9561eb4d22ad..bddc0cfc9901 100644
--- a/dev-libs/fribidi/fribidi-1.0.13.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/fribidi/fribidi-1.0.16.ebuild b/dev-libs/fribidi/fribidi-1.0.16.ebuild
index 9561eb4d22ad..bddc0cfc9901 100644
--- a/dev-libs/fribidi/fribidi-1.0.16.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/geoip/geoip-1.6.12-r1.ebuild b/dev-libs/geoip/geoip-1.6.12-r1.ebuild
index f0b7abb9e5c8..7fa5aca8c164 100644
--- a/dev-libs/geoip/geoip-1.6.12-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-api-c-${PV}"
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/geoip/geoip-1.6.12.ebuild b/dev-libs/geoip/geoip-1.6.12.ebuild
index 913942a17111..9331df7e5444 100644
--- a/dev-libs/geoip/geoip-1.6.12.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-api-c-${PV}"
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild b/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild
index 333431666d8f..c88129816cd4 100644
--- a/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild
+++ b/dev-libs/gf2x/gf2x-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/38243/${P}.tar.gz"
 # License is tricky, see their README
 LICENSE="GPL-3+ GPL-2+"
 SLOT="0/3" # soname major version, defined in configure.ac
-KEYWORDS="amd64 arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE="fft static-libs custom-tune"
 IUSE_CPU_FLAGS=" pclmul sse2 sse3 sse4_1 ssse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
diff --git a/dev-libs/glib/glib-2.84.4-r1.ebuild b/dev-libs/glib/glib-2.84.4-r1.ebuild
index dc65a338601e..f6f213fa087c 100644
--- a/dev-libs/glib/glib-2.84.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.84.4-r1.ebuild
@@ -22,7 +22,7 @@ INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/glib/glib-2.84.4.ebuild b/dev-libs/glib/glib-2.84.4.ebuild
index e258b30a2bc7..70f333647b66 100644
--- a/dev-libs/glib/glib-2.84.4.ebuild
+++ b/dev-libs/glib/glib-2.84.4.ebuild
@@ -22,7 +22,7 @@ INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/glib/glib-2.86.1.ebuild b/dev-libs/glib/glib-2.86.1.ebuild
index 764a8a0f4257..dad63c11782c 100644
--- a/dev-libs/glib/glib-2.86.1.ebuild
+++ b/dev-libs/glib/glib-2.86.1.ebuild
@@ -22,7 +22,7 @@ INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-2.6.23-r2.ebuild b/dev-libs/gmime/gmime-2.6.23-r2.ebuild
index a3a2fee55690..c01cf7b4ad94 100644
--- a/dev-libs/gmime/gmime-2.6.23-r2.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-solaris"
 IUSE="doc smime test vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.14.ebuild b/dev-libs/gmime/gmime-3.2.14.ebuild
index ab7dc2de1fc1..21e73c256a0b 100644
--- a/dev-libs/gmime/gmime-3.2.14.ebuild
+++ b/dev-libs/gmime/gmime-3.2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="crypt doc idn test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.15-r1.ebuild b/dev-libs/gmime/gmime-3.2.15-r1.ebuild
index 62489bc3feb0..66f69d48ba1d 100644
--- a/dev-libs/gmime/gmime-3.2.15-r1.ebuild
+++ b/dev-libs/gmime/gmime-3.2.15-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="crypt doc idn test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.15.ebuild b/dev-libs/gmime/gmime-3.2.15.ebuild
index 20da47fcadba..2a52f627e243 100644
--- a/dev-libs/gmime/gmime-3.2.15.ebuild
+++ b/dev-libs/gmime/gmime-3.2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="crypt doc idn test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmp/gmp-6.3.0-r1.ebuild b/dev-libs/gmp/gmp-6.3.0-r1.ebuild
index 5cedc6677091..d265cbc8e805 100644
--- a/dev-libs/gmp/gmp-6.3.0-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.3.0-r1.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"/${MY_P%a}
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +cpudetection +cxx pic static-libs"
 REQUIRED_USE="cpudetection? ( asm )"
 RESTRICT="!cpudetection? ( bindist )"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild
index 56b8448694ef..7ef467e5a6cb 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gi.readthedocs.io/"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
 # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.84.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.84.0.ebuild
index 56b8448694ef..7ef467e5a6cb 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.84.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.84.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gi.readthedocs.io/"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
 # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.86.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.86.0.ebuild
index 9b80c5d88bf5..1365fa707142 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.86.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.86.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gi.readthedocs.io/"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
 # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r2.ebuild
index 5ff977947cbe..c34ff8ef0e2f 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.82.0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gi.readthedocs.io/"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.84.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.84.0-r1.ebuild
index 237b30ebb369..4240cd74f2d3 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.84.0-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.84.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gi.readthedocs.io/"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.86.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.86.0.ebuild
index dee8e9cc4b52..a1602a670a0f 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.86.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.86.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gi.readthedocs.io/"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild
index 55f03ac4ea5c..5108bd34f4ff 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="static-libs"
 
 DEPEND="app-text/hunspell"
diff --git a/dev-libs/icu/icu-77.1.ebuild b/dev-libs/icu/icu-77.1.ebuild
index c10ccbd1e01a..116e901302b6 100644
--- a/dev-libs/icu/icu-77.1.ebuild
+++ b/dev-libs/icu/icu-77.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re
 S="${WORKDIR}"/${PN}/source
 
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 LICENSE="BSD"
 SLOT="0/${PV%.*}"
diff --git a/dev-libs/imath/imath-3.1.12-r1.ebuild b/dev-libs/imath/imath-3.1.12-r1.ebuild
index b0d755ba1d99..c938e526c176 100644
--- a/dev-libs/imath/imath-3.1.12-r1.ebuild
+++ b/dev-libs/imath/imath-3.1.12-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="3/29"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc large-stack python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/iniparser/iniparser-4.2.6.ebuild b/dev-libs/iniparser/iniparser-4.2.6.ebuild
index f57f0671de7b..302ee9bfdc5e 100644
--- a/dev-libs/iniparser/iniparser-4.2.6.ebuild
+++ b/dev-libs/iniparser/iniparser-4.2.6.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-v${PV}
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc examples"
 # tests need work, uses ruby + fetchcontent
 RESTRICT="test"
diff --git a/dev-libs/json-c/json-c-0.18.ebuild b/dev-libs/json-c/json-c-0.18.ebuild
index f3995c63d303..181839665264 100644
--- a/dev-libs/json-c/json-c-0.18.ebuild
+++ b/dev-libs/json-c/json-c-0.18.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild
index de4dbc705e36..d9853738ac32 100644
--- a/dev-libs/json-c/json-c-9999.ebuild
+++ b/dev-libs/json-c/json-c-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild
index a59eaffbccc2..e756909b1637 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.6-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/kpathsea/kpathsea-6.3.5_p20230311.ebuild b/dev-libs/kpathsea/kpathsea-6.3.5_p20230311.ebuild
index 1aeb30f4cf76..89d69c255620 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.5_p20230311.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.5_p20230311.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/kpathsea/kpathsea-6.4.0_p20240311-r1.ebuild b/dev-libs/kpathsea/kpathsea-6.4.0_p20240311-r1.ebuild
index de09b4b1babe..4598e6040f6e 100644
--- a/dev-libs/kpathsea/kpathsea-6.4.0_p20240311-r1.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.4.0_p20240311-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 LICENSE="LGPL-2.1"
 SLOT="0/${PV%_p*}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc source static-libs"
 
 TL_REVISION=72376
diff --git a/dev-libs/kpathsea/kpathsea-6.4.0_p20240311.ebuild b/dev-libs/kpathsea/kpathsea-6.4.0_p20240311.ebuild
index 7a887350587b..180994057a9b 100644
--- a/dev-libs/kpathsea/kpathsea-6.4.0_p20240311.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.4.0_p20240311.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 LICENSE="LGPL-2.1"
 SLOT="0/${PV%_p*}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc source static-libs"
 
 TL_REVISION=72376
diff --git a/dev-libs/leveldb/leveldb-1.23-r6.ebuild b/dev-libs/leveldb/leveldb-1.23-r6.ebuild
index c963638d5fd9..9699c2bf512e 100644
--- a/dev-libs/leveldb/leveldb-1.23-r6.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+snappy +tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild
index 0a448677f44b..8394f55b9490 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/glib-2.44.1-r1:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libaio/libaio-0.3.113-r1.ebuild b/dev-libs/libaio/libaio-0.3.113-r1.ebuild
index 6133e5115914..f2c3e807c2ce 100644
--- a/dev-libs/libaio/libaio-0.3.113-r1.ebuild
+++ b/dev-libs/libaio/libaio-0.3.113-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/dev-libs/libaio/libaio-0.3.113-r2.ebuild b/dev-libs/libaio/libaio-0.3.113-r2.ebuild
index 0c84be348116..446b349145b6 100644
--- a/dev-libs/libaio/libaio-0.3.113-r2.ebuild
+++ b/dev-libs/libaio/libaio-0.3.113-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/dev-libs/libaio/libaio-0.3.113_p8.ebuild b/dev-libs/libaio/libaio-0.3.113_p8.ebuild
index 397daf9a69c0..c3dd8e38fba5 100644
--- a/dev-libs/libaio/libaio-0.3.113_p8.ebuild
+++ b/dev-libs/libaio/libaio-0.3.113_p8.ebuild
@@ -20,7 +20,7 @@ else
 	fi
 	S="${WORKDIR}"/${P%_p*}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index 986cf5c317ed..7f625fe8b695 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -20,7 +20,7 @@ else
 	fi
 	S="${WORKDIR}"/${P%_p*}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/dev-libs/libassuan/libassuan-2.5.7.ebuild b/dev-libs/libassuan/libassuan-2.5.7.ebuild
index 1270184e9dff..37dd70b679de 100644
--- a/dev-libs/libassuan/libassuan-2.5.7.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Note: On each bump, update dep bounds on each version from configure.ac!
 RDEPEND=">=dev-libs/libgpg-error-1.33"
diff --git a/dev-libs/libassuan/libassuan-3.0.0-r1.ebuild b/dev-libs/libassuan/libassuan-3.0.0-r1.ebuild
index b8b65dc5bcb4..75c539c9a1fc 100644
--- a/dev-libs/libassuan/libassuan-3.0.0-r1.ebuild
+++ b/dev-libs/libassuan/libassuan-3.0.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.33"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libassuan/libassuan-3.0.1-r1.ebuild b/dev-libs/libassuan/libassuan-3.0.1-r1.ebuild
index edc1290b84cd..77b0fd1add40 100644
--- a/dev-libs/libassuan/libassuan-3.0.1-r1.ebuild
+++ b/dev-libs/libassuan/libassuan-3.0.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.33"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.10.0.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.10.0.ebuild
index c526162d4395..4b6811eb6131 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.10.0.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bdwgc/libatomic_ops/releases/download/v${PV}/${P}.ta
 # See doc/LICENSING.txt
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.8.4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.8.4.ebuild
index 8d8e7aafe50c..ea0636cd57bf 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.8.4.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.8.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bdwgc/libatomic_ops/releases/download/v${PV}/${P}.ta
 # See doc/LICENSING.txt
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libbsd/libbsd-0.11.8.ebuild b/dev-libs/libbsd/libbsd-0.11.8.ebuild
index 2337df3de910..e7a2a69a2b26 100644
--- a/dev-libs/libbsd/libbsd-0.11.8.ebuild
+++ b/dev-libs/libbsd/libbsd-0.11.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc
 
 LICENSE="BEER-WARE BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
index d2070bc20bd0..5f411ee2d5e2 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0/2" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.2.ebuild
index 9410ca2c890e..fcb7d5094e6a 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0/2" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+cxx static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r2.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r2.ebuild
index d93592d07953..e08cbd6e2904 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r2.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/19" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="cddb +cxx minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcdio/libcdio-2.2.0.ebuild b/dev-libs/libcdio/libcdio-2.2.0.ebuild
index fe3ef6111852..b550be34e0b8 100644
--- a/dev-libs/libcdio/libcdio-2.2.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcdio/libcdio/releases/download/${PV}/${P}.tar.bz2
 
 LICENSE="FDL-1.2+ GPL-2+ GPL-3+ LGPL-2.1+"
 SLOT="0/19" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="cddb +cxx minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libconfig/libconfig-1.8.1.ebuild b/dev-libs/libconfig/libconfig-1.8.1.ebuild
index b7d88942df7f..c672241a94e1 100644
--- a/dev-libs/libconfig/libconfig-1.8.1.ebuild
+++ b/dev-libs/libconfig/libconfig-1.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+cxx debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcroco/libcroco-0.6.13-r2.ebuild b/dev-libs/libcroco/libcroco-0.6.13-r2.ebuild
index b6bf491a466f..61ff7090a2de 100644
--- a/dev-libs/libcroco/libcroco-0.6.13-r2.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/libcroco"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
index 35b59f243fb4..f7605eab78bb 100644
--- a/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
+++ b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/ssh"
 
diff --git a/dev-libs/libebml/libebml-1.4.5-r1.ebuild b/dev-libs/libebml/libebml-1.4.5-r1.ebuild
index 5d26895bc000..d6438fb2682d 100644
--- a/dev-libs/libebml/libebml-1.4.5-r1.ebuild
+++ b/dev-libs/libebml/libebml-1.4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.5-cmake-4.patch
diff --git a/dev-libs/libebml/libebml-1.4.5.ebuild b/dev-libs/libebml/libebml-1.4.5.ebuild
index f150adf11558..a7371e407e84 100644
--- a/dev-libs/libebml/libebml-1.4.5.ebuild
+++ b/dev-libs/libebml/libebml-1.4.5.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
diff --git a/dev-libs/libedit/libedit-20240808.3.1.ebuild b/dev-libs/libedit/libedit-20240808.3.1.ebuild
index 7abe0caf1840..76a59194529b 100644
--- a/dev-libs/libedit/libedit-20240808.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20240808.3.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-libs/libee/libee-0.4.1-r1.ebuild b/dev-libs/libee/libee-0.4.1-r1.ebuild
index a96b88648320..823c414d9c88 100644
--- a/dev-libs/libee/libee-0.4.1-r1.ebuild
+++ b/dev-libs/libee/libee-0.4.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.libee.org/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libev/libev-4.33.ebuild b/dev-libs/libev/libev-4.33.ebuild
index 56a113759d9d..e90c2fa810bc 100644
--- a/dev-libs/libev/libev-4.33.ebuild
+++ b/dev-libs/libev/libev-4.33.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 DOCS=( Changes README )
diff --git a/dev-libs/libevent/libevent-2.1.12-r1.ebuild b/dev-libs/libevent/libevent-2.1.12-r1.ebuild
index 430a5b171678..064d9d2d22a6 100644
--- a/dev-libs/libevent/libevent-2.1.12-r1.ebuild
+++ b/dev-libs/libevent/libevent-2.1.12-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0/2.1-7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="
 	+clock-gettime debug malloc-replacement +ssl static-libs test
 	verbose-debug
diff --git a/dev-libs/libf2c/libf2c-20130927-r1.ebuild b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
index d5e8ade2f5ef..13d4a22da7ff 100644
--- a/dev-libs/libf2c/libf2c-20130927-r1.ebuild
+++ b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/f2c/${PN}.zip -> ${P}.zip"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/libf2c/libf2c-20240130.ebuild b/dev-libs/libf2c/libf2c-20240130.ebuild
index 72b053b12c89..8b93f80f6c14 100644
--- a/dev-libs/libf2c/libf2c-20240130.ebuild
+++ b/dev-libs/libf2c/libf2c-20240130.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/f2c/${PN}.zip -> ${P}.zip"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index e3bd2c4c40dc..7fcdb53d91ce 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://sourceware.org/ftp/libffi/libffi-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="6" # libffi.so.6
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug pax-kernel test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
index ea48044c6d26..a45794dd1a36 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${PV}/libffi-${PV}.
 
 LICENSE="MIT"
 SLOT="7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug pax-kernel test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/libffi-3.4.8-r3.ebuild b/dev-libs/libffi/libffi-3.4.8-r3.ebuild
index fc4ba0828832..dcf12292dca4 100644
--- a/dev-libs/libffi/libffi-3.4.8-r3.ebuild
+++ b/dev-libs/libffi/libffi-3.4.8-r3.ebuild
@@ -18,7 +18,7 @@ else
 	inherit libtool
 	SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-libs/libffi/libffi-3.5.1.ebuild b/dev-libs/libffi/libffi-3.5.1.ebuild
index 75c983e15ab9..3f603dfeda5b 100644
--- a/dev-libs/libffi/libffi-3.5.1.ebuild
+++ b/dev-libs/libffi/libffi-3.5.1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *@(alpha|beta|pre|rc)* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-libs/libffi/libffi-3.5.2.ebuild b/dev-libs/libffi/libffi-3.5.2.ebuild
index 75c983e15ab9..3f603dfeda5b 100644
--- a/dev-libs/libffi/libffi-3.5.2.ebuild
+++ b/dev-libs/libffi/libffi-3.5.2.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *@(alpha|beta|pre|rc)* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-libs/libffi/libffi-9999.ebuild b/dev-libs/libffi/libffi-9999.ebuild
index ab8e08558702..babb8c5e6418 100644
--- a/dev-libs/libffi/libffi-9999.ebuild
+++ b/dev-libs/libffi/libffi-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *@(alpha|beta|pre|rc)* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild
index c4724ca4903c..cbb480773679 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug static-libs"
 
 RESTRICT="test" # needs gam-server
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index 86882364f747..80a45deca3fb 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
 SLOT="11" # soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
 	!dev-libs/libgcrypt:0/11
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
index b7398859d032..a2e177c9edcb 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild
index 3e04d7176e65..2aae0fac6525 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.3-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.3-r2.ebuild
index 9e3319a72cdd..4cab8affabe8 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.3-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.0-r1.ebuild
index 7bfd24db9788..4aa44b3fe49c 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.11.0-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +getentropy static-libs"
 IUSE+=" cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_arm_sve"
 IUSE+=" cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.0-r2.ebuild
index e33c59c359d0..df762a0c6eb4 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.11.0-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +getentropy static-libs"
 IUSE+=" cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_arm_sve"
 IUSE+=" cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.1.ebuild
index 5349891f32fd..56a09d21a6ad 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.11.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +getentropy static-libs"
 IUSE+=" cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_arm_sve"
 IUSE+=" cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.2.ebuild
index 71ac563bf434..407248536bcb 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.11.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +getentropy static-libs"
 IUSE+=" cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_arm_sve"
 IUSE+=" cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3"
diff --git a/dev-libs/libgee/libgee-0.20.6-r1.ebuild b/dev-libs/libgee/libgee-0.20.6-r1.ebuild
index dd7a3df83afa..78d21b3239f7 100644
--- a/dev-libs/libgee/libgee-0.20.6-r1.ebuild
+++ b/dev-libs/libgee/libgee-0.20.6-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgee/libgee-0.20.8.ebuild b/dev-libs/libgee/libgee-0.20.8.ebuild
index 7fda774da43d..283b7fd94abd 100644
--- a/dev-libs/libgee/libgee-0.20.8.ebuild
+++ b/dev-libs/libgee/libgee-0.20.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgnt/libgnt-2.14.3-r1.ebuild b/dev-libs/libgnt/libgnt-2.14.3-r1.ebuild
index db11fda8cb0b..84ad185adc12 100644
--- a/dev-libs/libgnt/libgnt-2.14.3-r1.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pidgin/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-libs/libgpg-error/libgpg-error-1.56.ebuild b/dev-libs/libgpg-error/libgpg-error-1.56.ebuild
index 795679e03f5e..8fb77cd1f215 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.56.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.56.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="common-lisp nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgpg-error/libgpg-error-1.57.ebuild b/dev-libs/libgpg-error/libgpg-error-1.57.ebuild
index 0ee2b8989ebf..6be1b0353b5f 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.57.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.57.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="common-lisp nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgweather/libgweather-4.4.2-r1.ebuild b/dev-libs/libgweather/libgweather-4.4.2-r1.ebuild
index 7700662d903d..e3cf603c8870 100644
--- a/dev-libs/libgweather/libgweather-4.4.2-r1.ebuild
+++ b/dev-libs/libgweather/libgweather-4.4.2-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	gtk-doc? ( introspection )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
diff --git a/dev-libs/libgweather/libgweather-4.4.4.ebuild b/dev-libs/libgweather/libgweather-4.4.4.ebuild
index 2695882ee829..15d24a612ce1 100644
--- a/dev-libs/libgweather/libgweather-4.4.4.ebuild
+++ b/dev-libs/libgweather/libgweather-4.4.4.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	gtk-doc? ( introspection )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
diff --git a/dev-libs/libical/libical-3.0.20-r2.ebuild b/dev-libs/libical/libical-3.0.20-r2.ebuild
index c53e968c6d87..c2d4c6fd57bc 100644
--- a/dev-libs/libical/libical-3.0.20-r2.ebuild
+++ b/dev-libs/libical/libical-3.0.20-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libiconv/libiconv-1.17.ebuild b/dev-libs/libiconv/libiconv-1.17.ebuild
index 27c8d9325219..68e7a82d415b 100644
--- a/dev-libs/libiconv/libiconv-1.17.ebuild
+++ b/dev-libs/libiconv/libiconv-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+ GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libiconv/libiconv-1.18.ebuild b/dev-libs/libiconv/libiconv-1.18.ebuild
index ff3f17b30e34..1cb859b923c6 100644
--- a/dev-libs/libiconv/libiconv-1.18.ebuild
+++ b/dev-libs/libiconv/libiconv-1.18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+ GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="prefix static-libs"
 
 DEPEND="
diff --git a/dev-libs/libintl/libintl-0.21.1.ebuild b/dev-libs/libintl/libintl-0.21.1.ebuild
index aacc58caa530..79e82dee1580 100644
--- a/dev-libs/libintl/libintl-0.21.1.ebuild
+++ b/dev-libs/libintl/libintl-0.21.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.22.5.ebuild b/dev-libs/libintl/libintl-0.22.5.ebuild
index d3f11111f31f..5ace03536995 100644
--- a/dev-libs/libintl/libintl-0.22.5.ebuild
+++ b/dev-libs/libintl/libintl-0.22.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.23.1.ebuild b/dev-libs/libintl/libintl-0.23.1.ebuild
index 6c75abcfb802..60f10f36aa80 100644
--- a/dev-libs/libintl/libintl-0.23.1.ebuild
+++ b/dev-libs/libintl/libintl-0.23.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.23.2.ebuild b/dev-libs/libintl/libintl-0.23.2.ebuild
index 6c75abcfb802..60f10f36aa80 100644
--- a/dev-libs/libintl/libintl-0.23.2.ebuild
+++ b/dev-libs/libintl/libintl-0.23.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.25.1.ebuild b/dev-libs/libintl/libintl-0.25.1.ebuild
index 6c75abcfb802..60f10f36aa80 100644
--- a/dev-libs/libintl/libintl-0.25.1.ebuild
+++ b/dev-libs/libintl/libintl-0.25.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.26.ebuild b/dev-libs/libintl/libintl-0.26.ebuild
index 6c75abcfb802..60f10f36aa80 100644
--- a/dev-libs/libintl/libintl-0.26.ebuild
+++ b/dev-libs/libintl/libintl-0.26.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libksba/libksba-1.6.7.ebuild b/dev-libs/libksba/libksba-1.6.7.ebuild
index 114f8d013047..dc68c68df432 100644
--- a/dev-libs/libksba/libksba-1.6.7.ebuild
+++ b/dev-libs/libksba/libksba-1.6.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.33"
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild
index 8e8ebb82349c..4b5089ba63cf 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86 ~amd64-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="LGPL-2.1 Apache-2.0"
diff --git a/dev-libs/libltdl/libltdl-2.5.4.ebuild b/dev-libs/libltdl/libltdl-2.5.4.ebuild
index cde1055ecc4a..de5758d91f00 100644
--- a/dev-libs/libltdl/libltdl-2.5.4.ebuild
+++ b/dev-libs/libltdl/libltdl-2.5.4.ebuild
@@ -15,7 +15,7 @@ if false && ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/libtool/${MY_P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}/libltdl
diff --git a/dev-libs/libltdl/libltdl-2.6.0.ebuild b/dev-libs/libltdl/libltdl-2.6.0.ebuild
index 07212695f3c8..192de805336f 100644
--- a/dev-libs/libltdl/libltdl-2.6.0.ebuild
+++ b/dev-libs/libltdl/libltdl-2.6.0.ebuild
@@ -16,7 +16,7 @@ if true || ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/libtool/${MY_P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}/libltdl
diff --git a/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild b/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild
index b7e6f640ef6d..c5a2c677b179 100644
--- a/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild
+++ b/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/dict/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-libtool.patch # 778464
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild
index 34abd0a83487..fbff8f137493 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
index c7f26e4eb4bf..2ca68d8ed001 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 IUSE="debug hsieh +libevent sasl"
 # https://bugs.gentoo.org/498250
 # https://bugs.launchpad.net/gentoo/+bug/1278023
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 75845712d75b..22d4eaea3ef9 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
index ab0eabf5dfa2..91992c55f7c4 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libnl/libnl-3.10.0.ebuild b/dev-libs/libnl/libnl-3.10.0.ebuild
index a1c0120c5967..eadd323d9b6e 100644
--- a/dev-libs/libnl/libnl-3.10.0.ebuild
+++ b/dev-libs/libnl/libnl-3.10.0.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 	S="${WORKDIR}/${LIBNL_P}"
 fi
diff --git a/dev-libs/libnl/libnl-3.11.0.ebuild b/dev-libs/libnl/libnl-3.11.0.ebuild
index 7087ab65b137..19ad580f4e20 100644
--- a/dev-libs/libnl/libnl-3.11.0.ebuild
+++ b/dev-libs/libnl/libnl-3.11.0.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 	S="${WORKDIR}/${LIBNL_P}"
 fi
diff --git a/dev-libs/libnl/libnl-9999.ebuild b/dev-libs/libnl/libnl-9999.ebuild
index 5d4ac2e9b242..f7369de736ab 100644
--- a/dev-libs/libnl/libnl-9999.ebuild
+++ b/dev-libs/libnl/libnl-9999.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 	S="${WORKDIR}/${LIBNL_P}"
 fi
diff --git a/dev-libs/liboil/liboil-0.3.17-r5.ebuild b/dev-libs/liboil/liboil-0.3.17-r5.ebuild
index 5711d33e546c..a56be91c4f10 100644
--- a/dev-libs/liboil/liboil-0.3.17-r5.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libotf/libotf-0.9.16-r1.ebuild b/dev-libs/libotf/libotf-0.9.16-r1.ebuild
index 322cb3470212..3e6206607837 100644
--- a/dev-libs/libotf/libotf-0.9.16-r1.ebuild
+++ b/dev-libs/libotf/libotf-0.9.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="static-libs X"
 
 RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libpcre/libpcre-8.45-r4.ebuild b/dev-libs/libpcre/libpcre-8.45-r4.ebuild
index 5a2c2c6c6cbf..76792a8f0f93 100644
--- a/dev-libs/libpcre/libpcre-8.45-r4.ebuild
+++ b/dev-libs/libpcre/libpcre-8.45-r4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode valgrind zlib"
 REQUIRED_USE="
 	readline? ( !libedit )
diff --git a/dev-libs/libpcre2/libpcre2-10.45.ebuild b/dev-libs/libpcre2/libpcre2-10.45.ebuild
index ad9ea1f061ba..f303a22b155e 100644
--- a/dev-libs/libpcre2/libpcre2-10.45.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.45.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib"
 REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libpcre2/libpcre2-10.46.ebuild b/dev-libs/libpcre2/libpcre2-10.46.ebuild
index acc5787b7b97..3f565dbeb218 100644
--- a/dev-libs/libpcre2/libpcre2-10.46.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.46.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib"
 REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libpcre2/libpcre2-10.47.ebuild b/dev-libs/libpcre2/libpcre2-10.47.ebuild
index c406d0969984..60412f7e6a6d 100644
--- a/dev-libs/libpcre2/libpcre2-10.47.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.47.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib"
 REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libpeas/libpeas-1.36.0.ebuild b/dev-libs/libpeas/libpeas-1.36.0.ebuild
index e715577a4a29..156b01ee4078 100644
--- a/dev-libs/libpeas/libpeas-1.36.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.36.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libpeas https://gitlab.gnome.org/GNOME
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/libpeas/libpeas-2.0.7-r1.ebuild b/dev-libs/libpeas/libpeas-2.0.7-r1.ebuild
index be9ee71ee3b2..21898c4cebc5 100644
--- a/dev-libs/libpeas/libpeas-2.0.7-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-2.0.7-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libpeas"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="glade gtk-doc javascript lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/libpipeline/libpipeline-1.5.8.ebuild b/dev-libs/libpipeline/libpipeline-1.5.8.ebuild
index 3abe209f65e1..ac03cc4e16a9 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.8.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libretls/libretls-3.8.1.ebuild b/dev-libs/libretls/libretls-3.8.1.ebuild
index 18d743fa9967..42222f945386 100644
--- a/dev-libs/libretls/libretls-3.8.1.ebuild
+++ b/dev-libs/libretls/libretls-3.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="
 	dev-libs/openssl:=
diff --git a/dev-libs/libsass/libsass-3.6.5-r1.ebuild b/dev-libs/libsass/libsass-3.6.5-r1.ebuild
index 220614e3439a..0b1867a3f528 100644
--- a/dev-libs/libsass/libsass-3.6.5-r1.ebuild
+++ b/dev-libs/libsass/libsass-3.6.5-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsass/libsass-3.6.6.ebuild b/dev-libs/libsass/libsass-3.6.6.ebuild
index 220614e3439a..0b1867a3f528 100644
--- a/dev-libs/libsass/libsass-3.6.6.ebuild
+++ b/dev-libs/libsass/libsass-3.6.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsass/libsass-9999.ebuild b/dev-libs/libsass/libsass-9999.ebuild
index 21069e67d297..97e661f3d5ac 100644
--- a/dev-libs/libsass/libsass-9999.ebuild
+++ b/dev-libs/libsass/libsass-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
index 146e0e7adeac..f242ff4dcc14 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.6.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.6.0.ebuild
index 03da7b0733b1..a2be2bfae624 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.6.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.6.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/5"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem musig +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.7.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.7.0.ebuild
index ad1ae452eaa6..2dbbbc4430c7 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.7.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.7.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/6"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem musig +recovery +schnorr test test-full valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigc++/libsigc++-2.12.0.ebuild b/dev-libs/libsigc++/libsigc++-2.12.0.ebuild
index 07c21cf17736..1a36d46468f1 100644
--- a/dev-libs/libsigc++/libsigc++-2.12.0.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.12.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gtk-doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigc++/libsigc++-2.12.1.ebuild b/dev-libs/libsigc++/libsigc++-2.12.1.ebuild
index 07c21cf17736..1a36d46468f1 100644
--- a/dev-libs/libsigc++/libsigc++-2.12.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.12.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gtk-doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigc++/libsigc++-3.6.0.ebuild b/dev-libs/libsigc++/libsigc++-3.6.0.ebuild
index d5e850ae19f6..b3fe2b792cb5 100644
--- a/dev-libs/libsigc++/libsigc++-3.6.0.ebuild
+++ b/dev-libs/libsigc++/libsigc++-3.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gtk-doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigsegv/libsigsegv-2.14-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.14-r1.ebuild
index 59fcf5e49025..5b815081d871 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.14-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-c99.patch
diff --git a/dev-libs/libsigsegv/libsigsegv-2.15.ebuild b/dev-libs/libsigsegv/libsigsegv-2.15.ebuild
index df51a99797a1..9703449c96fd 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.15.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_configure() {
 	econf --enable-shared
diff --git a/dev-libs/libtar/libtar-1.2.20-r6.ebuild b/dev-libs/libtar/libtar-1.2.20-r6.ebuild
index 23906301f2b0..587eac205929 100644
--- a/dev-libs/libtar/libtar-1.2.20-r6.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="zlib"
 # There is no test and 'check' target errors out due to mixing of automake &
 # non-automake makefiles.
diff --git a/dev-libs/libtasn1/libtasn1-4.19.0.ebuild b/dev-libs/libtasn1/libtasn1-4.19.0.ebuild
index f823f3a09e52..ad3fc5561588 100644
--- a/dev-libs/libtasn1/libtasn1-4.19.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.19.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libtasn1/libtasn1-4.20.0.ebuild b/dev-libs/libtasn1/libtasn1-4.20.0.ebuild
index 2953fac8af67..759b12fe07f8 100644
--- a/dev-libs/libtasn1/libtasn1-4.20.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.20.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libtecla/libtecla-1.6.3-r1.ebuild b/dev-libs/libtecla/libtecla-1.6.3-r1.ebuild
index a61d52f0bee1..482a77d91dad 100644
--- a/dev-libs/libtecla/libtecla-1.6.3-r1.ebuild
+++ b/dev-libs/libtecla/libtecla-1.6.3-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/libtecla"
 
 LICENSE="icu"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~riscv x86"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
index 8c5560a11ae0..845681a9d8bb 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
@@ -19,7 +19,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
 # SONAME -- Please bump when the ABI changes upstream
 # https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+gmp +libtommath tomsfastmath"
 # Enforce at least one math provider, bug #772935
 REQUIRED_USE="|| ( gmp libtommath tomsfastmath )"
diff --git a/dev-libs/libtommath/libtommath-1.2.1.ebuild b/dev-libs/libtommath/libtommath-1.2.1.ebuild
index 180086ff2b44..c4a29f12967b 100644
--- a/dev-libs/libtommath/libtommath-1.2.1.ebuild
+++ b/dev-libs/libtommath/libtommath-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples static-libs"
 
 BDEPEND="dev-build/libtool"
diff --git a/dev-libs/libtommath/libtommath-1.3.0.ebuild b/dev-libs/libtommath/libtommath-1.3.0.ebuild
index 180086ff2b44..c4a29f12967b 100644
--- a/dev-libs/libtommath/libtommath-1.3.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples static-libs"
 
 BDEPEND="dev-build/libtool"
diff --git a/dev-libs/libunique/libunique-1.1.6-r3.ebuild b/dev-libs/libunique/libunique-1.1.6-r3.ebuild
index 0fcc48d39f8d..4b782e457576 100644
--- a/dev-libs/libunique/libunique-1.1.6-r3.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="debug dbus +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r2.ebuild b/dev-libs/libunique/libunique-3.0.2-r2.ebuild
index c4dac7fa0590..5f0ec22838c0 100644
--- a/dev-libs/libunique/libunique-3.0.2-r2.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="debug +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
index 518611f61046..23818cce82e6 100644
--- a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-3+ GPL-2 ) || ( FDL-1.2 GPL-3+ )"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libunistring/libunistring-1.0.ebuild b/dev-libs/libunistring/libunistring-1.0.ebuild
index 322812be2067..e77cf4c4c421 100644
--- a/dev-libs/libunistring/libunistring-1.0.ebuild
+++ b/dev-libs/libunistring/libunistring-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libunistring/libunistring-1.1-r1.ebuild b/dev-libs/libunistring/libunistring-1.1-r1.ebuild
index 7dfd0603d4e9..4e3542b3805f 100644
--- a/dev-libs/libunistring/libunistring-1.1-r1.ebuild
+++ b/dev-libs/libunistring/libunistring-1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 # Check regularly even on "minor" bumps
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libunistring/libunistring-1.2.ebuild b/dev-libs/libunistring/libunistring-1.2.ebuild
index ab78097b683a..f2acc4ea6f96 100644
--- a/dev-libs/libunistring/libunistring-1.2.ebuild
+++ b/dev-libs/libunistring/libunistring-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 # Check regularly even on "minor" bumps
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc static-libs"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/dev-libs/libunistring/libunistring-1.3.ebuild b/dev-libs/libunistring/libunistring-1.3.ebuild
index ab78097b683a..f2acc4ea6f96 100644
--- a/dev-libs/libunistring/libunistring-1.3.ebuild
+++ b/dev-libs/libunistring/libunistring-1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 # Check regularly even on "minor" bumps
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc static-libs"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
index 2faa49753ffa..39a60a7d729e 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libusb/libusb-compat-0.1/releases/download/v${PV}/${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="debug examples"
 
 RDEPEND="
diff --git a/dev-libs/libusb/libusb-1.0.27-r1.ebuild b/dev-libs/libusb/libusb-1.0.27-r1.ebuild
index 48a41982e36f..2d170c96355e 100644
--- a/dev-libs/libusb/libusb-1.0.27-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="static-libs? ( !udev )"
diff --git a/dev-libs/libusb/libusb-1.0.28.ebuild b/dev-libs/libusb/libusb-1.0.28.ebuild
index 48a41982e36f..2d170c96355e 100644
--- a/dev-libs/libusb/libusb-1.0.28.ebuild
+++ b/dev-libs/libusb/libusb-1.0.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="static-libs? ( !udev )"
diff --git a/dev-libs/libusb/libusb-1.0.29.ebuild b/dev-libs/libusb/libusb-1.0.29.ebuild
index 48a41982e36f..2d170c96355e 100644
--- a/dev-libs/libusb/libusb-1.0.29.ebuild
+++ b/dev-libs/libusb/libusb-1.0.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="static-libs? ( !udev )"
diff --git a/dev-libs/libutf8proc/libutf8proc-2.10.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.10.0.ebuild
index a569eeb8337e..4086516c36bd 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.10.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}/${P#lib}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libutf8proc/libutf8proc-2.11.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.11.0.ebuild
index 77b4d39990f4..e39880c0fea8 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.11.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}/${P#lib}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libutf8proc/libutf8proc-2.11.1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.11.1.ebuild
index 956eed65cff2..d9da4fc0d16f 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.11.1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/JuliaStrings/${PN#lib}/releases/download/v${PV}/${P#
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libutf8proc/libutf8proc-2.11.2.ebuild b/dev-libs/libutf8proc/libutf8proc-2.11.2.ebuild
index 956eed65cff2..d9da4fc0d16f 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.11.2.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.11.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/JuliaStrings/${PN#lib}/releases/download/v${PV}/${P#
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libuv/libuv-1.50.0.ebuild b/dev-libs/libuv/libuv-1.50.0.ebuild
index 3cfa6b856f27..02c7239099f7 100644
--- a/dev-libs/libuv/libuv-1.50.0.ebuild
+++ b/dev-libs/libuv/libuv-1.50.0.ebuild
@@ -17,7 +17,7 @@ else
 		https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz -> ${P}.tar.gz
 		verify-sig? ( https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz.sign -> ${P}.tar.gz.sig )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/dev-libs/libuv/libuv-1.51.0-r1.ebuild b/dev-libs/libuv/libuv-1.51.0-r1.ebuild
index 29f0dab18392..967992cd41cf 100644
--- a/dev-libs/libuv/libuv-1.51.0-r1.ebuild
+++ b/dev-libs/libuv/libuv-1.51.0-r1.ebuild
@@ -17,7 +17,7 @@ else
 		https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz -> ${P}.tar.gz
 		verify-sig? ( https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz.sign -> ${P}.tar.gz.sig )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/dev-libs/libuv/libuv-1.51.0.ebuild b/dev-libs/libuv/libuv-1.51.0.ebuild
index 3cfa6b856f27..02c7239099f7 100644
--- a/dev-libs/libuv/libuv-1.51.0.ebuild
+++ b/dev-libs/libuv/libuv-1.51.0.ebuild
@@ -17,7 +17,7 @@ else
 		https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz -> ${P}.tar.gz
 		verify-sig? ( https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz.sign -> ${P}.tar.gz.sig )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild
index 9ad78be8cb2b..409e662ffe8f 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-9999.ebuild
@@ -17,7 +17,7 @@ else
 		https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz -> ${P}.tar.gz
 		verify-sig? ( https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz.sign -> ${P}.tar.gz.sig )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/dev-libs/libx86emu/libx86emu-3.5-r1.ebuild b/dev-libs/libx86emu/libx86emu-3.5-r1.ebuild
index 4f2fd27e67a1..3ca0d09b367d 100644
--- a/dev-libs/libx86emu/libx86emu-3.5-r1.ebuild
+++ b/dev-libs/libx86emu/libx86emu-3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wfeldt/libx86emu/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libx86emu/libx86emu-3.7.ebuild b/dev-libs/libx86emu/libx86emu-3.7.ebuild
index 3c8c5340d315..d0fe4331d6f6 100644
--- a/dev-libs/libx86emu/libx86emu-3.7.ebuild
+++ b/dev-libs/libx86emu/libx86emu-3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wfeldt/libx86emu/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.3.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.3.ebuild
index e4e7f70a1632..7acd33edd4d3 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.3.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
 IUSE="doc"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/dev-libs/libxml2-compat/libxml2-compat-2.13.9.ebuild b/dev-libs/libxml2-compat/libxml2-compat-2.13.9.ebuild
index fbbe7fd30a9b..99388eb5ae9b 100644
--- a/dev-libs/libxml2-compat/libxml2-compat-2.13.9.ebuild
+++ b/dev-libs/libxml2-compat/libxml2-compat-2.13.9.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/libxml2-${PV%_rc*}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="icu lzma readline test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libxml2/libxml2-2.13.9.ebuild b/dev-libs/libxml2/libxml2-2.13.9.ebuild
index 1433802a4136..04b3d0fb4061 100644
--- a/dev-libs/libxml2/libxml2-2.13.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.13.9.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	inherit gnome.org
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/libxml2/libxml2-2.14.6.ebuild b/dev-libs/libxml2/libxml2-2.14.6.ebuild
index a053c01fd010..9f6d6856e952 100644
--- a/dev-libs/libxml2/libxml2-2.14.6.ebuild
+++ b/dev-libs/libxml2/libxml2-2.14.6.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	inherit gnome.org
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/libxml2/libxml2-2.15.0-r1.ebuild b/dev-libs/libxml2/libxml2-2.15.0-r1.ebuild
index 60a377b0bc86..51385fe0c5c8 100644
--- a/dev-libs/libxml2/libxml2-2.15.0-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.15.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	inherit gnome.org
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${PN}-${PV%_rc*}"
diff --git a/dev-libs/libxml2/libxml2-2.15.1.ebuild b/dev-libs/libxml2/libxml2-2.15.1.ebuild
index 1929d9a3ded5..8308d22ec575 100644
--- a/dev-libs/libxml2/libxml2-2.15.1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.15.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	inherit gnome.org
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${PN}-${PV%_rc*}"
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index 66d75f3a8b14..f7c5436b1894 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	inherit gnome.org
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${PN}-${PV%_rc*}"
diff --git a/dev-libs/libxslt/libxslt-1.1.43-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.43-r1.ebuild
index 65b4be3533d9..f79d0e9b5118 100644
--- a/dev-libs/libxslt/libxslt-1.1.43-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.43-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit libtool gnome.org
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libxslt/libxslt-1.1.43-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.43-r2.ebuild
index 9e7533d68cd1..b1df2ee0aa1b 100644
--- a/dev-libs/libxslt/libxslt-1.1.43-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.43-r2.ebuild
@@ -17,7 +17,7 @@ else
 	inherit libtool gnome.org
 	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libxslt/libxslt-1.1.45.ebuild b/dev-libs/libxslt/libxslt-1.1.45.ebuild
index 5b47a6a15ace..a03e63c187a3 100644
--- a/dev-libs/libxslt/libxslt-1.1.45.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.45.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit libtool gnome.org
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild
index 5b47a6a15ace..a03e63c187a3 100644
--- a/dev-libs/libxslt/libxslt-9999.ebuild
+++ b/dev-libs/libxslt/libxslt-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit libtool gnome.org
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index 8159879ed237..963ac831093c 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild
index d6130d5562c0..6bb48dbcab21 100644
--- a/dev-libs/libyaml/libyaml-0.2.5.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index e58740259371..aba4b77fb8bc 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/maloc/maloc-1.5-r1.ebuild b/dev-libs/maloc/maloc-1.5-r1.ebuild
index d18f95929c5e..0f51ce88afed 100644
--- a/dev-libs/maloc/maloc-1.5-r1.ebuild
+++ b/dev-libs/maloc/maloc-1.5-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="doc mpi"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 BDEPEND="
 	doc? (
diff --git a/dev-libs/mathjax/mathjax-2.7.7-r1.ebuild b/dev-libs/mathjax/mathjax-2.7.7-r1.ebuild
index 4c7a457db3de..bb1ecf066eb4 100644
--- a/dev-libs/mathjax/mathjax-2.7.7-r1.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.7-r1.ebuild
@@ -19,7 +19,7 @@ DOCS_S="${WORKDIR}/MathJax-docs-${DOCS_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc examples"
 
 BDEPEND="
diff --git a/dev-libs/mathjax/mathjax-3.2.2-r2.ebuild b/dev-libs/mathjax/mathjax-3.2.2-r2.ebuild
index 6e71cfdac58e..b5d5c3e47bab 100644
--- a/dev-libs/mathjax/mathjax-3.2.2-r2.ebuild
+++ b/dev-libs/mathjax/mathjax-3.2.2-r2.ebuild
@@ -22,7 +22,7 @@ DOCS_S="${WORKDIR}/MathJax-docs-${DOCS_COMMIT}"
 LICENSE="Apache-2.0"
 # Some applications need to know which mathjax version they built against.
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild b/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild
index c31d0595eb2f..28378d4721c2 100644
--- a/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild
+++ b/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rcsb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE=""
 
 DEPEND="dev-libs/msgpack"
diff --git a/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0-r1.ebuild b/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0-r1.ebuild
index 909f0a52da9a..b775ea563828 100644
--- a/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0-r1.ebuild
+++ b/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rcsb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 DEPEND="|| ( dev-cpp/msgpack-cxx dev-libs/msgpack[cxx(-)] )"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/mpc/mpc-1.3.1.ebuild b/dev-libs/mpc/mpc-1.3.1.ebuild
index 37e948655c0b..05bd1660274f 100644
--- a/dev-libs/mpc/mpc-1.3.1.ebuild
+++ b/dev-libs/mpc/mpc-1.3.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="LGPL-3+ FDL-1.3+"
diff --git a/dev-libs/mpfr/mpfr-4.2.1.ebuild b/dev-libs/mpfr/mpfr-4.2.1.ebuild
index a494c7c4db1d..b0e43e8dd871 100644
--- a/dev-libs/mpfr/mpfr-4.2.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.2.1.ebuild
@@ -48,7 +48,7 @@ LICENSE="LGPL-3+"
 # preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
 SLOT="0/6" # libmpfr.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs"
 
diff --git a/dev-libs/mpfr/mpfr-4.2.2.ebuild b/dev-libs/mpfr/mpfr-4.2.2.ebuild
index a494c7c4db1d..b0e43e8dd871 100644
--- a/dev-libs/mpfr/mpfr-4.2.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.2.2.ebuild
@@ -48,7 +48,7 @@ LICENSE="LGPL-3+"
 # preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
 SLOT="0/6" # libmpfr.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs"
 
diff --git a/dev-libs/msgpack/msgpack-5.0.0.ebuild b/dev-libs/msgpack/msgpack-5.0.0.ebuild
index 8298613cfa35..61c77da8263b 100644
--- a/dev-libs/msgpack/msgpack-5.0.0.ebuild
+++ b/dev-libs/msgpack/msgpack-5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/c-${PV}/${MY_P}.tar.
 
 LICENSE="Boost-1.0"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
 IUSE="doc examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/msgpack/msgpack-6.0.0-r1.ebuild b/dev-libs/msgpack/msgpack-6.0.0-r1.ebuild
index 5c2ba6d76bbc..8224a5d54516 100644
--- a/dev-libs/msgpack/msgpack-6.0.0-r1.ebuild
+++ b/dev-libs/msgpack/msgpack-6.0.0-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="Boost-1.0"
 # has all the same problems a new SONAME would have.
 # See https://github.com/msgpack/msgpack-c/pull/1053.
 SLOT="0/2-c"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos"
 IUSE="doc examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/nettle/nettle-3.10.1.ebuild b/dev-libs/nettle/nettle-3.10.1.ebuild
index 544e8ea86a2a..5a65c3c361f1 100644
--- a/dev-libs/nettle/nettle-3.10.1.ebuild
+++ b/dev-libs/nettle/nettle-3.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
 # Subslot = libnettle - libhogweed soname version
 SLOT="0/8-6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
 # The arm64 crypto option controls AES, SHA1, and SHA2 usage.
 REQUIRED_USE="
diff --git a/dev-libs/nettle/nettle-3.10.2.ebuild b/dev-libs/nettle/nettle-3.10.2.ebuild
index 1206f09fe9f5..793746068f06 100644
--- a/dev-libs/nettle/nettle-3.10.2.ebuild
+++ b/dev-libs/nettle/nettle-3.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
 # Subslot = libnettle - libhogweed soname version
 SLOT="0/8-6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
 # The arm64 crypto option controls AES, SHA1, and SHA2 usage.
 REQUIRED_USE="
diff --git a/dev-libs/npth/npth-1.7-r1.ebuild b/dev-libs/npth/npth-1.7-r1.ebuild
index fceea3db1adc..d4d1fd5ccba4 100644
--- a/dev-libs/npth/npth-1.7-r1.ebuild
+++ b/dev-libs/npth/npth-1.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/npth/npth-1.8.ebuild b/dev-libs/npth/npth-1.8.ebuild
index 40cfce2b4ed4..dc626884cc82 100644
--- a/dev-libs/npth/npth-1.8.ebuild
+++ b/dev-libs/npth/npth-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nspr/nspr-4.36.ebuild b/dev-libs/nspr/nspr-4.36.ebuild
index bf0accc2a1c4..a00cd43bfaac 100644
--- a/dev-libs/nspr/nspr-4.36.ebuild
+++ b/dev-libs/nspr/nspr-4.36.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.37.ebuild b/dev-libs/nspr/nspr-4.37.ebuild
index bf0accc2a1c4..a00cd43bfaac 100644
--- a/dev-libs/nspr/nspr-4.37.ebuild
+++ b/dev-libs/nspr/nspr-4.37.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.38.2.ebuild b/dev-libs/nspr/nspr-4.38.2.ebuild
index e631f62365aa..a50b8c577076 100644
--- a/dev-libs/nspr/nspr-4.38.2.ebuild
+++ b/dev-libs/nspr/nspr-4.38.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.38.ebuild b/dev-libs/nspr/nspr-4.38.ebuild
index e631f62365aa..a50b8c577076 100644
--- a/dev-libs/nspr/nspr-4.38.ebuild
+++ b/dev-libs/nspr/nspr-4.38.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/nss-3.112.1.ebuild b/dev-libs/nss/nss-3.112.1.ebuild
index 08db5c662cd0..ed94d7675770 100644
--- a/dev-libs/nss/nss-3.112.1.ebuild
+++ b/dev-libs/nss/nss-3.112.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="cacert test test-full +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
 
 REQUIRED_USE="test-full? ( test )"
diff --git a/dev-libs/nss/nss-3.112.2.ebuild b/dev-libs/nss/nss-3.112.2.ebuild
index 08db5c662cd0..ed94d7675770 100644
--- a/dev-libs/nss/nss-3.112.2.ebuild
+++ b/dev-libs/nss/nss-3.112.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="cacert test test-full +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
 
 REQUIRED_USE="test-full? ( test )"
diff --git a/dev-libs/nss/nss-3.116.ebuild b/dev-libs/nss/nss-3.116.ebuild
index 8afea733bb85..d74542ea445a 100644
--- a/dev-libs/nss/nss-3.116.ebuild
+++ b/dev-libs/nss/nss-3.116.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="cacert test test-full +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
 
 REQUIRED_USE="test-full? ( test )"
diff --git a/dev-libs/nss/nss-3.117.ebuild b/dev-libs/nss/nss-3.117.ebuild
index 8afea733bb85..d74542ea445a 100644
--- a/dev-libs/nss/nss-3.117.ebuild
+++ b/dev-libs/nss/nss-3.117.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="cacert test test-full +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
 
 REQUIRED_USE="test-full? ( test )"
diff --git a/dev-libs/nss/nss-3.118.1.ebuild b/dev-libs/nss/nss-3.118.1.ebuild
index 8afea733bb85..d74542ea445a 100644
--- a/dev-libs/nss/nss-3.118.1.ebuild
+++ b/dev-libs/nss/nss-3.118.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="cacert test test-full +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
 
 REQUIRED_USE="test-full? ( test )"
diff --git a/dev-libs/nss/nss-3.119.ebuild b/dev-libs/nss/nss-3.119.ebuild
index ecb59fc1e1cf..2e146311a6fc 100644
--- a/dev-libs/nss/nss-3.119.ebuild
+++ b/dev-libs/nss/nss-3.119.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="cacert test test-full +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
 
 REQUIRED_USE="test-full? ( test )"
diff --git a/dev-libs/ntl/ntl-11.5.1-r4.ebuild b/dev-libs/ntl/ntl-11.5.1-r4.ebuild
index 21339b70694e..a3f2b239bc93 100644
--- a/dev-libs/ntl/ntl-11.5.1-r4.ebuild
+++ b/dev-libs/ntl/ntl-11.5.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/44"
-KEYWORDS="amd64 arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm64 ~loong ppc ~ppc64 ~riscv x86 ~x64-macos"
 IUSE="doc threads"
 
 BDEPEND="dev-lang/perl"
diff --git a/dev-libs/ntl/ntl-11.6.0.ebuild b/dev-libs/ntl/ntl-11.6.0.ebuild
index 1185724cbb6f..c4dd73b4df11 100644
--- a/dev-libs/ntl/ntl-11.6.0.ebuild
+++ b/dev-libs/ntl/ntl-11.6.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/45"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="doc threads"
 
 BDEPEND="dev-lang/perl"
diff --git a/dev-libs/oniguruma/oniguruma-6.9.10.ebuild b/dev-libs/oniguruma/oniguruma-6.9.10.ebuild
index 66e982764ae5..6378091b7ab6 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.10.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.10.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 BDEPEND=""
diff --git a/dev-libs/oniguruma/oniguruma-6.9.9-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.9-r1.ebuild
index a6cc50d2e272..e260c4771a5f 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.9-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.9-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 BDEPEND=""
diff --git a/dev-libs/oniguruma/oniguruma-6.9.9.ebuild b/dev-libs/oniguruma/oniguruma-6.9.9.ebuild
index 66e982764ae5..6378091b7ab6 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.9.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.9.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 BDEPEND=""
diff --git a/dev-libs/openspecfun/openspecfun-0.5.3.ebuild b/dev-libs/openspecfun/openspecfun-0.5.3.ebuild
index 5fc0b9cb540f..a271badac1b2 100644
--- a/dev-libs/openspecfun/openspecfun-0.5.3.ebuild
+++ b/dev-libs/openspecfun/openspecfun-0.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="sci-libs/openlibm:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/openspecfun/openspecfun-0.5.5.ebuild b/dev-libs/openspecfun/openspecfun-0.5.5.ebuild
index c9081f5143e3..9f00a72db9ca 100644
--- a/dev-libs/openspecfun/openspecfun-0.5.5.ebuild
+++ b/dev-libs/openspecfun/openspecfun-0.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86"
 
 DEPEND="sci-libs/openlibm:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
index 5579268422cd..10f9e4f8bcc3 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
@@ -34,7 +34,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla tls-compression"
 
 RESTRICT="!bindist? ( bindist )
diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
index 12e91f76f2be..1e66e479a373 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="$(ver_cut 1-3)"
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl/openssl-1.0.2u-r1.ebuild b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild
index 8c8bf760af33..d0c876578deb 100644
--- a/dev-libs/openssl/openssl-1.0.2u-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux ~arm64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test tls-compression +tls-heartbeat vanilla"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-libs/openssl/openssl-1.1.1w.ebuild b/dev-libs/openssl/openssl-1.1.1w.ebuild
index 208358cd2f47..c8826028e092 100644
--- a/dev-libs/openssl/openssl-1.1.1w.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1w.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
index 36c533868f46..050c653feadb 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="+cxx perl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r8.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r8.ebuild
index e76f59408188..6dbbebd4700c 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r8.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r8.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+cxx perl static-libs ${GENTOO_PERL_USESTRING}"
 
 DEPEND="
diff --git a/dev-libs/popt/popt-1.19-r1.ebuild b/dev-libs/popt/popt-1.19-r1.ebuild
index 87521a04f4da..5259a7847fa9 100644
--- a/dev-libs/popt/popt-1.19-r1.ebuild
+++ b/dev-libs/popt/popt-1.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/ppl/ppl-1.2-r5.ebuild b/dev-libs/ppl/ppl-1.2-r5.ebuild
index 829f23f58043..c853317ff023 100644
--- a/dev-libs/ppl/ppl-1.2-r5.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cdd +cxx doc lpsol pch test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx(+)]
diff --git a/dev-libs/protobuf/protobuf-21.12.ebuild b/dev-libs/protobuf/protobuf-21.12.ebuild
index 7912dd34f6d8..b9c2051f4b2c 100644
--- a/dev-libs/protobuf/protobuf-21.12.ebuild
+++ b/dev-libs/protobuf/protobuf-21.12.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~x64-macos"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
diff --git a/dev-libs/protobuf/protobuf-25.6.ebuild b/dev-libs/protobuf/protobuf-25.6.ebuild
index 10e05a1724ed..ae8b721f0529 100644
--- a/dev-libs/protobuf/protobuf-25.6.ebuild
+++ b/dev-libs/protobuf/protobuf-25.6.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/protobuf/protobuf-28.0.ebuild b/dev-libs/protobuf/protobuf-28.0.ebuild
index 2a1b6d8e4434..70bc6a2a8463 100644
--- a/dev-libs/protobuf/protobuf-28.0.ebuild
+++ b/dev-libs/protobuf/protobuf-28.0.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/protobuf/protobuf-29.5.ebuild b/dev-libs/protobuf/protobuf-29.5.ebuild
index d504a4e7e9fe..c4b79c15ae09 100644
--- a/dev-libs/protobuf/protobuf-29.5.ebuild
+++ b/dev-libs/protobuf/protobuf-29.5.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/protobuf/protobuf-30.2.ebuild b/dev-libs/protobuf/protobuf-30.2.ebuild
index 485bb045d2ab..f1cd9cdbe8dd 100644
--- a/dev-libs/protobuf/protobuf-30.2.ebuild
+++ b/dev-libs/protobuf/protobuf-30.2.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/protobuf/protobuf-31.1.ebuild b/dev-libs/protobuf/protobuf-31.1.ebuild
index 00904e67394e..2103e50c0c4c 100644
--- a/dev-libs/protobuf/protobuf-31.1.ebuild
+++ b/dev-libs/protobuf/protobuf-31.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/protobuf/protobuf-32.1.ebuild b/dev-libs/protobuf/protobuf-32.1.ebuild
index c8f1615d6583..bdd63d45ef17 100644
--- a/dev-libs/protobuf/protobuf-32.1.ebuild
+++ b/dev-libs/protobuf/protobuf-32.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/protobuf/protobuf-33.0.ebuild b/dev-libs/protobuf/protobuf-33.0.ebuild
index c8f1615d6583..bdd63d45ef17 100644
--- a/dev-libs/protobuf/protobuf-33.0.ebuild
+++ b/dev-libs/protobuf/protobuf-33.0.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/protobuf/protobuf-33.1.ebuild b/dev-libs/protobuf/protobuf-33.1.ebuild
index c8f1615d6583..bdd63d45ef17 100644
--- a/dev-libs/protobuf/protobuf-33.1.ebuild
+++ b/dev-libs/protobuf/protobuf-33.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index c8f1615d6583..bdd63d45ef17 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
diff --git a/dev-libs/pslib/pslib-0.4.6.ebuild b/dev-libs/pslib/pslib-0.4.6.ebuild
index d554739c4e28..e68e2ef3807c 100644
--- a/dev-libs/pslib/pslib-0.4.6.ebuild
+++ b/dev-libs/pslib/pslib-0.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pslib/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86"
 IUSE="debug jpeg png tiff"
 
 RDEPEND="
diff --git a/dev-libs/pugixml/pugixml-1.14.ebuild b/dev-libs/pugixml/pugixml-1.14.ebuild
index e39b6c61b6e4..d20bbd7757a4 100644
--- a/dev-libs/pugixml/pugixml-1.14.ebuild
+++ b/dev-libs/pugixml/pugixml-1.14.ebuild
@@ -12,7 +12,7 @@ else
 	# Use non-release tarball for tests
 	# TODO: ask upstream to include tests in release tarballs?
 	SRC_URI="https://github.com/zeux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/pugixml/pugixml-1.15.ebuild b/dev-libs/pugixml/pugixml-1.15.ebuild
index e39b6c61b6e4..d20bbd7757a4 100644
--- a/dev-libs/pugixml/pugixml-1.15.ebuild
+++ b/dev-libs/pugixml/pugixml-1.15.ebuild
@@ -12,7 +12,7 @@ else
 	# Use non-release tarball for tests
 	# TODO: ask upstream to include tests in release tarballs?
 	SRC_URI="https://github.com/zeux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/pugixml/pugixml-9999.ebuild b/dev-libs/pugixml/pugixml-9999.ebuild
index d3eaa0a87379..dc7a234c88ef 100644
--- a/dev-libs/pugixml/pugixml-9999.ebuild
+++ b/dev-libs/pugixml/pugixml-9999.ebuild
@@ -12,7 +12,7 @@ else
 	# Use non-release tarball for tests
 	# TODO: ask upstream to include tests in release tarballs?
 	SRC_URI="https://github.com/zeux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/qcustomplot/qcustomplot-2.1.1-r10.ebuild b/dev-libs/qcustomplot/qcustomplot-2.1.1-r10.ebuild
index 0e3610ca53d1..403be2db9fb7 100644
--- a/dev-libs/qcustomplot/qcustomplot-2.1.1-r10.ebuild
+++ b/dev-libs/qcustomplot/qcustomplot-2.1.1-r10.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-source
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtbase:6[gui,widgets]"
diff --git a/dev-libs/qgpgme/qgpgme-2.0.0-r1.ebuild b/dev-libs/qgpgme/qgpgme-2.0.0-r1.ebuild
index a93bd4f5585b..0e1805812d11 100644
--- a/dev-libs/qgpgme/qgpgme-2.0.0-r1.ebuild
+++ b/dev-libs/qgpgme/qgpgme-2.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ test? ( GPL-2 )"
 SLOT="0/7"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/qgpgme/qgpgme-2.0.0-r2.ebuild b/dev-libs/qgpgme/qgpgme-2.0.0-r2.ebuild
index 66d0dd1b5aab..d75345ae795b 100644
--- a/dev-libs/qgpgme/qgpgme-2.0.0-r2.ebuild
+++ b/dev-libs/qgpgme/qgpgme-2.0.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ test? ( GPL-2 )"
 SLOT="0/7"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/quazip/quazip-1.4-r1.ebuild b/dev-libs/quazip/quazip-1.4-r1.ebuild
index 7a0f845700fe..8e72b1491913 100644
--- a/dev-libs/quazip/quazip-1.4-r1.ebuild
+++ b/dev-libs/quazip/quazip-1.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1-with-linking-exception"
 # SONAME of libquazip1-qt5.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
 SLOT="0/1.4"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="bzip2 +qt5 qt6 test"
 REQUIRED_USE="|| ( qt5 qt6 )"
 
diff --git a/dev-libs/quazip/quazip-1.5.ebuild b/dev-libs/quazip/quazip-1.5.ebuild
index 0704430c16eb..cf173055537e 100644
--- a/dev-libs/quazip/quazip-1.5.ebuild
+++ b/dev-libs/quazip/quazip-1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1-with-linking-exception"
 # SONAME of libquazip1-qt6.so, check QUAZIP_LIB_SOVERSION in CMakeLists.txt
 SLOT="0/1.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="bzip2 test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/rasqal/rasqal-0.9.33-r3.ebuild b/dev-libs/rasqal/rasqal-0.9.33-r3.ebuild
index 7e08d18779bc..e7db279fac39 100644
--- a/dev-libs/rasqal/rasqal-0.9.33-r3.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="+crypt gmp +mhash pcre static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/rasqal/rasqal-0.9.33-r4.ebuild b/dev-libs/rasqal/rasqal-0.9.33-r4.ebuild
index 99508d87d3a7..b01b1e345d6f 100644
--- a/dev-libs/rasqal/rasqal-0.9.33-r4.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+crypt gmp +mhash pcre static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/rasqal/rasqal-0.9.33-r5.ebuild b/dev-libs/rasqal/rasqal-0.9.33-r5.ebuild
index b75a0f2e6243..a39e105baac8 100644
--- a/dev-libs/rasqal/rasqal-0.9.33-r5.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="+crypt gmp +mhash pcre static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
index 7386213ecc3e..9d770901851d 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="lua perl python ruby test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r102.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r102.ebuild
index 671b03f7ef26..1568a849e8fc 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r102.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r102.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="lua perl python ruby test ${GENTOO_PERL_USESTRING}"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/redland/redland-1.0.17-r3.ebuild b/dev-libs/redland/redland-1.0.17-r3.ebuild
index 19af8d274ea3..6cf4863c566d 100644
--- a/dev-libs/redland/redland-1.0.17-r3.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="berkdb iodbc mysql odbc postgres sqlite"
 
 RDEPEND="
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
index c5b49a85c708..f38cab2c0f7f 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/snowballstem/snowball/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs test"
 
 BDEPEND="dev-lang/perl
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-3.0.1.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-3.0.1.ebuild
index c6f8d53440a6..0846d31f2ba4 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-3.0.1.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-3.0.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/snowball-${PV}"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="static-libs test"
 
 BDEPEND="dev-lang/perl
diff --git a/dev-libs/starpu/starpu-1.3.9.ebuild b/dev-libs/starpu/starpu-1.3.9.ebuild
index 8870e9408ac3..af70dd95c75f 100644
--- a/dev-libs/starpu/starpu-1.3.9.ebuild
+++ b/dev-libs/starpu/starpu-1.3.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="
 	blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r4.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r4.ebuild
index d8f700215fb5..731b84a52cb7 100644
--- a/dev-libs/tre/tre-0.8.0_p20210321-r4.ebuild
+++ b/dev-libs/tre/tre-0.8.0_p20210321-r4.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+agrep +alloca +approx debug nls profile python"
 
 RDEPEND="
diff --git a/dev-libs/tre/tre-0.9.0-r1.ebuild b/dev-libs/tre/tre-0.9.0-r1.ebuild
index e7836fe86e8a..f61fb0f68877 100644
--- a/dev-libs/tre/tre-0.9.0-r1.ebuild
+++ b/dev-libs/tre/tre-0.9.0-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+agrep +alloca +approx debug nls profile python"
 
 RDEPEND="
diff --git a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
index f31dbeb77343..64c9fa3cb808 100644
--- a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
+++ b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/univalue/univalue-1.0.5.ebuild b/dev-libs/univalue/univalue-1.0.5.ebuild
index 8eabe1e857b3..905e10032baf 100644
--- a/dev-libs/univalue/univalue-1.0.5.ebuild
+++ b/dev-libs/univalue/univalue-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/univalue/univalue-9999.ebuild b/dev-libs/univalue/univalue-9999.ebuild
index a161fe8e30c5..5d2099641088 100644
--- a/dev-libs/univalue/univalue-9999.ebuild
+++ b/dev-libs/univalue/univalue-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild b/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild
index 5e7fdaadbb16..4c22a1af2e07 100644
--- a/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~sparc x86"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/uriparser/uriparser-0.9.9-r1.ebuild b/dev-libs/uriparser/uriparser-0.9.9-r1.ebuild
index 8f8d72d2ed93..1c1c9885c5b7 100644
--- a/dev-libs/uriparser/uriparser-0.9.9-r1.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/uriparser/uriparser-0.9.9.ebuild b/dev-libs/uriparser/uriparser-0.9.9.ebuild
index 7eca523860a1..23afd1794585 100644
--- a/dev-libs/uriparser/uriparser-0.9.9.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/uriparser/uriparser-1.0.0.ebuild b/dev-libs/uriparser/uriparser-1.0.0.ebuild
index b274db7979c6..0ef033e23ca3 100644
--- a/dev-libs/uriparser/uriparser-1.0.0.ebuild
+++ b/dev-libs/uriparser/uriparser-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="test? ( LGPL-2.1+ ) BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~sparc x86"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/uulib/uulib-0.5.20-r3.ebuild b/dev-libs/uulib/uulib-0.5.20-r3.ebuild
index 7bb59618a1d0..f83f4a744907 100644
--- a/dev-libs/uulib/uulib-0.5.20-r3.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-libtool.patch # 780018
diff --git a/dev-libs/vala-common/vala-common-0.56.16.ebuild b/dev-libs/vala-common/vala-common-0.56.16.ebuild
index e5f394f195d5..251472884247 100644
--- a/dev-libs/vala-common/vala-common-0.56.16.ebuild
+++ b/dev-libs/vala-common/vala-common-0.56.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vala.dev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.56.17.ebuild b/dev-libs/vala-common/vala-common-0.56.17.ebuild
index e5f394f195d5..251472884247 100644
--- a/dev-libs/vala-common/vala-common-0.56.17.ebuild
+++ b/dev-libs/vala-common/vala-common-0.56.17.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vala.dev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.56.18.ebuild b/dev-libs/vala-common/vala-common-0.56.18.ebuild
index 15618296e626..c913589af4fe 100644
--- a/dev-libs/vala-common/vala-common-0.56.18.ebuild
+++ b/dev-libs/vala-common/vala-common-0.56.18.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vala.dev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/vc/vc-1.4.4.ebuild b/dev-libs/vc/vc-1.4.4.ebuild
index e2d1f536a934..1089cc619f60 100644
--- a/dev-libs/vc/vc-1.4.4.ebuild
+++ b/dev-libs/vc/vc-1.4.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/Vc-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 
 src_configure() {
 	lto-guarantee-fat
diff --git a/dev-libs/vc/vc-1.4.5.ebuild b/dev-libs/vc/vc-1.4.5.ebuild
index d910a7c1f378..7a5f271c4aa6 100644
--- a/dev-libs/vc/vc-1.4.5.ebuild
+++ b/dev-libs/vc/vc-1.4.5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/Vc-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~x86 ~x64-macos"
 
 src_configure() {
 	lto-guarantee-fat
diff --git a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
index c4691e051df8..c8b06b7a3db4 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="
 		mirror://apache/xerces/c/3/sources/${P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xerces-c/xerces-c-3.3.0.ebuild b/dev-libs/xerces-c/xerces-c-3.3.0.ebuild
index bd5a2243818a..6be50a785055 100644
--- a/dev-libs/xerces-c/xerces-c-3.3.0.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.3.0.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="
 		mirror://apache/xerces/c/3/sources/${P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index 99f3732fbd9f..3da8a4cab058 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="
 		mirror://apache/xerces/c/3/sources/${P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r4.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r4.ebuild
index 92c7d22229c5..6ab3e0ec9647 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r4.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/4.54"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( abyss curl cxx )"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r2.ebuild
index c2ab0794f0a6..a0cbb86bed31 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/4.54"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( abyss curl cxx )"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03-r1.ebuild
index 7024414caa03..45bfb9631029 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/4.59"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( abyss curl cxx )"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03-r3.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03-r3.ebuild
index f344a395e821..ddf41c836679 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03-r3.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/4.59"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( abyss curl cxx )"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03.ebuild
index 10367c6d13e7..51828565b2ce 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.59.03.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/4.59"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( abyss curl cxx )"
diff --git a/dev-libs/yajl/yajl-2.1.0-r6.ebuild b/dev-libs/yajl/yajl-2.1.0-r6.ebuild
index ec8aa3374892..02cc90a50687 100644
--- a/dev-libs/yajl/yajl-2.1.0-r6.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/archive/refs/tags/${PV}.tar.gz -> ${P}-r5
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-libs/zziplib/zziplib-0.13.80.ebuild b/dev-libs/zziplib/zziplib-0.13.80.ebuild
index 72b93b759fe0..748ab3e50f8c 100644
--- a/dev-libs/zziplib/zziplib-0.13.80.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.80.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="sdl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lisp/asdf/asdf-3.3.5-r1.ebuild b/dev-lisp/asdf/asdf-3.3.5-r1.ebuild
index 33a471f039dd..c6230b834fc0 100644
--- a/dev-lisp/asdf/asdf-3.3.5-r1.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://asdf.common-lisp.dev/archives/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PVR}"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lisp/clozurecl/clozurecl-1.12.2.ebuild b/dev-lisp/clozurecl/clozurecl-1.12.2.ebuild
index 6e8d7fa069cd..433bc7a1ca6c 100644
--- a/dev-lisp/clozurecl/clozurecl-1.12.2.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.12.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* amd64 x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-lisp/asdf-2.33-r3:="
diff --git a/dev-lisp/clozurecl/clozurecl-1.13.ebuild b/dev-lisp/clozurecl/clozurecl-1.13.ebuild
index ff64166eab82..97d47f989558 100644
--- a/dev-lisp/clozurecl/clozurecl-1.13.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.13.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* amd64 ~x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-lisp/asdf-2.33-r3:="
diff --git a/dev-lisp/ecl/ecl-21.2.1-r5.ebuild b/dev-lisp/ecl/ecl-21.2.1-r5.ebuild
index 3d735305d8a2..9cb06a8ff06a 100644
--- a/dev-lisp/ecl/ecl-21.2.1-r5.ebuild
+++ b/dev-lisp/ecl/ecl-21.2.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
 # test phase only works if ecl already installed #516876
 RESTRICT="test"
diff --git a/dev-lisp/ecl/ecl-23.9.9-r1.ebuild b/dev-lisp/ecl/ecl-23.9.9-r1.ebuild
index ba0b9418f3ee..b9d58d6fcbcd 100644
--- a/dev-lisp/ecl/ecl-23.9.9-r1.ebuild
+++ b/dev-lisp/ecl/ecl-23.9.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
 # test phase only works if ecl already installed #516876
 RESTRICT="test"
diff --git a/dev-lisp/ecl/ecl-24.5.10-r1.ebuild b/dev-lisp/ecl/ecl-24.5.10-r1.ebuild
index f9e60a02d1d0..f91f4064ff2d 100644
--- a/dev-lisp/ecl/ecl-24.5.10-r1.ebuild
+++ b/dev-lisp/ecl/ecl-24.5.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
 # test phase only works if ecl already installed #516876
 RESTRICT="test"
diff --git a/dev-lisp/ecl/ecl-24.5.10.ebuild b/dev-lisp/ecl/ecl-24.5.10.ebuild
index 90fc416875d9..ea7c29564b62 100644
--- a/dev-lisp/ecl/ecl-24.5.10.ebuild
+++ b/dev-lisp/ecl/ecl-24.5.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
 # test phase only works if ecl already installed #516876
 RESTRICT="test"
diff --git a/dev-lisp/sbcl/sbcl-2.5.10.ebuild b/dev-lisp/sbcl/sbcl-2.5.10.ebuild
index c62834fae606..1d8d76ade252 100644
--- a/dev-lisp/sbcl/sbcl-2.5.10.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.5.10.ebuild
@@ -40,7 +40,7 @@ SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="system-bootstrap debug doc source +threads +unicode +zstd"
 
 CDEPEND=">=dev-lisp/asdf-3.3:= \
diff --git a/dev-lisp/sbcl/sbcl-2.5.11.ebuild b/dev-lisp/sbcl/sbcl-2.5.11.ebuild
index de7744c3002e..bfcee56d110b 100644
--- a/dev-lisp/sbcl/sbcl-2.5.11.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.5.11.ebuild
@@ -40,7 +40,7 @@ SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="system-bootstrap debug doc source +threads +unicode +zstd"
 
 CDEPEND=">=dev-lisp/asdf-3.3:= \
diff --git a/dev-lisp/sbcl/sbcl-2.5.4.ebuild b/dev-lisp/sbcl/sbcl-2.5.4.ebuild
index 5a3689dfe003..5ca9b5181a14 100644
--- a/dev-lisp/sbcl/sbcl-2.5.4.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.5.4.ebuild
@@ -40,7 +40,7 @@ SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="-* amd64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* amd64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="system-bootstrap debug doc source +threads +unicode +zstd"
 
 CDEPEND=">=dev-lisp/asdf-3.3:= \
diff --git a/dev-lisp/uiop/uiop-3.3.5.ebuild b/dev-lisp/uiop/uiop-3.3.5.ebuild
index a772964e2b13..df91b4d69693 100644
--- a/dev-lisp/uiop/uiop-3.3.5.ebuild
+++ b/dev-lisp/uiop/uiop-3.3.5.ebuild
@@ -11,6 +11,6 @@ SRC_URI="http://common-lisp.net/project/asdf/archives/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="~dev-lisp/asdf-${PV}"
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5.1-r1.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5.1-r1.ebuild
index d8a2c841ef13..2c5e6e7df2a5 100644
--- a/dev-lua/lua-bit32/lua-bit32-5.3.5.1-r1.ebuild
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5.1-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/luaposix/luaposix-36.3.ebuild b/dev-lua/luaposix/luaposix-36.3.ebuild
index d87a39d466e2..67797ba7f190 100644
--- a/dev-lua/luaposix/luaposix-36.3.ebuild
+++ b/dev-lua/luaposix/luaposix-36.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-ml/camlidl/camlidl-1.12.ebuild b/dev-ml/camlidl/camlidl-1.12.ebuild
index 9bdaa498acf1..6e54cf3f2804 100644
--- a/dev-ml/camlidl/camlidl-1.12.ebuild
+++ b/dev-ml/camlidl/camlidl-1.12.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '')
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="dev-lang/ocaml:=[ocamlopt]"
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/camlidl/camlidl-1.13.ebuild b/dev-ml/camlidl/camlidl-1.13.ebuild
index fdf3776daf27..abad0bea93eb 100644
--- a/dev-ml/camlidl/camlidl-1.13.ebuild
+++ b/dev-ml/camlidl/camlidl-1.13.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '')
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="dev-lang/ocaml:=[ocamlopt]"
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild
index d46fb9fb9a43..ee6c39531eed 100644
--- a/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/_p/-}
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="=dev-lang/ocaml-4.14*:=[ocamlopt?]"
diff --git a/dev-ml/camlp4/camlp4-5.3_p1.ebuild b/dev-ml/camlp4/camlp4-5.3_p1.ebuild
index 3d5de5addce9..b32c23552a4c 100644
--- a/dev-ml/camlp4/camlp4-5.3_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-5.3_p1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/_p/-}
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/extlib/extlib-1.7.9-r1.ebuild b/dev-ml/extlib/extlib-1.7.9-r1.ebuild
index cc900512762a..ea3f40f178a8 100644
--- a/dev-ml/extlib/extlib-1.7.9-r1.ebuild
+++ b/dev-ml/extlib/extlib-1.7.9-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/ocaml-${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/extlib/extlib-1.8.0.ebuild b/dev-ml/extlib/extlib-1.8.0.ebuild
index 7bf3c95a51e7..5c285fe173fa 100644
--- a/dev-ml/extlib/extlib-1.8.0.ebuild
+++ b/dev-ml/extlib/extlib-1.8.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/ocaml-${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="doc +ocamlopt"
 
 BDEPEND="dev-ml/cppo"
diff --git a/dev-ml/findlib/findlib-1.9.6-r1.ebuild b/dev-ml/findlib/findlib-1.9.6-r1.ebuild
index 22f0516551b4..807747c3b51e 100644
--- a/dev-ml/findlib/findlib-1.9.6-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.9.6-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 IUSE="doc +ocamlopt tk"
 
 DEPEND="dev-lang/ocaml:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.9.8-r1.ebuild b/dev-ml/findlib/findlib-1.9.8-r1.ebuild
index bc6ee4faa1a7..2df18cccd648 100644
--- a/dev-ml/findlib/findlib-1.9.8-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.9.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc +ocamlopt tk"
 
 DEPEND=">=dev-lang/ocaml-5:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.9.8.ebuild b/dev-ml/findlib/findlib-1.9.8.ebuild
index 4b874912fd47..850ddfefb579 100644
--- a/dev-ml/findlib/findlib-1.9.8.ebuild
+++ b/dev-ml/findlib/findlib-1.9.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc +ocamlopt tk"
 
 DEPEND="dev-lang/ocaml:=[ocamlopt?]
diff --git a/dev-ml/lablgl/lablgl-1.06-r2.ebuild b/dev-ml/lablgl/lablgl-1.06-r2.ebuild
index 7a6b227cba26..b5c2273c7044 100644
--- a/dev-ml/lablgl/lablgl-1.06-r2.ebuild
+++ b/dev-ml/lablgl/lablgl-1.06-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 IUSE="doc glut +ocamlopt tk"
 
 RDEPEND="
diff --git a/dev-ml/lablgl/lablgl-1.07-r1.ebuild b/dev-ml/lablgl/lablgl-1.07-r1.ebuild
index 2f6fb48ec466..11eb266a0427 100644
--- a/dev-ml/lablgl/lablgl-1.07-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.07-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc glut +ocamlopt tk"
 
 RDEPEND="
diff --git a/dev-ml/labltk/labltk-8.06.12-r2.ebuild b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
index afa9197af4d6..eb796f8cca66 100644
--- a/dev-ml/labltk/labltk-8.06.12-r2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/labltk/labltk-8.06.15-r1.ebuild b/dev-ml/labltk/labltk-8.06.15-r1.ebuild
index 04493e5293ef..62fe1766dcc6 100644
--- a/dev-ml/labltk/labltk-8.06.15-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/num/num-1.5.ebuild b/dev-ml/num/num-1.5.ebuild
index de6bfdc2e2a1..f6c686a37703 100644
--- a/dev-ml/num/num-1.5.ebuild
+++ b/dev-ml/num/num-1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
diff --git a/dev-ml/num/num-1.6-r1.ebuild b/dev-ml/num/num-1.6-r1.ebuild
index 557deb949acc..92e86e553ad8 100644
--- a/dev-ml/num/num-1.6-r1.ebuild
+++ b/dev-ml/num/num-1.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 PATCHES=(
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
index 61443f3085b3..fe485aff348e 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.16.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.16.1.ebuild
index e6dbdeceb637..f392294c801a 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.16.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.16.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
diff --git a/dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r2.ebuild b/dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r2.ebuild
index a8a5465e4eaa..377a08eb98f2 100644
--- a/dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r2.ebuild
+++ b/dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Represent a series of changes in annotate form"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 RDEPEND=">=dev-perl/Algorithm-Diff-1.150.0"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Algorithm-Dependency/Algorithm-Dependency-1.112.0.ebuild b/dev-perl/Algorithm-Dependency/Algorithm-Dependency-1.112.0.ebuild
index c2553850ecf9..c0d447b371a8 100644
--- a/dev-perl/Algorithm-Dependency/Algorithm-Dependency-1.112.0.ebuild
+++ b/dev-perl/Algorithm-Dependency/Algorithm-Dependency-1.112.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Toolkit for implementing dependency systems"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.201.0.ebuild b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.201.0.ebuild
index 3fa45a5d5662..c0a8d5b3ce40 100644
--- a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.201.0.ebuild
+++ b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.201.0.ebuild
@@ -11,6 +11,6 @@ inherit perl-module
 DESCRIPTION="Compute intelligent differences between two files / lists"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/App-CLI/App-CLI-0.520.0-r1.ebuild b/dev-perl/App-CLI/App-CLI-0.520.0-r1.ebuild
index febb88a1afa5..92bf5a3b5bd8 100644
--- a/dev-perl/App-CLI/App-CLI-0.520.0-r1.ebuild
+++ b/dev-perl/App-CLI/App-CLI-0.520.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Dispatcher module for command line interface programs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/App-pwhich/App-pwhich-1.170.0-r1.ebuild b/dev-perl/App-pwhich/App-pwhich-1.170.0-r1.ebuild
index f4133204a8dc..0caa5812a02a 100644
--- a/dev-perl/App-pwhich/App-pwhich-1.170.0-r1.ebuild
+++ b/dev-perl/App-pwhich/App-pwhich-1.170.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl-only 'which'"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/File-Which-1.140.0
diff --git a/dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild b/dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild
index 06ea3fb1bcff..36f03ef926c9 100644
--- a/dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild
+++ b/dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl5 module for reading configuration files and parsing command line arguments"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
index 7a75ffe15db2..17752fd7128f 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Array-Compare/Array-Compare-3.0.8.ebuild b/dev-perl/Array-Compare/Array-Compare-3.0.8.ebuild
index f3ff22107c06..b358d7a69d4e 100644
--- a/dev-perl/Array-Compare/Array-Compare-3.0.8.ebuild
+++ b/dev-perl/Array-Compare/Array-Compare-3.0.8.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for comparing arrays"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Array-RefElem/Array-RefElem-1.0.0-r4.ebuild b/dev-perl/Array-RefElem/Array-RefElem-1.0.0-r4.ebuild
index 3f558f1a0197..0c07023f9af4 100644
--- a/dev-perl/Array-RefElem/Array-RefElem-1.0.0-r4.ebuild
+++ b/dev-perl/Array-RefElem/Array-RefElem-1.0.0-r4.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Set up array elements as aliases"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.90.0.ebuild b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.90.0.ebuild
index 6ed3a1c0b6c6..a1e93e3677c5 100644
--- a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.90.0.ebuild
+++ b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.90.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Interface to FITS headers"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~mips ppc x86"
 
 BDEPEND="
 	>=dev-perl/Module-Build-0.300.0
diff --git a/dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.400.0-r5.ebuild b/dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.400.0-r5.ebuild
index a03d70e714b6..29a296da51c5 100644
--- a/dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.400.0-r5.ebuild
+++ b/dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.400.0-r5.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Access to FLAC audio metadata"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
 
 RDEPEND="media-libs/flac:="
 DEPEND="${RDEPEND}"
diff --git a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild
index fa4a2798bc2b..d5604d3e4378 100644
--- a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild
+++ b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An NTLM authentication module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Authen-SASL/Authen-SASL-2.170.0.ebuild b/dev-perl/Authen-SASL/Authen-SASL-2.170.0.ebuild
index 5b24538e8f9d..b4d2aa32432f 100644
--- a/dev-perl/Authen-SASL/Authen-SASL-2.170.0.ebuild
+++ b/dev-perl/Authen-SASL/Authen-SASL-2.170.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl SASL interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="kerberos"
 
 RDEPEND="
diff --git a/dev-perl/Authen-SASL/Authen-SASL-2.180.0.ebuild b/dev-perl/Authen-SASL/Authen-SASL-2.180.0.ebuild
index c8ce57233ae8..32558195ec80 100644
--- a/dev-perl/Authen-SASL/Authen-SASL-2.180.0.ebuild
+++ b/dev-perl/Authen-SASL/Authen-SASL-2.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl SASL interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="kerberos"
 
 RDEPEND="
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.280.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.280.0.ebuild
index 21460ec3182f..1b017e0a7a79 100644
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.280.0.ebuild
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Execute code after a scope finished compilation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Module-Implementation-0.50.0
diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r2.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r2.ebuild
index 41113d2a03db..457383a824ff 100644
--- a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r2.ebuild
+++ b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Wrap OP check callbacks"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="virtual/perl-parent"
 BDEPEND="
diff --git a/dev-perl/B-Keywords/B-Keywords-1.260.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.260.0.ebuild
index 80366cef3f01..ac9b9fe50ef4 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.260.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.260.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
 # GPL-2 - no later clause
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
 
diff --git a/dev-perl/B-Keywords/B-Keywords-1.270.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.270.0.ebuild
index db74d9c9b9f3..22467eb44a70 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.270.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.270.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
 # GPL-2 - no later clause
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 
 PERL_RM_FILES=(
 	"t/z_kwalitee.t"
diff --git a/dev-perl/B-Keywords/B-Keywords-1.280.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.280.0.ebuild
index 1cb1d1a87225..0d7119d77e65 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.280.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.280.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
 # GPL-2 - no later clause
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 PERL_RM_FILES=(
 	"t/z_kwalitee.t"
diff --git a/dev-perl/B-Keywords/B-Keywords-1.290.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.290.0.ebuild
index b3643f0ea47b..d782cf9d7ead 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.290.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.290.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
 # GPL-2 - no later clause
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 PERL_RM_FILES=(
 	"t/z_kwalitee.t"
diff --git a/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r3.ebuild b/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r3.ebuild
index 386d7c1e700f..21ef2426db10 100644
--- a/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r3.ebuild
+++ b/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl module for BSD process resource limit and priority functions"
 LICENSE="|| ( Artistic-2 LGPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
 
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r3.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r3.ebuild
index 497e2499a75a..84775eb46df3 100644
--- a/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r3.ebuild
+++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Efficient bit vector, set of integers and big int math library"
 # https://rt.cpan.org/Public/Bug/Display.html?id=132512
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Carp-Clan-5.300.0
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r4.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r4.ebuild
index c666f040ecd6..575c61774af9 100644
--- a/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r4.ebuild
+++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Efficient bit vector, set of integers and big int math library"
 # https://rt.cpan.org/Public/Bug/Display.html?id=132512
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Carp-Clan-5.300.0
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.160.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.160.0.ebuild
index fe96820f7c30..d5fcd49f3f4b 100644
--- a/dev-perl/CGI-Fast/CGI-Fast-2.160.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="CGI Interface for Fast CGI"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/CGI-4
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.170.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.170.0.ebuild
index 4e2281d9d266..d76dbdee74b3 100644
--- a/dev-perl/CGI-Fast/CGI-Fast-2.170.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.170.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="CGI Interface for Fast CGI"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/CGI-4
diff --git a/dev-perl/CGI/CGI-4.670.0.ebuild b/dev-perl/CGI/CGI-4.670.0.ebuild
index 8c4ee1bf4b38..16d7a936a503 100644
--- a/dev-perl/CGI/CGI-4.670.0.ebuild
+++ b/dev-perl/CGI/CGI-4.670.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Simple Common Gateway Interface Class"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/CGI/CGI-4.680.0.ebuild b/dev-perl/CGI/CGI-4.680.0.ebuild
index a98fd7540433..b824af9ce595 100644
--- a/dev-perl/CGI/CGI-4.680.0.ebuild
+++ b/dev-perl/CGI/CGI-4.680.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Simple Common Gateway Interface Class"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-0.820.0
diff --git a/dev-perl/CGI/CGI-4.690.0.ebuild b/dev-perl/CGI/CGI-4.690.0.ebuild
index a80a416db4c9..062fa67a84a5 100644
--- a/dev-perl/CGI/CGI-4.690.0.ebuild
+++ b/dev-perl/CGI/CGI-4.690.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Simple Common Gateway Interface Class"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-0.820.0
diff --git a/dev-perl/CGI/CGI-4.700.0.ebuild b/dev-perl/CGI/CGI-4.700.0.ebuild
index cc80139027c9..30944f85ae8e 100644
--- a/dev-perl/CGI/CGI-4.700.0.ebuild
+++ b/dev-perl/CGI/CGI-4.700.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Simple Common Gateway Interface Class"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-0.820.0
diff --git a/dev-perl/CPAN-Changes/CPAN-Changes-0.500.3.ebuild b/dev-perl/CPAN-Changes/CPAN-Changes-0.500.3.ebuild
index ecc581e9dd17..11496144704d 100644
--- a/dev-perl/CPAN-Changes/CPAN-Changes-0.500.3.ebuild
+++ b/dev-perl/CPAN-Changes/CPAN-Changes-0.500.3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read and write Changes files"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Module-Runtime
diff --git a/dev-perl/CPAN-Changes/CPAN-Changes-0.500.5.ebuild b/dev-perl/CPAN-Changes/CPAN-Changes-0.500.5.ebuild
index 83739794249d..92bab8f93742 100644
--- a/dev-perl/CPAN-Changes/CPAN-Changes-0.500.5.ebuild
+++ b/dev-perl/CPAN-Changes/CPAN-Changes-0.500.5.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read and write Changes files"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Module-Runtime
diff --git a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.140.0.ebuild b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.140.0.ebuild
index 91e7763ad683..b123cbff5c72 100644
--- a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.140.0.ebuild
+++ b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Write a CHECKSUMS file for a directory as on CPAN"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-perl/Compress-Bzip2
diff --git a/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r3.ebuild b/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r3.ebuild
index fff719b678cc..dc62621c9c02 100644
--- a/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r3.ebuild
+++ b/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r3.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Extract distribution name and version from a distribution filename"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.18.0.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.18.0.ebuild
index 7a803666a238..806418c3e400 100644
--- a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.18.0.ebuild
+++ b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.18.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Verify requirements in a CPAN::Meta object"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-CPAN-Meta-2.132.830
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
index d86428f5d09f..e3c1dedb518e 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Mem
 # Bug: https://bugs.gentoo.org/721730
 LICENSE="|| ( Artistic GPL-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Encode
diff --git a/dev-perl/Cairo/Cairo-1.109.0-r1.ebuild b/dev-perl/Cairo/Cairo-1.109.0-r1.ebuild
index 0002f781151d..1673dfa79e5d 100644
--- a/dev-perl/Cairo/Cairo-1.109.0-r1.ebuild
+++ b/dev-perl/Cairo/Cairo-1.109.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/cairo-1.0.0
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild
index 8e2e9c272c00..a6c4714f8ad9 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.500.0-r1.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.500.0-r1.ebuild
index 7ad4f5588d3b..9f31d292a2d6 100644
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.500.0-r1.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.500.0-r1.ebuild
@@ -12,4 +12,4 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS, or external programs"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Carp-Always/Carp-Always-0.160.0.ebuild b/dev-perl/Carp-Always/Carp-Always-0.160.0.ebuild
index bea2596feec3..3d0803628246 100644
--- a/dev-perl/Carp-Always/Carp-Always-0.160.0.ebuild
+++ b/dev-perl/Carp-Always/Carp-Always-0.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Warns and dies noisily with stack backtraces"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Carp-Assert-More/Carp-Assert-More-2.9.0.ebuild b/dev-perl/Carp-Assert-More/Carp-Assert-More-2.9.0.ebuild
index ebde5a995660..88e9878cb3d4 100644
--- a/dev-perl/Carp-Assert-More/Carp-Assert-More-2.9.0.ebuild
+++ b/dev-perl/Carp-Assert-More/Carp-Assert-More-2.9.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Convenience assertions for common situations"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
diff --git a/dev-perl/Carp-Assert/Carp-Assert-0.220.0.ebuild b/dev-perl/Carp-Assert/Carp-Assert-0.220.0.ebuild
index 4a10450ce045..7930ab12c660 100644
--- a/dev-perl/Carp-Assert/Carp-Assert-0.220.0.ebuild
+++ b/dev-perl/Carp-Assert/Carp-Assert-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Executable comments in carp"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Carp-Clan/Carp-Clan-6.80.0.ebuild b/dev-perl/Carp-Clan/Carp-Clan-6.80.0.ebuild
index b3a277caef51..2063db0e9bc7 100644
--- a/dev-perl/Carp-Clan/Carp-Clan-6.80.0.ebuild
+++ b/dev-perl/Carp-Clan/Carp-Clan-6.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Report errors from perspective of caller of a clan of modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-Accessor/Class-Accessor-0.510.0.ebuild b/dev-perl/Class-Accessor/Class-Accessor-0.510.0.ebuild
index b6cf8f6b7b76..5440abe4a342 100644
--- a/dev-perl/Class-Accessor/Class-Accessor-0.510.0.ebuild
+++ b/dev-perl/Class-Accessor/Class-Accessor-0.510.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Automated accessor generation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="dev-perl/Sub-Name"
diff --git a/dev-perl/Class-Autouse/Class-Autouse-2.10.0-r3.ebuild b/dev-perl/Class-Autouse/Class-Autouse-2.10.0-r3.ebuild
index d23ab6bdf2e9..5332006d5015 100644
--- a/dev-perl/Class-Autouse/Class-Autouse-2.10.0-r3.ebuild
+++ b/dev-perl/Class-Autouse/Class-Autouse-2.10.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Runtime aspect loading of one or more classes"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.100.0.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.100.0.ebuild
index 1cd7a6233773..24925d10d5be 100644
--- a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.100.0.ebuild
+++ b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.100.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Inheritable, overridable class data"
 # License note: Artistic only for one file
 # https://rt.cpan.org/Public/Bug/Display.html?id=132835
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PERL_RM_FILES=(
 	t/pod.t
diff --git a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0-r1.ebuild b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0-r1.ebuild
index 5e227bc97920..51672a3edf0c 100644
--- a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0-r1.ebuild
+++ b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Automated accessor generation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
diff --git a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r3.ebuild b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r3.ebuild
index 23b88e096da6..b945b6619ccf 100644
--- a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r3.ebuild
+++ b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide utility methods for factory classes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild b/dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild
index dbb516e8709d..b13d20b857ac 100644
--- a/dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild
+++ b/dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provides information about Classes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0-r2.ebuild b/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0-r2.ebuild
index b3e4e2a18e11..9b7cbeafc0a4 100644
--- a/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0-r2.ebuild
+++ b/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="XS implementation of parts of Class::Load"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Class-Load-0.200.0
diff --git a/dev-perl/Class-Load/Class-Load-0.250.0.ebuild b/dev-perl/Class-Load/Class-Load-0.250.0.ebuild
index 65c0eca25798..5f6a75a9c5e0 100644
--- a/dev-perl/Class-Load/Class-Load-0.250.0.ebuild
+++ b/dev-perl/Class-Load/Class-Load-0.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Working (require q{Class::Name}) and more"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-Loader/Class-Loader-2.30.0-r2.ebuild b/dev-perl/Class-Loader/Class-Loader-2.30.0-r2.ebuild
index 3e9c556c3676..bbcc867b2807 100644
--- a/dev-perl/Class-Loader/Class-Loader-2.30.0-r2.ebuild
+++ b/dev-perl/Class-Loader/Class-Loader-2.30.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Load modules and create objects on demand"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
diff --git a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.150.0.ebuild b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.150.0.ebuild
index 57f4e3a10999..e0e7a7828747 100644
--- a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.150.0.ebuild
+++ b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provides Moose-like method modifiers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r3.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r3.ebuild
index f55e7d4f651e..7c7c601cbd0f 100644
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r3.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r3.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Create generic methods for OO Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild b/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
index 6a9a8b15e696..703114985b7e 100644
--- a/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
+++ b/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Implementation of a Singleton class"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
diff --git a/dev-perl/Class-Tiny/Class-Tiny-1.8.0.ebuild b/dev-perl/Class-Tiny/Class-Tiny-1.8.0.ebuild
index bc780348d128..5770055de1e7 100644
--- a/dev-perl/Class-Tiny/Class-Tiny-1.8.0.ebuild
+++ b/dev-perl/Class-Tiny/Class-Tiny-1.8.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Minimalist class construction"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 LICENSE="Apache-2.0"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/Class-Trigger/Class-Trigger-0.150.0.ebuild b/dev-perl/Class-Trigger/Class-Trigger-0.150.0.ebuild
index 52638344c718..e44fb9884d44 100644
--- a/dev-perl/Class-Trigger/Class-Trigger-0.150.0.ebuild
+++ b/dev-perl/Class-Trigger/Class-Trigger-0.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Mixin to add / call inheritable triggers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Color-Library/Color-Library-0.21.0-r2.ebuild b/dev-perl/Color-Library/Color-Library-0.21.0-r2.ebuild
index f909cadd64d5..0eb50546da20 100644
--- a/dev-perl/Color-Library/Color-Library-0.21.0-r2.ebuild
+++ b/dev-perl/Color-Library/Color-Library-0.21.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An easy-to-use and comprehensive named-color library"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.280.0-r1.ebuild b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.280.0-r1.ebuild
index f7308ae10781..6c925a41c0ff 100644
--- a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.280.0-r1.ebuild
+++ b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.280.0-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Interface to Bzip2 compression library"
 # https://bugs.gentoo.org/718946#c7
 LICENSE="|| ( Artistic GPL-1+ ) BZIP2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~mips ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-arch/bzip2
diff --git a/dev-perl/Config-General/Config-General-2.670.0.ebuild b/dev-perl/Config-General/Config-General-2.670.0.ebuild
index 7ec83313dc65..303cc4f5fb18 100644
--- a/dev-perl/Config-General/Config-General-2.670.0.ebuild
+++ b/dev-perl/Config-General/Config-General-2.670.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Config file parser module"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild b/dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild
index d43d93b8f5d1..89b65f25b8c4 100644
--- a/dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild
+++ b/dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Simple configuration file class"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.300.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.300.0.ebuild
index 7c5018e75fb7..d2de5727215f 100644
--- a/dev-perl/Config-Tiny/Config-Tiny-2.300.0.ebuild
+++ b/dev-perl/Config-Tiny/Config-Tiny-2.300.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Read/Write .ini style files with as little code as possible"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-3.300.0
diff --git a/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild b/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
index afc7fc8289a5..d9432c456311 100644
--- a/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
+++ b/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Facility for creating read-only scalars, arrays, and hashes"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r2.ebuild b/dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r2.ebuild
index b4d43fbfca60..b9ca35831d3b 100644
--- a/dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r2.ebuild
+++ b/dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert binary octets into ASCII armoured messages"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
 
 RDEPEND="virtual/perl-IO-Compress
 	virtual/perl-Digest-MD5
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.340.0.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.340.0.ebuild
index 474d2fe07d34..76f609e24a9d 100644
--- a/dev-perl/Convert-ASN1/Convert-ASN1-0.340.0.ebuild
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.340.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Standard en/decode of ASN.1 structures"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Convert-PEM/Convert-PEM-0.130.0.ebuild b/dev-perl/Convert-PEM/Convert-PEM-0.130.0.ebuild
index f2620b618dac..5cd642ef09bf 100644
--- a/dev-perl/Convert-PEM/Convert-PEM-0.130.0.ebuild
+++ b/dev-perl/Convert-PEM/Convert-PEM-0.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read/write encrypted ASN.1 PEM files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-perl/Class-ErrorHandler
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.800.0.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.800.0.ebuild
index 9536121a4114..a8cff7be8231 100644
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.800.0.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.800.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="decode uu/xx/b64/mime/yenc/etc-encoded data"
 # https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Convert-UUlib#Licensing
 LICENSE="BSD CC0-1.0 GPL-1 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~m68k ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~m68k ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.390.0-r2.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.390.0-r2.ebuild
index 1c72cfd5dce1..b88f7e574054 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.390.0-r2.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.390.0-r2.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Math-BigInt-1.160.0
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.400.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.400.0.ebuild
index 247e713c6030..305b64ca6737 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.400.0.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.400.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Math-BigInt-1.160.0
diff --git a/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r2.ebuild b/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r2.ebuild
index 27ff7536adf3..36c2dbadc8f0 100644
--- a/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r2.ebuild
+++ b/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl Blowfish encryption module"
 
 LICENSE="Crypt-IDEA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-CAST5_PP/Crypt-CAST5_PP-1.40.0-r2.ebuild b/dev-perl/Crypt-CAST5_PP/Crypt-CAST5_PP-1.40.0-r2.ebuild
index a4cf24ee2adb..c552a56950b3 100644
--- a/dev-perl/Crypt-CAST5_PP/Crypt-CAST5_PP-1.40.0-r2.ebuild
+++ b/dev-perl/Crypt-CAST5_PP/Crypt-CAST5_PP-1.40.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="CAST5 block cipher in pure Perl"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r3.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r3.ebuild
index 09c8f87517ee..3f76a42af17d 100644
--- a/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r3.ebuild
+++ b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r3.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r3.ebuild b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r3.ebuild
index 0ef25697f22b..8a73d529fa27 100644
--- a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r3.ebuild
+++ b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl DES encryption module"
 
 LICENSE="DES"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.30.0.ebuild b/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.30.0.ebuild
index 2bbfc30a18fa..6bef6f27d556 100644
--- a/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.30.0.ebuild
+++ b/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Triple-DES EDE encryption/decryption"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="dev-perl/Crypt-DES"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r2.ebuild b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r2.ebuild
index 69d82a1df690..027039f86ce5 100644
--- a/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r2.ebuild
+++ b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An implementation of the IDEA symmetric-key block cipher"
 
 LICENSE="Crypt-IDEA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild
index 0fdd6eae9cc3..5f22ae0e12c3 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="OpenSSL's multiprecision integer arithmetic"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-libs/openssl:0=
diff --git a/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild
index 3122c87d633a..b02ee9ed1e86 100644
--- a/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild
+++ b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provable Prime Number Generator suitable for Cryptographic Applications"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/Math-Pari-2.1.804
diff --git a/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild b/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild
index 123df7932bbc..50348b29e2d7 100644
--- a/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild
+++ b/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Implements the RC4 encryption algorithm"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild
index 304f336bb643..bc4c120be2d6 100644
--- a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild
+++ b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the RIPEMD-160 Hash function"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-Random/Crypt-Random-1.520.0-r1.ebuild b/dev-perl/Crypt-Random/Crypt-Random-1.520.0-r1.ebuild
index 204816f9cabd..4952e179f4f7 100644
--- a/dev-perl/Crypt-Random/Crypt-Random-1.520.0-r1.ebuild
+++ b/dev-perl/Crypt-Random/Crypt-Random-1.520.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cryptographically Secure, True Random Number Generator"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild
index 7e28b12a0bba..5e17d80d20db 100644
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r4.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r4.ebuild
index 4574ade0a2db..9db420f9cf37 100644
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r4.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="OpenSSL support for LWP"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0-r1.ebuild b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0-r1.ebuild
index 425b55aa3da6..596736254018 100644
--- a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0-r1.ebuild
+++ b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Twofish Encryption Algorithm"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.180.0-configure-clang16.patch
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.18.0-r1.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.18.0-r1.ebuild
index 159287edbb34..e0518b605e6a 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.18.0-r1.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.18.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/DBI-1.614.0
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.760.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.760.0.ebuild
index 1edba2dfda97..289b6d391684 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.760.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.760.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="system-sqlite"
 
 # Please read https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-SQLite
diff --git a/dev-perl/DBI/DBI-1.647.0.ebuild b/dev-perl/DBI/DBI-1.647.0.ebuild
index 8d3bb4081fc5..b9f178385b64 100644
--- a/dev-perl/DBI/DBI-1.647.0.ebuild
+++ b/dev-perl/DBI/DBI-1.647.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Database independent interface for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/PlRPC-0.200.0
diff --git a/dev-perl/Data-Buffer/Data-Buffer-0.60.0.ebuild b/dev-perl/Data-Buffer/Data-Buffer-0.60.0.ebuild
index 801184fd2b1d..4d5be1116dd5 100644
--- a/dev-perl/Data-Buffer/Data-Buffer-0.60.0.ebuild
+++ b/dev-perl/Data-Buffer/Data-Buffer-0.60.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Read/write buffer class"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
diff --git a/dev-perl/Data-Compare/Data-Compare-1.290.0.ebuild b/dev-perl/Data-Compare/Data-Compare-1.290.0.ebuild
index 7cbd5866e1a7..200b8d99baac 100644
--- a/dev-perl/Data-Compare/Data-Compare-1.290.0.ebuild
+++ b/dev-perl/Data-Compare/Data-Compare-1.290.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Compare perl data structures"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/Clone-0.430.0
diff --git a/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild b/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
index 8d26e970d1bc..ee243a3af2b7 100644
--- a/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
+++ b/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pretty printing of data structures"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-MIME-Base64
diff --git a/dev-perl/Data-Hexify/Data-Hexify-1.0.0-r2.ebuild b/dev-perl/Data-Hexify/Data-Hexify-1.0.0-r2.ebuild
index f0d233f4453f..e571945d79e4 100644
--- a/dev-perl/Data-Hexify/Data-Hexify-1.0.0-r2.ebuild
+++ b/dev-perl/Data-Hexify/Data-Hexify-1.0.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 
 DESCRIPTION="Perl extension for hexdumping arbitrary data"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~mips x86"
diff --git a/dev-perl/Data-Hierarchy/Data-Hierarchy-0.340.0-r2.ebuild b/dev-perl/Data-Hierarchy/Data-Hierarchy-0.340.0-r2.ebuild
index 1875902a69d1..79dfa80b3f66 100644
--- a/dev-perl/Data-Hierarchy/Data-Hierarchy-0.340.0-r2.ebuild
+++ b/dev-perl/Data-Hierarchy/Data-Hierarchy-0.340.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handle data in a hierarchical structure"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Data-OptList/Data-OptList-0.114.0.ebuild b/dev-perl/Data-OptList/Data-OptList-0.114.0.ebuild
index 3fdb3d9d1e0f..b24063e9146d 100644
--- a/dev-perl/Data-OptList/Data-OptList-0.114.0.ebuild
+++ b/dev-perl/Data-OptList/Data-OptList-0.114.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and validate simple name/value option pairs"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Sub-Install-0.921.0
diff --git a/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild b/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild
index 6f0770503318..163f56db6eb1 100644
--- a/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild
+++ b/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base classes wrapping fundamental Perl data types"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ~riscv x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Data-UUID/Data-UUID-1.227.0.ebuild b/dev-perl/Data-UUID/Data-UUID-1.227.0.ebuild
index af19c8a84acb..f2939bce2056 100644
--- a/dev-perl/Data-UUID/Data-UUID-1.227.0.ebuild
+++ b/dev-perl/Data-UUID/Data-UUID-1.227.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	virtual/perl-Digest-MD5
diff --git a/dev-perl/Date-Calc/Date-Calc-6.400.0-r2.ebuild b/dev-perl/Date-Calc/Date-Calc-6.400.0-r2.ebuild
index 461a8b8fe239..428f2df9f1e0 100644
--- a/dev-perl/Date-Calc/Date-Calc-6.400.0-r2.ebuild
+++ b/dev-perl/Date-Calc/Date-Calc-6.400.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Gregorian calendar date calculations"
 
 LICENSE="|| ( Artistic GPL-1+ ) LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Bit-Vector-7.400.0
diff --git a/dev-perl/Date-Manip/Date-Manip-6.970.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.970.0.ebuild
index 93b1f78646cb..d4ed210d1ae1 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.970.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.970.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl date manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	elibc_musl? ( sys-libs/timezone-data )
diff --git a/dev-perl/Date-Manip/Date-Manip-6.980.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.980.0.ebuild
index d88f632bbfa7..e37eed2e86bd 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.980.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.980.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl date manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	elibc_musl? ( sys-libs/timezone-data )
diff --git a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild
index 994573b9fe86..f8af62a9feaa 100644
--- a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.790.0-r1.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.790.0-r1.ebuild
index 3a2a0a70b274..f52c0c7aefd9 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.790.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.790.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/DateTime-1
diff --git a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0-r1.ebuild b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0-r1.ebuild
index 5522534f1273..5e5910484cb7 100644
--- a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format W3CDTF datetime strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~x64-macos"
 
 RDEPEND="
 	dev-perl/DateTime
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.440.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.440.0.ebuild
index bcd2712c451c..08ecb30ac12c 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.440.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.440.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-1+ ) unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.450.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.450.0.ebuild
index 29709f92fcca..0f83ab3aed0a 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.450.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.450.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-1+ ) unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Dist-CheckConflicts-0.20.0
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.640.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.640.0.ebuild
index fc247496b510..134b4af692dd 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.640.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.640.0.ebuild
@@ -13,7 +13,7 @@ inherit perl-module
 DESCRIPTION="Time zone object base class and factory"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Class-Singleton-1.30.0
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.650.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.650.0.ebuild
index fce12b4b9c41..d60ea36c9313 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.650.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.650.0.ebuild
@@ -13,7 +13,7 @@ inherit perl-module
 DESCRIPTION="Time zone object base class and factory"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Class-Singleton-1.30.0
diff --git a/dev-perl/DateTime/DateTime-1.660.0-r1.ebuild b/dev-perl/DateTime/DateTime-1.660.0-r1.ebuild
index 2dec49228afb..1d07322ed4a7 100644
--- a/dev-perl/DateTime/DateTime-1.660.0-r1.ebuild
+++ b/dev-perl/DateTime/DateTime-1.660.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Date and time object"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 CONFLICTS="
 	!<=dev-perl/DateTime-Format-Mail-0.402.0
diff --git a/dev-perl/DelimMatch/DelimMatch-1.60.0-r3.ebuild b/dev-perl/DelimMatch/DelimMatch-1.60.0-r3.ebuild
index 43b487bb7e97..500a26e158f5 100644
--- a/dev-perl/DelimMatch/DelimMatch-1.60.0-r3.ebuild
+++ b/dev-perl/DelimMatch/DelimMatch-1.60.0-r3.ebuild
@@ -9,6 +9,6 @@ inherit perl-module
 
 DESCRIPTION="A Perl 5 module for locating delimited substrings with proper nesting"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 
 S="${WORKDIR}/${DIST_P%%a}"
diff --git a/dev-perl/Devel-CallChecker/Devel-CallChecker-0.9.0.ebuild b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.9.0.ebuild
index 3f4a93f79ecd..d2f621fe4f83 100644
--- a/dev-perl/Devel-CallChecker/Devel-CallChecker-0.9.0.ebuild
+++ b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.9.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Custom OP checking attached to subroutines"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/DynaLoader-Functions-0.1.0
diff --git a/dev-perl/Devel-Caller/Devel-Caller-2.70.0.ebuild b/dev-perl/Devel-Caller/Devel-Caller-2.70.0.ebuild
index 23dbd4d99ef8..084dff923b5a 100644
--- a/dev-perl/Devel-Caller/Devel-Caller-2.70.0.ebuild
+++ b/dev-perl/Devel-Caller/Devel-Caller-2.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Meatier versions of caller"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/PadWalker-0.80.0
diff --git a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0-r1.ebuild b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0-r1.ebuild
index 51cd6f5ee62a..4336d02dcaca 100644
--- a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0-r1.ebuild
+++ b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="check that a command is available"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.160.0-r1.ebuild b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.160.0-r1.ebuild
index 7004a10d251d..bac5e9eeb133 100644
--- a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.160.0-r1.ebuild
+++ b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.160.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check that a library is available"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r2.ebuild b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r2.ebuild
index f5b49e9ea121..b5f1258d7eb2 100644
--- a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r2.ebuild
+++ b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Find memory cycles in objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0-r1.ebuild b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0-r1.ebuild
index 70384b14d232..e7844ab04e86 100644
--- a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0-r1.ebuild
+++ b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.140.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION='Returns the equivalent of ${^GLOBAL_PHASE} eq DESTRUCT for older perls'
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Sub-Exporter-Progressive-0.1.11
diff --git a/dev-perl/Devel-Hide/Devel-Hide-0.1.500.ebuild b/dev-perl/Devel-Hide/Devel-Hide-0.1.500.ebuild
index 4e37afd6cf4f..7b9d55d183c8 100644
--- a/dev-perl/Devel-Hide/Devel-Hide-0.1.500.ebuild
+++ b/dev-perl/Devel-Hide/Devel-Hide-0.1.500.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Forces the unavailability of specified Perl modules (for testing)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Temp
diff --git a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0-r2.ebuild b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0-r2.ebuild
index b893f347c55e..a10240224a9d 100644
--- a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0-r2.ebuild
+++ b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Alias lexical variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Devel-Caller-0.30.0
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0-r1.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0-r1.ebuild
index 9195a9c1623e..2962540aa16f 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0-r1.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.8.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.8.0.ebuild
index 2513e848add1..fe1b8ad9f8c9 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.8.0.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.8.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-perl/MRO-Compat
diff --git a/dev-perl/Devel-Size/Devel-Size-0.840.0.ebuild b/dev-perl/Devel-Size/Devel-Size-0.840.0.ebuild
index 5f92816c2727..53d61c49e530 100644
--- a/dev-perl/Devel-Size/Devel-Size-0.840.0.ebuild
+++ b/dev-perl/Devel-Size/Devel-Size-0.840.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for finding the memory usage of Perl variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~x64-macos"
 
 src_compile() {
 	mymake=(
diff --git a/dev-perl/Devel-Size/Devel-Size-0.850.0.ebuild b/dev-perl/Devel-Size/Devel-Size-0.850.0.ebuild
index 572b58e0a2bf..e8f35adf71f8 100644
--- a/dev-perl/Devel-Size/Devel-Size-0.850.0.ebuild
+++ b/dev-perl/Devel-Size/Devel-Size-0.850.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Perl extension for finding the memory usage of Perl variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~x64-macos"
diff --git a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.40.0-r1.ebuild b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.40.0-r1.ebuild
index 6f80320626c3..63e702732de0 100644
--- a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.40.0-r1.ebuild
+++ b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.40.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An object representing a stack trace"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.50.0.ebuild b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.50.0.ebuild
index 426df6982372..94a8d16c5daf 100644
--- a/dev-perl/Devel-StackTrace/Devel-StackTrace-2.50.0.ebuild
+++ b/dev-perl/Devel-StackTrace/Devel-StackTrace-2.50.0.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="An object representing a stack trace"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0-r2.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0-r2.ebuild
index a00f5a2c56c1..892701de16a8 100644
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0-r2.ebuild
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Dump symbol names or the symbol table"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PERL_RM_FILES=(
 	t/podcover.t
diff --git a/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r3.ebuild b/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r3.ebuild
index 062781ae774e..52ba4d368e5a 100644
--- a/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r3.ebuild
+++ b/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create bubble-babble fingerprints"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.240.0.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.240.0.ebuild
index 5a5d70ea4c88..f6008641ea9c 100644
--- a/dev-perl/Digest-CRC/Digest-CRC-0.240.0.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generic CRC functions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r3.ebuild b/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r3.ebuild
index e7a2abd012eb..57c14df79b03 100644
--- a/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r3.ebuild
+++ b/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r3.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl interface to the GOST R 34.11-94 digest algorithm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.50.0.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.50.0.ebuild
index d8a0f1e606cc..9b8349dfca14 100644
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.50.0.ebuild
+++ b/dev-perl/Digest-HMAC/Digest-HMAC-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keyed Hashing for Message Authentication"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Digest-MD5-2.0.0
diff --git a/dev-perl/Digest-MD2/Digest-MD2-2.40.0-r2.ebuild b/dev-perl/Digest-MD2/Digest-MD2-2.40.0-r2.ebuild
index 8e006ee39b54..9bb455343c40 100644
--- a/dev-perl/Digest-MD2/Digest-MD2-2.40.0-r2.ebuild
+++ b/dev-perl/Digest-MD2/Digest-MD2-2.40.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to the MD2 Algorithm"
 LICENSE="|| ( Artistic GPL-1+ ) RSA"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 
 src_compile() {
 	mymake=(
diff --git a/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.60.0-r5.ebuild b/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.60.0-r5.ebuild
index 0afa3ddf89e3..9499bd79b7bf 100644
--- a/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.60.0-r5.ebuild
+++ b/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.60.0-r5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Perl version of Nilsimsa code"
 LICENSE="GPL-2+ LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.60.0-clang16.patch
diff --git a/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0-r2.ebuild b/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0-r2.ebuild
index b574679aba08..1e5e141bee10 100644
--- a/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0-r2.ebuild
+++ b/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Pure perl implementation of MD5"
 LICENSE="|| ( Artistic GPL-1+ ) RSA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r3.ebuild b/dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r3.ebuild
index bf5113dd52a5..9a6f91f66da7 100644
--- a/dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r3.ebuild
+++ b/dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="NIST SHA message digest algorithm"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Digest-1.0.0
diff --git a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0-r1.ebuild b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0-r1.ebuild
index fb726c1b8918..e53548f3b430 100644
--- a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0-r1.ebuild
+++ b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Declare version conflicts for your dist"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0-r1.ebuild b/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0-r1.ebuild
index 252d007e213c..a5db5339c788 100644
--- a/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0-r1.ebuild
+++ b/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Information about a perl module distribution"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=virtual/perl-Archive-Tar-1.0.0
diff --git a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.4.0-r1.ebuild b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.4.0-r1.ebuild
index 1d6ed97a6f3c..2a339108cd07 100644
--- a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.4.0-r1.ebuild
+++ b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.4.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Deconstructed Dynamic C Library Loading"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	dev-perl/Module-Build
diff --git a/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild b/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
index 68077b8baf6c..0d2318ba4004 100644
--- a/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
+++ b/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and format RFC 2822 email addresses and groups"
 
 LICENSE="|| ( Artistic GPL-1+ ) MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Address/Email-Address-1.913.0.ebuild b/dev-perl/Email-Address/Email-Address-1.913.0.ebuild
index 1454560ffe66..ee32d10ed7b4 100644
--- a/dev-perl/Email-Address/Email-Address-1.913.0.ebuild
+++ b/dev-perl/Email-Address/Email-Address-1.913.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="RFC 2822 Address Parsing and Creation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Email-Date-Format/Email-Date-Format-1.8.0.ebuild b/dev-perl/Email-Date-Format/Email-Date-Format-1.8.0.ebuild
index 900402642b6c..82fb75c0a835 100644
--- a/dev-perl/Email-Date-Format/Email-Date-Format-1.8.0.ebuild
+++ b/dev-perl/Email-Date-Format/Email-Date-Format-1.8.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Produce RFC 822 date strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Email-Find/Email-Find-0.100.0-r3.ebuild b/dev-perl/Email-Find/Email-Find-0.100.0-r3.ebuild
index 1fcf0b4ab5d1..ddc1dfa2e98f 100644
--- a/dev-perl/Email-Find/Email-Find-0.100.0-r3.ebuild
+++ b/dev-perl/Email-Find/Email-Find-0.100.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find RFC 822 email addresses in plain text"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Email-Valid-0.179.0
diff --git a/dev-perl/Email-Valid/Email-Valid-1.204.0.ebuild b/dev-perl/Email-Valid/Email-Valid-1.204.0.ebuild
index aa97dbc2bfe6..618c00b96d90 100644
--- a/dev-perl/Email-Valid/Email-Valid-1.204.0.ebuild
+++ b/dev-perl/Email-Valid/Email-Valid-1.204.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Check validity of Internet email addresses"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Capture-Tiny
diff --git a/dev-perl/Encode-Detect/Encode-Detect-1.10.0-r3.ebuild b/dev-perl/Encode-Detect/Encode-Detect-1.10.0-r3.ebuild
index 7926d3db63b2..a68fa18df215 100644
--- a/dev-perl/Encode-Detect/Encode-Detect-1.10.0-r3.ebuild
+++ b/dev-perl/Encode-Detect/Encode-Detect-1.10.0-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An Encode::Encoding subclass that detects the encoding of data"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="dev-perl/Module-Build"
 BDEPEND="
diff --git a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0-r2.ebuild b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0-r2.ebuild
index b2d7e6ed4f71..80f6099da245 100644
--- a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0-r2.ebuild
+++ b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An eucJP-open mapping"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Encode-1.140.0
diff --git a/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r4.ebuild b/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r4.ebuild
index 28daa7b57902..26c0b0660454 100644
--- a/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r4.ebuild
+++ b/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra sets of Chinese encodings"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Encode-1.410.0
diff --git a/dev-perl/Encode-Locale/Encode-Locale-1.50.0-r1.ebuild b/dev-perl/Encode-Locale/Encode-Locale-1.50.0-r1.ebuild
index 255079c0efd2..d305d3b8af9b 100644
--- a/dev-perl/Encode-Locale/Encode-Locale-1.50.0-r1.ebuild
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.50.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine the locale encoding"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=virtual/perl-Encode-2.0.0"
 DEPEND="${RDEPEND}
diff --git a/dev-perl/Error/Error-0.170.300-r1.ebuild b/dev-perl/Error/Error-0.170.300-r1.ebuild
index c3172d462da8..760c1f3c6baa 100644
--- a/dev-perl/Error/Error-0.170.300-r1.ebuild
+++ b/dev-perl/Error/Error-0.170.300-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Error/exception handling in an OO-ish way"
 
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	dev-perl/Module-Build
diff --git a/dev-perl/Eval-Closure/Eval-Closure-0.140.0-r1.ebuild b/dev-perl/Eval-Closure/Eval-Closure-0.140.0-r1.ebuild
index f3fc353bfa59..0fc7b5b33600 100644
--- a/dev-perl/Eval-Closure/Eval-Closure-0.140.0-r1.ebuild
+++ b/dev-perl/Eval-Closure/Eval-Closure-0.140.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="safely and cleanly create closures via string eval"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Exception-Class/Exception-Class-1.450.0-r1.ebuild b/dev-perl/Exception-Class/Exception-Class-1.450.0-r1.ebuild
index 8fd997aaaa8a..cc418b1a21e0 100644
--- a/dev-perl/Exception-Class/Exception-Class-1.450.0-r1.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.450.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Module that allows you to declare real exception classes in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Class-Data-Inheritable-0.20.0
diff --git a/dev-perl/Expect/Expect-1.380.0.ebuild b/dev-perl/Expect/Expect-1.380.0.ebuild
index 7b71b3484a77..517a8ab4af9d 100644
--- a/dev-perl/Expect/Expect-1.380.0.ebuild
+++ b/dev-perl/Expect/Expect-1.380.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Expect for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Exporter-Lite/Exporter-Lite-0.90.0.ebuild b/dev-perl/Exporter-Lite/Exporter-Lite-0.90.0.ebuild
index ec36d7f0bda9..755948eabd5b 100644
--- a/dev-perl/Exporter-Lite/Exporter-Lite-0.90.0.ebuild
+++ b/dev-perl/Exporter-Lite/Exporter-Lite-0.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lightweight exporting of variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.6.2.ebuild b/dev-perl/Exporter-Tiny/Exporter-Tiny-1.6.2.ebuild
index 99b7e6705250..b123404a04f0 100644
--- a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.6.2.ebuild
+++ b/dev-perl/Exporter-Tiny/Exporter-Tiny-1.6.2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An exporter with the features of Sub::Exporter but only core dependencies"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
diff --git a/dev-perl/ExtUtils-AutoInstall/ExtUtils-AutoInstall-0.640.0-r1.ebuild b/dev-perl/ExtUtils-AutoInstall/ExtUtils-AutoInstall-0.640.0-r1.ebuild
index 220416f0495e..f7a2d75f6e8b 100644
--- a/dev-perl/ExtUtils-AutoInstall/ExtUtils-AutoInstall-0.640.0-r1.ebuild
+++ b/dev-perl/ExtUtils-AutoInstall/ExtUtils-AutoInstall-0.640.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automatic installation of dependencies via CPAN from within Makefile.PL"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 
 RDEPEND="
 	dev-perl/Sort-Versions
diff --git a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.120.0-r1.ebuild b/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.120.0-r1.ebuild
index e80d490ce5df..6406678983ce 100644
--- a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.120.0-r1.ebuild
+++ b/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.120.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Configure-time utilities for using C headers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-ExtUtils-CBuilder
diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.10.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.10.0.ebuild
index b11ce9c52617..d03f92597bca 100644
--- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.10.0.ebuild
+++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.10.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Wrapper for perl's configuration"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Data-Dumper
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100-r1.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100-r1.ebuild
index e028cd7230ad..d33790910913 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100-r1.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-7.440.0
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.200.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.200.ebuild
index 7a125799bca3..f56e3ddf2dee 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.200.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.200.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-7.440.0
diff --git a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0-r1.ebuild b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0-r1.ebuild
index 81caa564acef..4bf2030c2e69 100644
--- a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0-r1.ebuild
+++ b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Simple interface to F77 libs"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-perl/File-Which
diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.28.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.28.0.ebuild
index ed44f2adb7d7..765d1918abc9 100644
--- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.28.0.ebuild
+++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.28.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Various portability utilities for module builders"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.13.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.13.0.ebuild
index 510555a194d3..60ddd05438f1 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.13.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.13.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Build.PL install path logic made easy"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.14.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.14.0.ebuild
index ca648293c47d..74b7dc77804a 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.14.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.14.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Build.PL install path logic made easy"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/ExtUtils-Config-0.9.0
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.15.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.15.0.ebuild
index 2708076dd457..e412fd73681a 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.15.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.15.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Build.PL install path logic made easy"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/ExtUtils-Config-0.9.0
diff --git a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0-r1.ebuild b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0-r1.ebuild
index b63ca69d4291..f259b67fb44f 100644
--- a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0-r1.ebuild
+++ b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Simplistic perl interface to pkg-config"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.310.0-r1.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.310.0-r1.ebuild
index 57c48dd6dc67..3cdf7d51848c 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.310.0-r1.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.310.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Check that a library is available for FFI"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-perl/File-Which
diff --git a/dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild b/dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild
index b417892c5e1c..9a941c9e7e63 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the Freedesktop.org base directory specification"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0-r1.ebuild b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0-r1.ebuild
index 60154aeeb359..47f5ccf2f37c 100644
--- a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0-r1.ebuild
+++ b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Object to handle .desktop files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0-r1.ebuild b/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0-r1.ebuild
index 957163e16fb9..d824434b0ac7 100644
--- a/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0-r1.ebuild
+++ b/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Alternative interface to File::Find"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/File-Find-Rule/File-Find-Rule-0.350.0.ebuild b/dev-perl/File-Find-Rule/File-Find-Rule-0.350.0.ebuild
index 2a17e3a4ddb7..bbc278e9560b 100644
--- a/dev-perl/File-Find-Rule/File-Find-Rule-0.350.0.ebuild
+++ b/dev-perl/File-Find-Rule/File-Find-Rule-0.350.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Alternative interface to File::Find"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Number-Compare
diff --git a/dev-perl/File-Flat/File-Flat-1.70.0-r1.ebuild b/dev-perl/File-Flat/File-Flat-1.70.0-r1.ebuild
index 7786307bec1f..279ff5a82489 100644
--- a/dev-perl/File-Flat/File-Flat-1.70.0-r1.ebuild
+++ b/dev-perl/File-Flat/File-Flat-1.70.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Implements a flat filesystem"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
 
 RDEPEND="
 	>=dev-perl/File-Copy-Recursive-0.350.0
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.6.0-r1.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.6.0-r1.ebuild
index 451d8a983ba5..70c574846a92 100644
--- a/dev-perl/File-HomeDir/File-HomeDir-1.6.0-r1.ebuild
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.6.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get home directory for self or other user"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+xdg"
 
 RDEPEND="
diff --git a/dev-perl/File-Listing/File-Listing-6.160.0.ebuild b/dev-perl/File-Listing/File-Listing-6.160.0.ebuild
index 6b47ea7f5eee..926bab78bee0 100644
--- a/dev-perl/File-Listing/File-Listing-6.160.0.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Map/File-Map-0.710.0.ebuild b/dev-perl/File-Map/File-Map-0.710.0.ebuild
index 097df550902b..83a03ed80eac 100644
--- a/dev-perl/File-Map/File-Map-0.710.0.ebuild
+++ b/dev-perl/File-Map/File-Map-0.710.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Memory mapping made simple and safe"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86"
 
 RDEPEND="
 	>=dev-perl/Sub-Exporter-Progressive-0.1.5
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.330.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.330.0.ebuild
index b1fb95847d98..4820cb7dd22b 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.330.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.330.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine file type"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.350.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.350.0.ebuild
index af76407fa7df..2d6b8dc7ee34 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.350.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.350.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine file type"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-perl/Encode-Locale
diff --git a/dev-perl/File-Next/File-Next-1.180.0-r2.ebuild b/dev-perl/File-Next/File-Next-1.180.0-r2.ebuild
index 47d28669e59e..7870df19bb24 100644
--- a/dev-perl/File-Next/File-Next-1.180.0-r2.ebuild
+++ b/dev-perl/File-Next/File-Next-1.180.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An iterator-based module for finding files"
 
 LICENSE="Artistic-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~riscv x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/File-Pid/File-Pid-1.10.ebuild b/dev-perl/File-Pid/File-Pid-1.10.ebuild
index e56d2ce76138..9495db8d7797 100644
--- a/dev-perl/File-Pid/File-Pid-1.10.ebuild
+++ b/dev-perl/File-Pid/File-Pid-1.10.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Pid File Manipulation"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/File-Remove/File-Remove-1.610.0.ebuild b/dev-perl/File-Remove/File-Remove-1.610.0.ebuild
index 6c3299e31762..4af6039b8b61 100644
--- a/dev-perl/File-Remove/File-Remove-1.610.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.610.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Remove files and directories"
 
 LICENSE="|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Path
diff --git a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.140.0.ebuild b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.140.0.ebuild
index 034df092fc2e..5f923ba14766 100644
--- a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.140.0.ebuild
+++ b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.140.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Install shared files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.118.0-r1.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.118.0-r1.ebuild
index 6443b5ab856c..2e72429c8dc7 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.118.0-r1.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.118.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r2.ebuild b/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r2.ebuild
index 4d6165789f49..3572704c7de3 100644
--- a/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r2.ebuild
+++ b/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple, sane and efficient file slurper"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/File-Slurp/File-Slurp-9999.320.0-r1.ebuild b/dev-perl/File-Slurp/File-Slurp-9999.320.0-r1.ebuild
index c34c0436409b..ec0ac5fe7ed2 100644
--- a/dev-perl/File-Slurp/File-Slurp-9999.320.0-r1.ebuild
+++ b/dev-perl/File-Slurp/File-Slurp-9999.320.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple and Efficient Reading/Writing/Modifying of Complete Files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/File-Slurper/File-Slurper-0.14.0-r1.ebuild b/dev-perl/File-Slurper/File-Slurper-0.14.0-r1.ebuild
index 339ed79205de..e569af2b8d2f 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.14.0-r1.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.14.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient module to slurp a file"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/File-Slurper/File-Slurper-0.14.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.14.0.ebuild
index 69bdd09beb89..68be6a4a6148 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.14.0.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.14.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient module to slurp a file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/PerlIO-utf8_strict
diff --git a/dev-perl/File-Spec-Native/File-Spec-Native-1.4.0-r1.ebuild b/dev-perl/File-Spec-Native/File-Spec-Native-1.4.0-r1.ebuild
index 7137b1302ae3..02ac12fe14ef 100644
--- a/dev-perl/File-Spec-Native/File-Spec-Native-1.4.0-r1.ebuild
+++ b/dev-perl/File-Spec-Native/File-Spec-Native-1.4.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Use native OS implementation of File::Spec from a subclass"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/File-Type/File-Type-0.220.0-r3.ebuild b/dev-perl/File-Type/File-Type-0.220.0-r3.ebuild
index ef09bc3f55ab..429aa987c59f 100644
--- a/dev-perl/File-Type/File-Type-0.220.0-r3.ebuild
+++ b/dev-perl/File-Type/File-Type-0.220.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine file type using magic"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-IO-0.10.0
diff --git a/dev-perl/File-Which/File-Which-1.270.0-r1.ebuild b/dev-perl/File-Which/File-Which-1.270.0-r1.ebuild
index c75e4a43b121..d2c49e02b224 100644
--- a/dev-perl/File-Which/File-Which-1.270.0-r1.ebuild
+++ b/dev-perl/File-Which/File-Which-1.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl implementation of the which utility as an API"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="pwhich"
 
 # Was part of File::Which, but depends on File::Which
diff --git a/dev-perl/File-chdir/File-chdir-0.101.100-r1.ebuild b/dev-perl/File-chdir/File-chdir-0.101.100-r1.ebuild
index 2bceddc75333..1b9e60a2fd9f 100644
--- a/dev-perl/File-chdir/File-chdir-0.101.100-r1.ebuild
+++ b/dev-perl/File-chdir/File-chdir-0.101.100-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An alternative to File::Spec and CWD"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/File-chmod/File-chmod-0.420.0-r2.ebuild b/dev-perl/File-chmod/File-chmod-0.420.0-r2.ebuild
index 37a74218c51e..c2b26248ca67 100644
--- a/dev-perl/File-chmod/File-chmod-0.420.0-r2.ebuild
+++ b/dev-perl/File-chmod/File-chmod-0.420.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Implements symbolic and ls chmod modes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~x64-macos ~x64-solaris"
 
 PERL_RM_FILES=(
 	t/author-critic.t
diff --git a/dev-perl/File-pushd/File-pushd-1.16.0-r1.ebuild b/dev-perl/File-pushd/File-pushd-1.16.0-r1.ebuild
index 7f9794a21a86..4def7e7f4f68 100644
--- a/dev-perl/File-pushd/File-pushd-1.16.0-r1.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.16.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Change directory temporarily for a limited scope"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
diff --git a/dev-perl/Filter/Filter-1.640.0.ebuild b/dev-perl/Filter/Filter-1.640.0.ebuild
index e27cb83c628a..632881fda2b8 100644
--- a/dev-perl/Filter/Filter-1.640.0.ebuild
+++ b/dev-perl/Filter/Filter-1.640.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface for creation of Perl Filters"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Filter/Filter-1.650.0.ebuild b/dev-perl/Filter/Filter-1.650.0.ebuild
index 5975da31464c..c8cc6a3ca8fa 100644
--- a/dev-perl/Filter/Filter-1.650.0.ebuild
+++ b/dev-perl/Filter/Filter-1.650.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface for creation of Perl Filters"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PERL_RM_FILES=(
 	t/z_kwalitee.t
diff --git a/dev-perl/Font-TTF/Font-TTF-1.60.0-r2.ebuild b/dev-perl/Font-TTF/Font-TTF-1.60.0-r2.ebuild
index 955794e31e6b..2dc014e22562 100644
--- a/dev-perl/Font-TTF/Font-TTF-1.60.0-r2.ebuild
+++ b/dev-perl/Font-TTF/Font-TTF-1.60.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Module for compiling and altering fonts"
 
 LICENSE="Artistic-2 OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-perl/IO-String
diff --git a/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r3.ebuild b/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r3.ebuild
index 6bbd9145be4c..489dad1da8a1 100644
--- a/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r3.ebuild
+++ b/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r3.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Convert Perl structures to strings and back"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~s390 ~sparc x86"
diff --git a/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r5.ebuild b/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r5.ebuild
index cfbaedfc0aa6..cbfef4b11827 100644
--- a/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r5.ebuild
+++ b/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perform remote procedure calls using extensible markup language"
 SRC_URI+=" http://perl-xml.sourceforge.net/xml-rpc/${PN}-${DIST_VERSION}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-perl/HTTP-Daemon
diff --git a/dev-perl/Geo-IP/Geo-IP-1.510.0-r2.ebuild b/dev-perl/Geo-IP/Geo-IP-1.510.0-r2.ebuild
index 5baf49abc733..12f11ff34fd9 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.510.0-r2.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.510.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Look up country by IP Address"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="dev-libs/geoip"
 RDEPEND="${DEPEND}"
diff --git a/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r3.ebuild b/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r3.ebuild
index 3d61b4811ced..9a57ef516ea4 100644
--- a/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r3.ebuild
+++ b/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r3.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="2-letter, 3-letter, and numerical codes for countries"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.116.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.116.0.ebuild
index 6c7ed5495d1f..c31f834a56d9 100644
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.116.0.ebuild
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.116.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Getopt::Long with usage text"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ~riscv x86 ~x64-macos"
 IUSE="minimal"
 
 CONFLICTS="!<dev-perl/MooseX-Getopt-0.660.0"
diff --git a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0-r2.ebuild b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0-r2.ebuild
index dd85ee84de25..a30be484cdb4 100644
--- a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0-r2.ebuild
+++ b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Defines RGB values for common color names"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=virtual/perl-Module-Load-0.100.0
diff --git a/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r3.ebuild b/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r3.ebuild
index fed02f736b0c..426926b234f3 100644
--- a/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r3.ebuild
+++ b/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r3.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Convert between color spaces"
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-perl/Graphics-ColorNames-0.320.0
diff --git a/dev-perl/Gtk2/Gtk2-1.249.930-r1.ebuild b/dev-perl/Gtk2/Gtk2-1.249.930-r1.ebuild
index 542f7a26e67c..987c49ec5519 100644
--- a/dev-perl/Gtk2/Gtk2-1.249.930-r1.ebuild
+++ b/dev-perl/Gtk2/Gtk2-1.249.930-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl bindings for GTK2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r3.ebuild b/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r3.ebuild
index fdb7e44d6d22..8a77e2439bf3 100644
--- a/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r3.ebuild
+++ b/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extension for manipulating a table composed of HTML::Element style components"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 
 RDEPEND=">=dev-perl/HTML-Tree-3.01"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/HTML-Form/HTML-Form-6.110.0.ebuild b/dev-perl/HTML-Form/HTML-Form-6.110.0.ebuild
index 87590e14acca..f18f2918585d 100644
--- a/dev-perl/HTML-Form/HTML-Form-6.110.0.ebuild
+++ b/dev-perl/HTML-Form/HTML-Form-6.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Class that represents an HTML form element"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Form/HTML-Form-6.120.0.ebuild b/dev-perl/HTML-Form/HTML-Form-6.120.0.ebuild
index ffb673ebc7a1..269d00aedddc 100644
--- a/dev-perl/HTML-Form/HTML-Form-6.120.0.ebuild
+++ b/dev-perl/HTML-Form/HTML-Form-6.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Class that represents an HTML form element"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTML-Form/HTML-Form-6.130.0.ebuild b/dev-perl/HTML-Form/HTML-Form-6.130.0.ebuild
index f13a560b9b9d..04318c27f3d2 100644
--- a/dev-perl/HTML-Form/HTML-Form-6.130.0.ebuild
+++ b/dev-perl/HTML-Form/HTML-Form-6.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Class that represents an HTML form element"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTML-FromText/HTML-FromText-2.70.0-r1.ebuild b/dev-perl/HTML-FromText/HTML-FromText-2.70.0-r1.ebuild
index f8998a716d91..e8fac94bf65c 100644
--- a/dev-perl/HTML-FromText/HTML-FromText-2.70.0-r1.ebuild
+++ b/dev-perl/HTML-FromText/HTML-FromText-2.70.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert plain text to HTML"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.830.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.830.0.ebuild
index 507ad4f0b07d..1eba928f2638 100644
--- a/dev-perl/HTML-Parser/HTML-Parser-3.830.0.ebuild
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.830.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse HTML documents"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
index 6a05b1412221..ceb8b8383b45 100644
--- a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
+++ b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Perl Table-Extract Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-perl/HTML-Element-Extended-1.160.0
diff --git a/dev-perl/HTML-Tagset/HTML-Tagset-3.240.0.ebuild b/dev-perl/HTML-Tagset/HTML-Tagset-3.240.0.ebuild
index a3ea1693f2ef..044eb503149c 100644
--- a/dev-perl/HTML-Tagset/HTML-Tagset-3.240.0.ebuild
+++ b/dev-perl/HTML-Tagset/HTML-Tagset-3.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Data tables useful in parsing HTML"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.460.0
diff --git a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r3.ebuild b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r3.ebuild
index 4caa6e5a885c..34bb25a6131c 100644
--- a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r3.ebuild
+++ b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easy to use HTML::TokeParser interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=dev-perl/HTML-Parser-3.25"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
index 2cef626d1f9f..25e8bf7d3476 100644
--- a/dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Library to manage HTML-Tree in PERL"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
index 38fd013e61b6..29ceec8a3293 100644
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Cache the result of http get-requests persistently"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-perl/libwww-perl
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.110.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.110.0.ebuild
index c9c69f4d486b..29a6d2bc4680 100644
--- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.110.0.ebuild
+++ b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Storage of cookies"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTTP-Daemon-SSL/HTTP-Daemon-SSL-1.04-r1.ebuild b/dev-perl/HTTP-Daemon-SSL/HTTP-Daemon-SSL-1.04-r1.ebuild
index 7e0fd62a5a15..7b4371c81b09 100644
--- a/dev-perl/HTTP-Daemon-SSL/HTTP-Daemon-SSL-1.04-r1.ebuild
+++ b/dev-perl/HTTP-Daemon-SSL/HTTP-Daemon-SSL-1.04-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A simple http server class with SSL support"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.160.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.160.0.ebuild
index dd6adcdf91fc..58666c772a97 100644
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.160.0.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for simple HTTP servers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.60.0.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.60.0.ebuild
index b7a6af6878fa..534f6bcf01a6 100644
--- a/dev-perl/HTTP-Date/HTTP-Date-6.60.0.ebuild
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Date conversion for HTTP date formats"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTTP-Message/HTTP-Message-7.0.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-7.0.0.ebuild
index 58842a76d0a1..33af87de9b03 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-7.0.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-7.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTTP-Message/HTTP-Message-7.10.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-7.10.0.ebuild
index c75f4c8fb5e6..4b205349561b 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-7.10.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-7.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r2.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r2.ebuild
index 33069bc92aa5..025cf99395b8 100644
--- a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r2.ebuild
+++ b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="HTTP content negotiation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTTP-Response-Encoding/HTTP-Response-Encoding-0.60.0-r2.ebuild b/dev-perl/HTTP-Response-Encoding/HTTP-Response-Encoding-0.60.0-r2.ebuild
index dbf942d65203..c35a3b025b7e 100644
--- a/dev-perl/HTTP-Response-Encoding/HTTP-Response-Encoding-0.60.0-r2.ebuild
+++ b/dev-perl/HTTP-Response-Encoding/HTTP-Response-Encoding-0.60.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Adds encoding() to HTTP::Response"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0-r1.ebuild b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0-r1.ebuild
index ec6887c8e26b..ec8a7407fc1a 100644
--- a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0-r1.ebuild
+++ b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lightweight HTTP Server"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/CGI
diff --git a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r2.ebuild b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r2.ebuild
index 11cfd162a40e..c324ba7bcaf7 100644
--- a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r2.ebuild
+++ b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Lightweight field hash for inside-out objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-XSLoader-0.20.0
diff --git a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild
index 098ecb126629..1f1c368c1690 100644
--- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Lexically scoped subroutine wrappers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
index 30df27a30872..2a7cd6ff1c48 100644
--- a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
+++ b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Capture STDOUT and STDERR from Perl code, subprocesses or XS"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-Digest/IO-Digest-0.110.0-r4.ebuild b/dev-perl/IO-Digest/IO-Digest-0.110.0-r4.ebuild
index 631f3b27c35d..760097e9fde0 100644
--- a/dev-perl/IO-Digest/IO-Digest-0.110.0-r4.ebuild
+++ b/dev-perl/IO-Digest/IO-Digest-0.110.0-r4.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="IO::Digest - Calculate digests while reading or writing"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND=">=dev-perl/PerlIO-via-dynamic-0.10"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild b/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
index 6daa21580e7d..bfed42724ba0 100644
--- a/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
+++ b/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Open an HTML file with automatic charset detection"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild b/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
index 93128d5f640c..0e786a7b44e7 100644
--- a/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
+++ b/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r2.ebuild b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r2.ebuild
index 063e329655f5..be91cdbbb066 100644
--- a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r2.ebuild
+++ b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Session data support module for SOAP::Lite"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
diff --git a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.730.0.ebuild b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.730.0.ebuild
index f629c83580ab..f4933d5cbe81 100644
--- a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.730.0.ebuild
+++ b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.730.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Work with IO sockets in IPv6"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Socket6
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.89.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.89.0.ebuild
index 5c87a1204a5f..53bd2d6e7dfa 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.89.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.89.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.95.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.95.0.ebuild
index 7059f9c3eee5..148a5ff1d89e 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.95.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.95.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-String/IO-String-1.80.0-r3.ebuild b/dev-perl/IO-String/IO-String-1.80.0-r3.ebuild
index 229a7d9dec2e..4cd12929f082 100644
--- a/dev-perl/IO-String/IO-String-1.80.0-r3.ebuild
+++ b/dev-perl/IO-String/IO-String-1.80.0-r3.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="IO::File interface for in-core strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild b/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
index e1fb71fdec9b..76fd83bed274 100644
--- a/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
+++ b/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
@@ -9,6 +9,6 @@ inherit perl-module
 
 DESCRIPTION="Change and print terminal line settings"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PERL_RM_FILES=( t/98-pod-coverage.t t/99-pod.t )
diff --git a/dev-perl/IO-Tty/IO-Tty-1.200.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.200.0.ebuild
index b0df0d61e38f..a38e5c0c9c5e 100644
--- a/dev-perl/IO-Tty/IO-Tty-1.200.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.200.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild b/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
index 7c9e2cbade17..b5804291afb1 100644
--- a/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
+++ b/dev-perl/IO-stringy/IO-stringy-2.113.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="I/O on in-core objects like strings and arrays"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/IPC-Run/IPC-Run-20231003.0.0.ebuild b/dev-perl/IPC-Run/IPC-Run-20231003.0.0.ebuild
index 95c88e151807..17ca58e25905 100644
--- a/dev-perl/IPC-Run/IPC-Run-20231003.0.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-20231003.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/IO-Tty-1.80.0
diff --git a/dev-perl/IPC-Run/IPC-Run-20250809.0.0.ebuild b/dev-perl/IPC-Run/IPC-Run-20250809.0.0.ebuild
index 496272def022..30e742bb01a1 100644
--- a/dev-perl/IPC-Run/IPC-Run-20250809.0.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-20250809.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/IO-Tty-1.80.0
diff --git a/dev-perl/IPC-Run3/IPC-Run3-0.49.0.ebuild b/dev-perl/IPC-Run3/IPC-Run3-0.49.0.ebuild
index 9b0683cbce55..f52424028fc8 100644
--- a/dev-perl/IPC-Run3/IPC-Run3-0.49.0.ebuild
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.49.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Run a subprocess in batch mode (a la system)"
 
 LICENSE="|| ( BSD-2 Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Time-HiRes
diff --git a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
index c9290a63970d..a925c42c79de 100644
--- a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
+++ b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Run commands simply, with detailed diagnostics"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Importer/Importer-0.26.0.ebuild b/dev-perl/Importer/Importer-0.26.0.ebuild
index 35c4f6458f80..977efdc473b2 100644
--- a/dev-perl/Importer/Importer-0.26.0.ebuild
+++ b/dev-perl/Importer/Importer-0.26.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Alternative interface to modules that export symbols"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Inline/Inline-0.860.0.ebuild b/dev-perl/Inline/Inline-0.860.0.ebuild
index 1047bb6f95e6..1097271a84d2 100644
--- a/dev-perl/Inline/Inline-0.860.0.ebuild
+++ b/dev-perl/Inline/Inline-0.860.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Write Perl subroutines in other languages"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Inline/Inline-0.870.0.ebuild b/dev-perl/Inline/Inline-0.870.0.ebuild
index 7f62dd08cba0..d0a4368b1a5d 100644
--- a/dev-perl/Inline/Inline-0.870.0.ebuild
+++ b/dev-perl/Inline/Inline-0.870.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Write Perl subroutines in other languages"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-0.800.0
diff --git a/dev-perl/JSON-Any/JSON-Any-1.400.0.ebuild b/dev-perl/JSON-Any/JSON-Any-1.400.0.ebuild
index f5915ff981a0..a0574e2a5677 100644
--- a/dev-perl/JSON-Any/JSON-Any-1.400.0.ebuild
+++ b/dev-perl/JSON-Any/JSON-Any-1.400.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Wrapper Class for the various JSON classes (DEPRECATED)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~mips ~x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.8.ebuild b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.8.ebuild
index 0a719f6bc97a..69ee6b426fc4 100644
--- a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.8.ebuild
+++ b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.8.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+xs"
 
 # needs Scalar-Util
diff --git a/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild b/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
index f7f750bee9c0..77235e2d8528 100644
--- a/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
+++ b/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Types-Serialiser
diff --git a/dev-perl/JSON-XS/JSON-XS-4.40.0.ebuild b/dev-perl/JSON-XS/JSON-XS-4.40.0.ebuild
index 6f9f7f2cd26c..f70bdc62d171 100644
--- a/dev-perl/JSON-XS/JSON-XS-4.40.0.ebuild
+++ b/dev-perl/JSON-XS/JSON-XS-4.40.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Types-Serialiser
diff --git a/dev-perl/JSON/JSON-4.100.0.ebuild b/dev-perl/JSON/JSON-4.100.0.ebuild
index 5d0e82fb22b5..fc1e8b2de652 100644
--- a/dev-perl/JSON/JSON-4.100.0.ebuild
+++ b/dev-perl/JSON/JSON-4.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON (JavaScript Object Notation) encoder/decoder"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test +xs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Jcode/Jcode-2.70.0-r3.ebuild b/dev-perl/Jcode/Jcode-2.70.0-r3.ebuild
index e85f3186ca41..47e04bc37c11 100644
--- a/dev-perl/Jcode/Jcode-2.70.0-r3.ebuild
+++ b/dev-perl/Jcode/Jcode-2.70.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Japanese transcoding module for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=virtual/perl-MIME-Base64-2.1"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
index 833de28f663e..4f52333d394c 100644
--- a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Media types and mailcap processing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/LWP-Online/LWP-Online-1.80.0-r3.ebuild b/dev-perl/LWP-Online/LWP-Online-1.80.0-r3.ebuild
index 2994bf2e20d9..d2c3e21c9db0 100644
--- a/dev-perl/LWP-Online/LWP-Online-1.80.0-r3.ebuild
+++ b/dev-perl/LWP-Online/LWP-Online-1.80.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Does your process have access to the web"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 # https://rt.cpan.org/Public/Bug/Display.html?id=112728
 PATCHES=("${FILESDIR}/${DIST_VERSION}-no-network.patch")
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.140.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.140.0.ebuild
index 3583c81fdbcf..00848de7d58a 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.140.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide https support for LWP::UserAgent"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/IO-Socket-SSL-1.970.0
diff --git a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0-r1.ebuild b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0-r1.ebuild
index 7a4f51d1925d..4b1db9b31404 100644
--- a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0-r1.ebuild
+++ b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A virtual browser that retries errors"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-perl/libwww-perl"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
index 44bc494329d9..1990d98607eb 100644
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl encapsulation of invoking the Latex programs"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Capture-Tiny
diff --git a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.92.0-r1.ebuild b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.92.0-r1.ebuild
index 756c45f31ae1..00e9e2e41f99 100644
--- a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.92.0-r1.ebuild
+++ b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.92.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Encode characters for LaTeX formatting"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Getopt-Long
diff --git a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r2.ebuild b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r2.ebuild
index f41793adc2f2..5d8449cae3ec 100644
--- a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r2.ebuild
+++ b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the automatic generation of LaTeX tables"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.12.0.ebuild b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.12.0.ebuild
index ce0934db5692..052e9be76d37 100644
--- a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.12.0.ebuild
+++ b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.12.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Prevent leakage of lexical hints"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Note: This module is a no-op at runtime since Perl 5.12
 # but is required for dependency resolution
diff --git a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
index 6426efb44aee..c84d367becc1 100644
--- a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
+++ b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Perl module to pluralize English words"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r3.ebuild b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r3.ebuild
index ffe3a49e8383..a33ea4a06c29 100644
--- a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r3.ebuild
+++ b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Pick a language based on user's preferences"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2+ )"
-KEYWORDS="amd64 arm arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ~riscv x86"
 
 RDEPEND="dev-perl/Log-TraceMessages"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/List-AllUtils/List-AllUtils-0.190.0-r1.ebuild b/dev-perl/List-AllUtils/List-AllUtils-0.190.0-r1.ebuild
index 896e1002451f..ae6169a21bca 100644
--- a/dev-perl/List-AllUtils/List-AllUtils-0.190.0-r1.ebuild
+++ b/dev-perl/List-AllUtils/List-AllUtils-0.190.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Combines many List::* utility modules in one bite-sized package"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 LICENSE="Artistic-2"
 
 RDEPEND="
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0-r1.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0-r1.ebuild
index b4be0cc76642..92c22058eda4 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0-r1.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Compiled List::MoreUtils functions"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # See XS.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
index 96adadbcf0c5..463fee720374 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+xs"
 
 # See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.580.0.ebuild b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.580.0.ebuild
index 645a9aeb6ca8..2342895fcb8e 100644
--- a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.580.0.ebuild
+++ b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.580.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS implementation for List::SomeUtils"
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-XSLoader
diff --git a/dev-perl/List-SomeUtils/List-SomeUtils-0.590.0.ebuild b/dev-perl/List-SomeUtils/List-SomeUtils-0.590.0.ebuild
index c802b35fad3c..c4015f297f28 100644
--- a/dev-perl/List-SomeUtils/List-SomeUtils-0.590.0.ebuild
+++ b/dev-perl/List-SomeUtils/List-SomeUtils-0.590.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of List utilities missing from List::Util"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/List-UtilsBy/List-UtilsBy-0.120.0.ebuild b/dev-perl/List-UtilsBy/List-UtilsBy-0.120.0.ebuild
index 26a800d71393..ab3bfbb392f0 100644
--- a/dev-perl/List-UtilsBy/List-UtilsBy-0.120.0.ebuild
+++ b/dev-perl/List-UtilsBy/List-UtilsBy-0.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Higher-order list utility functions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Locale-Codes/Locale-Codes-3.820.0.ebuild b/dev-perl/Locale-Codes/Locale-Codes-3.820.0.ebuild
index 0a5f52d1b8b4..508cfba76434 100644
--- a/dev-perl/Locale-Codes/Locale-Codes-3.820.0.ebuild
+++ b/dev-perl/Locale-Codes/Locale-Codes-3.820.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Distribution of Perl modules to handle locale codes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
diff --git a/dev-perl/Locale-Codes/Locale-Codes-3.840.0.ebuild b/dev-perl/Locale-Codes/Locale-Codes-3.840.0.ebuild
index 02be662c6c5e..43bea0b07185 100644
--- a/dev-perl/Locale-Codes/Locale-Codes-3.840.0.ebuild
+++ b/dev-perl/Locale-Codes/Locale-Codes-3.840.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Distribution of Perl modules to handle locale codes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
diff --git a/dev-perl/Locale-Codes/Locale-Codes-3.850.0.ebuild b/dev-perl/Locale-Codes/Locale-Codes-3.850.0.ebuild
index 83c8b80c4f57..4ccef556f21c 100644
--- a/dev-perl/Locale-Codes/Locale-Codes-3.850.0.ebuild
+++ b/dev-perl/Locale-Codes/Locale-Codes-3.850.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Distribution of Perl modules to handle locale codes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0-r2.ebuild b/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0-r2.ebuild
index d6f79125d8cc..f1624c57e4c7 100644
--- a/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0-r2.ebuild
+++ b/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Use other catalog formats in Maketext"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
index 71acef88047c..e3d64e326522 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for accessing the GNU locale utilities"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	sys-devel/gettext
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0_p20181130.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0_p20181130.ebuild
index ce18d689e53b..41bc4cdfeb66 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0_p20181130.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0_p20181130.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 S="${WORKDIR}/Perl-Locale-gettext-${COMMIT}"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	sys-devel/gettext
diff --git a/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
index e5ea86eeb628..ad4f9b06b307 100644
--- a/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
+++ b/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="General logging framework"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # errors out when running in parallel
 DIST_TEST=do
diff --git a/dev-perl/Log-Log4perl/Log-Log4perl-1.570.0.ebuild b/dev-perl/Log-Log4perl/Log-Log4perl-1.570.0.ebuild
index 4eec1eed812b..209df8b3794f 100644
--- a/dev-perl/Log-Log4perl/Log-Log4perl-1.570.0.ebuild
+++ b/dev-perl/Log-Log4perl/Log-Log4perl-1.570.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Log4j implementation for Perl"
 HOMEPAGE="https://github.com/mschilli/log4perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-File-Path-2.70.0
diff --git a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
index d099e3f39bc7..0c45419046b1 100644
--- a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
+++ b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Logging/debugging aid"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ~riscv x86"
 
 RDEPEND="
 	>=dev-perl/HTML-FromText-1.4.0
diff --git a/dev-perl/MD5/MD5-2.30.0-r2.ebuild b/dev-perl/MD5/MD5-2.30.0-r2.ebuild
index d8f52e41878d..611a03554db6 100644
--- a/dev-perl/MD5/MD5-2.30.0-r2.ebuild
+++ b/dev-perl/MD5/MD5-2.30.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Perl MD5 Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 RDEPEND="virtual/perl-Digest-MD5"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/MIME-Charset/MIME-Charset-1.13.1.ebuild b/dev-perl/MIME-Charset/MIME-Charset-1.13.1.ebuild
index 39f63dbdedd0..d348dd48f0fe 100644
--- a/dev-perl/MIME-Charset/MIME-Charset-1.13.1.ebuild
+++ b/dev-perl/MIME-Charset/MIME-Charset-1.13.1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Charset Informations for MIME"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="l10n_ja l10n_zh"
 
 # Put JISX0213 here one day
diff --git a/dev-perl/MIME-Lite/MIME-Lite-3.33.0.ebuild b/dev-perl/MIME-Lite/MIME-Lite-3.33.0.ebuild
index c9e9792f0f3a..0dc0be64d08d 100644
--- a/dev-perl/MIME-Lite/MIME-Lite-3.33.0.ebuild
+++ b/dev-perl/MIME-Lite/MIME-Lite-3.33.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Low-calorie MIME generator"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="minimal"
 
 PATCHES=( "${FILESDIR}/3.033-makefilepl.patch" )
diff --git a/dev-perl/MIME-Types/MIME-Types-2.270.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.270.0.ebuild
index edbd22ef2416..609ce3865ade 100644
--- a/dev-perl/MIME-Types/MIME-Types-2.270.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-2.270.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Definition of MIME types"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/MIME-Types/MIME-Types-2.280.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.280.0.ebuild
index f22eae094827..b91d4a2b1602 100644
--- a/dev-perl/MIME-Types/MIME-Types-2.280.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-2.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Definition of MIME types"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? ( >=virtual/perl-Test-Simple-0.470.0 )
diff --git a/dev-perl/MIME-Types/MIME-Types-2.290.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.290.0.ebuild
index d5ee7f46d280..f37acd3754d3 100644
--- a/dev-perl/MIME-Types/MIME-Types-2.290.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-2.290.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Definition of MIME types"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/dev-perl/MIME-tools/MIME-tools-5.515.0.ebuild b/dev-perl/MIME-tools/MIME-tools-5.515.0.ebuild
index dc5f8adbf746..1e8e201bf818 100644
--- a/dev-perl/MIME-tools/MIME-tools-5.515.0.ebuild
+++ b/dev-perl/MIME-tools/MIME-tools-5.515.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 
 DESCRIPTION="A Perl module for parsing and creating MIME entities"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-File-Path-1
diff --git a/dev-perl/MLDBM/MLDBM-2.50.0-r1.ebuild b/dev-perl/MLDBM/MLDBM-2.50.0-r1.ebuild
index 642091bb49ea..9cd8cd549af6 100644
--- a/dev-perl/MLDBM/MLDBM-2.50.0-r1.ebuild
+++ b/dev-perl/MLDBM/MLDBM-2.50.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Multidimensional/tied hash Perl Module"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Data-Dumper-2.80.0
diff --git a/dev-perl/MP3-Info/MP3-Info-1.260.0-r1.ebuild b/dev-perl/MP3-Info/MP3-Info-1.260.0-r1.ebuild
index 89549725c38c..f68b96ec458a 100644
--- a/dev-perl/MP3-Info/MP3-Info-1.260.0-r1.ebuild
+++ b/dev-perl/MP3-Info/MP3-Info-1.260.0-r1.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="A Perl module to manipulate/fetch info from MP3 files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/MP3-Tag/MP3-Tag-1.160.0.ebuild b/dev-perl/MP3-Tag/MP3-Tag-1.160.0.ebuild
index 22075300a8d8..f848aa760d63 100644
--- a/dev-perl/MP3-Tag/MP3-Tag-1.160.0.ebuild
+++ b/dev-perl/MP3-Tag/MP3-Tag-1.160.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Module for reading tags of MP3 Audio files"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-macos"
 
 RDEPEND="
 	dev-perl/MP3-Info
diff --git a/dev-perl/MRO-Compat/MRO-Compat-0.150.0.ebuild b/dev-perl/MRO-Compat/MRO-Compat-0.150.0.ebuild
index f30db9ee86eb..38503a95baf1 100644
--- a/dev-perl/MRO-Compat/MRO-Compat-0.150.0.ebuild
+++ b/dev-perl/MRO-Compat/MRO-Compat-0.150.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Lets you build groups of accessors"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Mail-DomainKeys/Mail-DomainKeys-1.0.0-r2.ebuild b/dev-perl/Mail-DomainKeys/Mail-DomainKeys-1.0.0-r2.ebuild
index 75932b2f1b68..865ba1a4ab2d 100644
--- a/dev-perl/Mail-DomainKeys/Mail-DomainKeys-1.0.0-r2.ebuild
+++ b/dev-perl/Mail-DomainKeys/Mail-DomainKeys-1.0.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A perl implementation of DomainKeys"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-perl/Net-DNS-0.34
diff --git a/dev-perl/MailTools/MailTools-2.220.0.ebuild b/dev-perl/MailTools/MailTools-2.220.0.ebuild
index 22ecabfa31bd..9ca3d25fd453 100644
--- a/dev-perl/MailTools/MailTools-2.220.0.ebuild
+++ b/dev-perl/MailTools/MailTools-2.220.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation of electronic mail addresses"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/TimeDate
diff --git a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0-r1.ebuild b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0-r1.ebuild
index 77beb0d26feb..ecd9309820a6 100644
--- a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0-r1.ebuild
+++ b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Very fast base to base conversion"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.130.0.ebuild b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.130.0.ebuild
index e6122912ba34..733fc065389c 100644
--- a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.130.0.ebuild
+++ b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.130.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Very fast base to base conversion"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Math-Bezier/Math-Bezier-0.10.0-r2.ebuild b/dev-perl/Math-Bezier/Math-Bezier-0.10.0-r2.ebuild
index aa52529404dd..c912781eac6a 100644
--- a/dev-perl/Math-Bezier/Math-Bezier-0.10.0-r2.ebuild
+++ b/dev-perl/Math-Bezier/Math-Bezier-0.10.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Solution of Bezier Curves"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.601.300.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.601.300.ebuild
index c1783407afcf..30a1e162feff 100644
--- a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.601.300.ebuild
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.601.300.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the GMP library for Math::BigInt routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Carp-1.220.0
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.700.300.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.700.300.ebuild
index 21a39a99f2c0..b4fc6b42de47 100644
--- a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.700.300.ebuild
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.700.300.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the GMP library for Math::BigInt routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Carp-1.220.0
diff --git a/dev-perl/Math-Pari/Math-Pari-2.10.809.0-r2.ebuild b/dev-perl/Math-Pari/Math-Pari-2.10.809.0-r2.ebuild
index a7fc459f4d74..76b133b8336e 100644
--- a/dev-perl/Math-Pari/Math-Pari-2.10.809.0-r2.ebuild
+++ b/dev-perl/Math-Pari/Math-Pari-2.10.809.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 S_PARI="${WORKDIR}"/pari-${PARI_VER}
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~sparc x86"
 
 # Math::Pari requires that a copy of the pari source in a parallel
 # directory to where you build it. It does not need to compile it, but
diff --git a/dev-perl/Math-Pari/Math-Pari-2.30.523.ebuild b/dev-perl/Math-Pari/Math-Pari-2.30.523.ebuild
index 84b711c36202..954ab55813ce 100644
--- a/dev-perl/Math-Pari/Math-Pari-2.30.523.ebuild
+++ b/dev-perl/Math-Pari/Math-Pari-2.30.523.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 S_PARI="${WORKDIR}"/pari-${PARI_VER}
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~sparc x86"
 
 # Math::Pari requires that a copy of the pari source in a parallel
 # directory to where you build it. It does not need to compile it, but
diff --git a/dev-perl/Math-Pari/Math-Pari-2.30.528.ebuild b/dev-perl/Math-Pari/Math-Pari-2.30.528.ebuild
index f8693f3aaaeb..bbb0c1a69084 100644
--- a/dev-perl/Math-Pari/Math-Pari-2.30.528.ebuild
+++ b/dev-perl/Math-Pari/Math-Pari-2.30.528.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 S_PARI="${WORKDIR}"/pari-${PARI_VER}
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~sparc x86"
 
 # Math::Pari requires that a copy of the pari source in a parallel
 # directory to where you build it. It does not need to compile it, but
diff --git a/dev-perl/Math-Round/Math-Round-0.80.0.ebuild b/dev-perl/Math-Round/Math-Round-0.80.0.ebuild
index e464a09a0fe2..09ea24c54696 100644
--- a/dev-perl/Math-Round/Math-Round-0.80.0.ebuild
+++ b/dev-perl/Math-Round/Math-Round-0.80.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Perl extension for rounding numbers"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/dev-perl/Math-VecStat/Math-VecStat-0.80.0-r2.ebuild b/dev-perl/Math-VecStat/Math-VecStat-0.80.0-r2.ebuild
index d6c12dadf25e..7395dc231e24 100644
--- a/dev-perl/Math-VecStat/Math-VecStat-0.80.0-r2.ebuild
+++ b/dev-perl/Math-VecStat/Math-VecStat-0.80.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Some basic numeric stats on vectors"
 
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~sparc x86"
diff --git a/dev-perl/MediaWiki-API/MediaWiki-API-0.520.0.ebuild b/dev-perl/MediaWiki-API/MediaWiki-API-0.520.0.ebuild
index ca36c7996eb5..a38f7df9bd7c 100644
--- a/dev-perl/MediaWiki-API/MediaWiki-API-0.520.0.ebuild
+++ b/dev-perl/MediaWiki-API/MediaWiki-API-0.520.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A OO interface to the Mediawiki API"
 LICENSE="GPL-3+"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mock-Config/Mock-Config-0.40.0.ebuild b/dev-perl/Mock-Config/Mock-Config-0.40.0.ebuild
index 0d7722d34762..c63bc3408016 100644
--- a/dev-perl/Mock-Config/Mock-Config-0.40.0.ebuild
+++ b/dev-perl/Mock-Config/Mock-Config-0.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Temporarily set Config or XSConfig values"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 LICENSE="Artistic-2"
 
 src_test() {
diff --git a/dev-perl/Mock-Config/Mock-Config-0.50.0.ebuild b/dev-perl/Mock-Config/Mock-Config-0.50.0.ebuild
index 954a593c62f0..fec5904bcab4 100644
--- a/dev-perl/Mock-Config/Mock-Config-0.50.0.ebuild
+++ b/dev-perl/Mock-Config/Mock-Config-0.50.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Temporarily set Config or XSConfig values"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 src_test() {
 	perl_rm_files t/pod-coverage.t t/pod.t t/manifest.t
diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.47.0-r1.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.47.0-r1.ebuild
index ee5882097fd0..d974ccb0e5ae 100644
--- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.47.0-r1.ebuild
+++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.47.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Tiny replacement for Module::Build"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-CPAN-Meta
diff --git a/dev-perl/Module-Build/Module-Build-0.423.400-r5.ebuild b/dev-perl/Module-Build/Module-Build-0.423.400-r5.ebuild
index c2f311dc1b56..afa7174a9b0c 100644
--- a/dev-perl/Module-Build/Module-Build-0.423.400-r5.ebuild
+++ b/dev-perl/Module-Build/Module-Build-0.423.400-r5.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Build and install Perl modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-CPAN-Meta-2.142.60
diff --git a/dev-perl/Module-Implementation/Module-Implementation-0.90.0-r1.ebuild b/dev-perl/Module-Implementation/Module-Implementation-0.90.0-r1.ebuild
index 9cf5fd020d78..51b48770a178 100644
--- a/dev-perl/Module-Implementation/Module-Implementation-0.90.0-r1.ebuild
+++ b/dev-perl/Module-Implementation/Module-Implementation-0.90.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Loads one of several alternate underlying implementations for a mod
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Module-Install/Module-Install-1.190.0-r2.ebuild b/dev-perl/Module-Install/Module-Install-1.190.0-r2.ebuild
index 0eac4f898b34..f8ec3e3c0d18 100644
--- a/dev-perl/Module-Install/Module-Install-1.190.0-r2.ebuild
+++ b/dev-perl/Module-Install/Module-Install-1.190.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Standalone, extensible Perl module installer"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-CPAN-Meta-1.441.300
diff --git a/dev-perl/Module-Install/Module-Install-1.210.0-r2.ebuild b/dev-perl/Module-Install/Module-Install-1.210.0-r2.ebuild
index 5d071f305872..46836f4b4853 100644
--- a/dev-perl/Module-Install/Module-Install-1.210.0-r2.ebuild
+++ b/dev-perl/Module-Install/Module-Install-1.210.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Standalone, extensible Perl module installer"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-CPAN-Meta-1.441.300
diff --git a/dev-perl/Module-Locate/Module-Locate-1.800.0-r1.ebuild b/dev-perl/Module-Locate/Module-Locate-1.800.0-r1.ebuild
index da13e3deea35..d9067a02cfe2 100644
--- a/dev-perl/Module-Locate/Module-Locate-1.800.0-r1.ebuild
+++ b/dev-perl/Module-Locate/Module-Locate-1.800.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate modules in the same fashion as require and use"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Module-Manifest/Module-Manifest-1.90.0.ebuild b/dev-perl/Module-Manifest/Module-Manifest-1.90.0.ebuild
index 7be4f4a23cf3..0cababae5cb8 100644
--- a/dev-perl/Module-Manifest/Module-Manifest-1.90.0.ebuild
+++ b/dev-perl/Module-Manifest/Module-Manifest-1.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and examine a Perl distribution MANIFEST file"
 
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Module-Pluggable/Module-Pluggable-6.300.0.ebuild b/dev-perl/Module-Pluggable/Module-Pluggable-6.300.0.ebuild
index 8d968bce53d6..3bcfd35e2968 100644
--- a/dev-perl/Module-Pluggable/Module-Pluggable-6.300.0.ebuild
+++ b/dev-perl/Module-Pluggable/Module-Pluggable-6.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automatically give your module the ability to have plugins"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-3
diff --git a/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.3.0-r1.ebuild b/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.3.0-r1.ebuild
index 97c9f803bf12..44afbb9a23d6 100644
--- a/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.3.0-r1.ebuild
+++ b/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.3.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Provide information on conflicts for Module::Runtime"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Dist-CheckConflicts
diff --git a/dev-perl/Module-Runtime/Module-Runtime-0.16.0-r1.ebuild b/dev-perl/Module-Runtime/Module-Runtime-0.16.0-r1.ebuild
index ddf82bf6cb01..0f023c875256 100644
--- a/dev-perl/Module-Runtime/Module-Runtime-0.16.0-r1.ebuild
+++ b/dev-perl/Module-Runtime/Module-Runtime-0.16.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Runtime module handling"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Module-Runtime/Module-Runtime-0.18.0.ebuild b/dev-perl/Module-Runtime/Module-Runtime-0.18.0.ebuild
index 1dedd0c703de..4d4e942b6f0c 100644
--- a/dev-perl/Module-Runtime/Module-Runtime-0.18.0.ebuild
+++ b/dev-perl/Module-Runtime/Module-Runtime-0.18.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Runtime module handling"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 src_test() {
 	perl_rm_files t/pod_cvg.t t/pod_syn.t
diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.370.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.370.0.ebuild
index de54684d6475..936729391a18 100644
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.370.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.370.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively scan Perl code for dependencies"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Moo/Moo-2.5.5.ebuild b/dev-perl/Moo/Moo-2.5.5.ebuild
index e66ddb817124..9c55b6606b6a 100644
--- a/dev-perl/Moo/Moo-2.5.5.ebuild
+++ b/dev-perl/Moo/Moo-2.5.5.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.9.ebuild b/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.9.ebuild
index d0d28d96b387..434004ee9896 100644
--- a/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.9.ebuild
+++ b/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.9.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="NativeTrait-like behavior for Moo"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	dev-perl/Class-Method-Modifiers
diff --git a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild
index b6283704a4ed..737e6527d3a5 100644
--- a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild
+++ b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Some Moosish types and a type builder"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/strictures-2
diff --git a/dev-perl/Moose/Moose-2.220.700.ebuild b/dev-perl/Moose/Moose-2.220.700.ebuild
index 699485fe446d..67ab6e3ed7f0 100644
--- a/dev-perl/Moose/Moose-2.220.700.ebuild
+++ b/dev-perl/Moose/Moose-2.220.700.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Postmodern object system for Perl 5"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=virtual/perl-Carp-1.220.0
diff --git a/dev-perl/Moose/Moose-2.400.0.ebuild b/dev-perl/Moose/Moose-2.400.0.ebuild
index 9570dc222cfe..3bb5ca574331 100644
--- a/dev-perl/Moose/Moose-2.400.0.ebuild
+++ b/dev-perl/Moose/Moose-2.400.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Postmodern object system for Perl 5"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=virtual/perl-Carp-1.220.0
diff --git a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0-r2.ebuild b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0-r2.ebuild
index 47cda3d0a6d2..52c5f2bc36b2 100644
--- a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0-r2.ebuild
+++ b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Name your accessors get_foo() and set_foo(), whatever that may mean
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Moose-1.160.0
diff --git a/dev-perl/MooseX-Getopt/MooseX-Getopt-0.780.0.ebuild b/dev-perl/MooseX-Getopt/MooseX-Getopt-0.780.0.ebuild
index 587032dab8d0..1df7730c920b 100644
--- a/dev-perl/MooseX-Getopt/MooseX-Getopt-0.780.0.ebuild
+++ b/dev-perl/MooseX-Getopt/MooseX-Getopt-0.780.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Moose role for processing command line options"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm ppc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.110.0.ebuild b/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.110.0.ebuild
index 4b98574d3375..be49463351cd 100644
--- a/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.110.0.ebuild
+++ b/dev-perl/MooseX-Role-Parameterized/MooseX-Role-Parameterized-1.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Roles with composition parameters"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	!<=dev-perl/MooseX-Storage-0.460.0
diff --git a/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0-r1.ebuild b/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0-r1.ebuild
index 8b83b2a299c5..69cd238a4359 100644
--- a/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0-r1.ebuild
+++ b/dev-perl/MooseX-Role-WithOverloading/MooseX-Role-WithOverloading-0.170.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Roles which support overloading (DEPRECATED)"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Moose-0.940.0
diff --git a/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.10.0.ebuild b/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.10.0.ebuild
index dc0989425537..ffa9ae131779 100644
--- a/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.10.0.ebuild
+++ b/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.10.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON datatype for Moose"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-perl/JSON
diff --git a/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.90.0-r1.ebuild b/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.90.0-r1.ebuild
index 85edf598a63c..4997cc0658c0 100644
--- a/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.90.0-r1.ebuild
+++ b/dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.90.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Path::Class type library for Moose"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.500.0-r1.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.500.0-r1.ebuild
index 0753eabe8c50..ab3647ffe180 100644
--- a/dev-perl/MooseX-Types/MooseX-Types-0.500.0-r1.ebuild
+++ b/dev-perl/MooseX-Types/MooseX-Types-0.500.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Organise your Moose types in libraries"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.510.0.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.510.0.ebuild
index b33271a54b4c..b27010ed452e 100644
--- a/dev-perl/MooseX-Types/MooseX-Types-0.510.0.ebuild
+++ b/dev-perl/MooseX-Types/MooseX-Types-0.510.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Organise your Moose types in libraries"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Carp-Clan-6
diff --git a/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild b/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
index 0db57cd237d5..9f338b045bd0 100644
--- a/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
+++ b/dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Mozilla's CA cert bundle in PEM format (Gentoo stub)"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="app-misc/ca-certificates"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.220.0-r1.ebuild b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.220.0-r1.ebuild
index e02bcc754e28..395fc2668f31 100644
--- a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.220.0-r1.ebuild
+++ b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.220.0-r1.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Perl extension for merging IPv4 or IPv6 CIDR addresses"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PERL_RM_FILES=( "t/podcov.t" "t/pod.t" )
diff --git a/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild
index e38696160096..3e92403dc098 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the DBus message system"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	sys-apps/dbus
diff --git a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.202.302.160.ebuild b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.202.302.160.ebuild
index d6612ccf96f7..2e075a7e8477 100644
--- a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.202.302.160.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.202.302.160.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mock a DNS Resolver object for testing"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Net-DNS
diff --git a/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0-r1.ebuild b/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0-r1.ebuild
index 8127abeab9cc..f735b5688e46 100644
--- a/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0-r1.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="programmable DNS resolver class for offline emulation of DNS"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/Net-DNS-0.690.0
diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.260.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.260.0.ebuild
index e76676b9ffc5..5304ccbd8b5f 100644
--- a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.260.0.ebuild
+++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.260.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="DNSSEC extensions to Net::DNS"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/dev-perl/Net-DNS/Net-DNS-1.500.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.500.0.ebuild
index 31917a9def29..79b369048de5 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.500.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.500.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl Interface to the Domain Name System"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 PDEPEND="
diff --git a/dev-perl/Net-DNS/Net-DNS-1.510.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.510.0.ebuild
index fd479d494350..dbe3bcafa514 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.510.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.510.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl Interface to the Domain Name System"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 PDEPEND="
diff --git a/dev-perl/Net-DNS/Net-DNS-1.520.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.520.0.ebuild
index d341f0b8c579..b63f10d582ff 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.520.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.520.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl Interface to the Domain Name System"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 PDEPEND="
diff --git a/dev-perl/Net-DNS/Net-DNS-1.530.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.530.0.ebuild
index 7641b6338f27..5aac4d9aa917 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.530.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.530.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl Interface to the Domain Name System"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 PDEPEND="
diff --git a/dev-perl/Net-Daemon/Net-Daemon-0.490.0.ebuild b/dev-perl/Net-Daemon/Net-Daemon-0.490.0.ebuild
index 3db94e0ee830..52a04bf65ffb 100644
--- a/dev-perl/Net-Daemon/Net-Daemon-0.490.0.ebuild
+++ b/dev-perl/Net-Daemon/Net-Daemon-0.490.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for portable daemons"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # loop-t and loop-child-t race-condition
 # due to Net::Daemon::Test writing
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
index fa088250fe57..7e6a2e59d4b8 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Current top level domain names including new ICANN additions and ccTLDs"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.230.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.230.0.ebuild
index a270555cc0b3..2f7d8fcf5f0f 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.230.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.240.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.240.0.ebuild
index bbbf1446bd66..559a0b4770ae 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.240.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0-r3.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0-r3.ebuild
index c98afae148b9..c5de2ca51382 100644
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0-r3.ebuild
+++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.500.0-r3.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-perl/Module-Build-0.420.0
diff --git a/dev-perl/Net-IP/Net-IP-1.260.0-r2.ebuild b/dev-perl/Net-IP/Net-IP-1.260.0-r2.ebuild
index 09ef450e00da..c3e407346438 100644
--- a/dev-perl/Net-IP/Net-IP-1.260.0-r2.ebuild
+++ b/dev-perl/Net-IP/Net-IP-1.260.0-r2.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Perl extension for manipulating IPv4/IPv6 addresses"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=( "${FILESDIR}/initip-0.patch" )
diff --git a/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild b/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild
index c75a4d1d2435..6d8631c8daeb 100644
--- a/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild
+++ b/dev-perl/Net-Ident/Net-Ident-1.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lookup the username on the remote end of a TCP/IP connection"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r3.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r3.ebuild
index 40bd2eddffc0..6ec583110319 100644
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r3.ebuild
+++ b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Jabber Perl library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r3.ebuild b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r3.ebuild
index 8d222a4ae5a8..1ac48527292c 100644
--- a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r3.ebuild
+++ b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl bindings for GNU Libidn"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="net-dns/libidn:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.20.0-r1.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.20.0-r1.ebuild
index 3edda9639d4c..3cd13e7306c1 100644
--- a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.20.0-r1.ebuild
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.20.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl bindings for GNU Libidn2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="net-dns/libidn2:="
 DEPEND="net-dns/libidn2:="
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r2.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r2.ebuild
index d007346c2f22..195c0b0ff469 100644
--- a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r2.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="ipv6"
 
 RDEPEND="dev-perl/Net-CIDR-Lite
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.230.0.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.230.0.ebuild
index e1c64e2390fe..6025512f82b3 100644
--- a/dev-perl/Net-Patricia/Net-Patricia-1.230.0.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.230.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.240.0.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.240.0.ebuild
index 6f465b32a934..3dee1c6fb04c 100644
--- a/dev-perl/Net-Patricia/Net-Patricia-1.240.0.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.240.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0-r1.ebuild b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0-r1.ebuild
index ed7ea0641397..0444a6b01394 100644
--- a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0-r1.ebuild
+++ b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="(Deprecated) SSL support for Net::SMTP"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-libnet
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0-r1.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0-r1.ebuild
index 4dc90f4b61c0..b7b1dc2cab64 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0-r1.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
index bb4ab091fe75..edce43cfb8f1 100644
--- a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
+++ b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-perl/Socket6-0.250.0
diff --git a/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild b/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
index 283e9e34bc66..c7d423bdee2f 100644
--- a/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
+++ b/dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="interact with TELNET port or other TCP ports in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=virtual/perl-libnet-1.70.300"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
index ea9c00110eea..846e2a299e9b 100644
--- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/Authen-SASL-2.120.0
diff --git a/dev-perl/Number-Compare/Number-Compare-0.30.0-r2.ebuild b/dev-perl/Number-Compare/Number-Compare-0.30.0-r2.ebuild
index f0fb36bf7bad..ea578d3c4afd 100644
--- a/dev-perl/Number-Compare/Number-Compare-0.30.0-r2.ebuild
+++ b/dev-perl/Number-Compare/Number-Compare-0.30.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Numeric comparisons"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.220.0.ebuild b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.220.0.ebuild
index d82d98fc40f5..464c08c0ea4a 100644
--- a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.220.0.ebuild
+++ b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.220.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Simple Class for OLE document interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild b/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild
index 62e1c15b0879..67fd29f13a43 100644
--- a/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild
+++ b/dev-perl/Ogg-Vorbis-Header-PurePerl/Ogg-Vorbis-Header-PurePerl-1.50.0.ebuild
@@ -12,4 +12,4 @@ DESCRIPTION="Object-oriented interface to Ogg Vorbis information and comment fie
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
diff --git a/dev-perl/OpenGL/OpenGL-0.700.200.ebuild b/dev-perl/OpenGL/OpenGL-0.700.200.ebuild
index 7d2ce1dc5e00..d92e38d1bbce 100644
--- a/dev-perl/OpenGL/OpenGL-0.700.200.ebuild
+++ b/dev-perl/OpenGL/OpenGL-0.700.200.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl interface providing graphics display using OpenGL"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc ~ppc64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild b/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild
index 1d26a6b56d3f..c559b4b0a9b7 100644
--- a/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild
+++ b/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create and manipulate PAR distributions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/PGPLOT/PGPLOT-2.280.0.ebuild b/dev-perl/PGPLOT/PGPLOT-2.280.0.ebuild
index 2a236180a255..5f4b263ca00f 100644
--- a/dev-perl/PGPLOT/PGPLOT-2.280.0.ebuild
+++ b/dev-perl/PGPLOT/PGPLOT-2.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Allow subroutines in the PGPLOT graphics library to be called from Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 RDEPEND="
 	sci-libs/pgplot
diff --git a/dev-perl/PPI/PPI-1.279.0.ebuild b/dev-perl/PPI/PPI-1.279.0.ebuild
index cb36e66f8947..ec774e10dcd2 100644
--- a/dev-perl/PPI/PPI-1.279.0.ebuild
+++ b/dev-perl/PPI/PPI-1.279.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze, and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/PPI/PPI-1.281.0.ebuild b/dev-perl/PPI/PPI-1.281.0.ebuild
index 88d70b2c7e64..6389ee307ccf 100644
--- a/dev-perl/PPI/PPI-1.281.0.ebuild
+++ b/dev-perl/PPI/PPI-1.281.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze, and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/PPI/PPI-1.283.0.ebuild b/dev-perl/PPI/PPI-1.283.0.ebuild
index 532f795b048f..c50a38883b71 100644
--- a/dev-perl/PPI/PPI-1.283.0.ebuild
+++ b/dev-perl/PPI/PPI-1.283.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze, and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/Clone-0.300.0
diff --git a/dev-perl/PPI/PPI-1.284.0.ebuild b/dev-perl/PPI/PPI-1.284.0.ebuild
index 596813bc51f0..44ff0c5768b8 100644
--- a/dev-perl/PPI/PPI-1.284.0.ebuild
+++ b/dev-perl/PPI/PPI-1.284.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze, and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-perl/Clone-0.300.0
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.89.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.89.0.ebuild
index e60714fe322a..ebc2d5f5fd07 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.89.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.89.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Represent a regular expression of some sort"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-perl/List-MoreUtils
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.90.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.90.0.ebuild
index 92dfbea995f6..5a1700f5ea62 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.90.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.90.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Represent a regular expression of some sort"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-perl/List-MoreUtils
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.91.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.91.0.ebuild
index 6c5ba7d640a2..9ad4f8df72bb 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.91.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.91.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Represent a regular expression of some sort"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-perl/List-MoreUtils
diff --git a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r2.ebuild b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r2.ebuild
index 97024ce24d4f..da40b691f6a5 100644
--- a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r2.ebuild
+++ b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extensions to PPI"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-perl/PPI-1.208
diff --git a/dev-perl/Package-Constants/Package-Constants-0.60.0-r1.ebuild b/dev-perl/Package-Constants/Package-Constants-0.60.0-r1.ebuild
index 3a4e0b872c67..36258509d0f5 100644
--- a/dev-perl/Package-Constants/Package-Constants-0.60.0-r1.ebuild
+++ b/dev-perl/Package-Constants/Package-Constants-0.60.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="List all constants declared in a package"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.180.0.ebuild b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.180.0.ebuild
index 4af71955b8a9..19bd079aa192 100644
--- a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.180.0.ebuild
+++ b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.180.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Manage deprecation warnings for your distribution"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.300.0.ebuild b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.300.0.ebuild
index 1b1f5f03d7e2..f0fb6a9b5f95 100644
--- a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.300.0.ebuild
+++ b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Faster and more correct implementation of the Package::Stash API"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
diff --git a/dev-perl/PadWalker/PadWalker-2.500.0.ebuild b/dev-perl/PadWalker/PadWalker-2.500.0.ebuild
index 020f939ce7b5..d62b4ebf492b 100644
--- a/dev-perl/PadWalker/PadWalker-2.500.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.500.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="play with other peoples' lexical variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Pango/Pango-1.227.0-r3.ebuild b/dev-perl/Pango/Pango-1.227.0-r3.ebuild
index a1de92a40a49..94a70da0e65e 100644
--- a/dev-perl/Pango/Pango-1.227.0-r3.ebuild
+++ b/dev-perl/Pango/Pango-1.227.0-r3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Layout and render international text"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+minimal"
 
 RDEPEND="
diff --git a/dev-perl/Params-Classify/Params-Classify-0.15.0-r1.ebuild b/dev-perl/Params-Classify/Params-Classify-0.15.0-r1.ebuild
index 08b2be4330c1..0f986d673e48 100644
--- a/dev-perl/Params-Classify/Params-Classify-0.15.0-r1.ebuild
+++ b/dev-perl/Params-Classify/Params-Classify-0.15.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Argument type classification"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Devel-CallChecker-0.3.0
diff --git a/dev-perl/Params-Util/Params-Util-1.102.0.ebuild b/dev-perl/Params-Util/Params-Util-1.102.0.ebuild
index c22037b79dc5..f05990c351f6 100644
--- a/dev-perl/Params-Util/Params-Util-1.102.0.ebuild
+++ b/dev-perl/Params-Util/Params-Util-1.102.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utility functions to aid in parameter checking"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Scalar-List-Utils-1.180.0
diff --git a/dev-perl/Params-Validate/Params-Validate-1.310.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.310.0.ebuild
index 5b9c0520d1c2..d38051cecca4 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.310.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.310.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.310.0-r1.ebuild b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.310.0-r1.ebuild
index 3020af0df99a..5f385b8784cf 100644
--- a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.310.0-r1.ebuild
+++ b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.310.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Build an optimized subroutine parameter validator once, use it fore
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15-r1.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15-r1.ebuild
index 54f7e07fad2a..2b3f04fbd959 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15-r1.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Generate Recursive-Descent Parsers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Text-Balanced-1.950.0
diff --git a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild
index 35bc59cd7ed8..cbd9b6db70f9 100644
--- a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild
+++ b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Compiles yacc-like LALR grammars to generate Perl OO parser modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	!<net-fs/samba-4.10.6
diff --git a/dev-perl/Path-Class/Path-Class-0.370.0-r2.ebuild b/dev-perl/Path-Class/Path-Class-0.370.0-r2.ebuild
index c0add7b311de..98b3988b3665 100644
--- a/dev-perl/Path-Class/Path-Class-0.370.0-r2.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.370.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform path specification manipulation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Path-Tiny/Path-Tiny-0.146.0.ebuild b/dev-perl/Path-Tiny/Path-Tiny-0.146.0.ebuild
index 89693cd5c76e..8972b9c6ad10 100644
--- a/dev-perl/Path-Tiny/Path-Tiny-0.146.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.146.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="File path utility"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Path-Tiny/Path-Tiny-0.148.0.ebuild b/dev-perl/Path-Tiny/Path-Tiny-0.148.0.ebuild
index 4b71261912ad..544ab008e157 100644
--- a/dev-perl/Path-Tiny/Path-Tiny-0.148.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.148.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="File path utility"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Path-Tiny/Path-Tiny-0.150.0.ebuild b/dev-perl/Path-Tiny/Path-Tiny-0.150.0.ebuild
index 89f3fb0ec048..968cff84210e 100644
--- a/dev-perl/Path-Tiny/Path-Tiny-0.150.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.150.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="File path utility"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r2.ebuild b/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r2.ebuild
index 65b69d05b106..332d1714ff32 100644
--- a/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r2.ebuild
+++ b/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate (possibly exuberant) Ctags style tags for Perl sourcecode"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="minimal"
 
 PATCHES=(
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20250311.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20250311.0.0.ebuild
index 4f27a39cbddc..b75d4158d49c 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20250311.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20250311.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Ti
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20250616.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20250616.0.0.ebuild
index 3ead161d50b0..f5e995ed1127 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20250616.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20250616.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Ti
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20250711.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20250711.0.0.ebuild
index c62f56b40ec6..c1f4e2505081 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20250711.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20250711.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Ti
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20250912.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20250912.0.0.ebuild
index 95b7bdfebf6e..1642c75e6023 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20250912.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20250912.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Ti
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.12.0-r1.ebuild b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.12.0-r1.ebuild
index c503851da85f..0a1c170120e0 100644
--- a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.12.0-r1.ebuild
+++ b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.12.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Querying your filehandle's capabilities"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/PerlIO-eol/PerlIO-eol-0.190.0.ebuild b/dev-perl/PerlIO-eol/PerlIO-eol-0.190.0.ebuild
index 385d22cc4ff4..0714186b16fa 100644
--- a/dev-perl/PerlIO-eol/PerlIO-eol-0.190.0.ebuild
+++ b/dev-perl/PerlIO-eol/PerlIO-eol-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="PerlIO layer for normalizing line endings"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.10.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.10.0.ebuild
index 9543a07adc31..8a2fed7b577f 100644
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.10.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Fast and correct UTF-8 IO"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-XSLoader
diff --git a/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r2.ebuild b/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r2.ebuild
index fc1f4e7d82ca..9586aaf03f26 100644
--- a/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r2.ebuild
+++ b/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Dynamic PerlIO layers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~mips ~ppc x86"
 
 RDEPEND="
 	>=virtual/perl-File-Temp-0.14
diff --git a/dev-perl/PlRPC/PlRPC-0.202.0-r4.ebuild b/dev-perl/PlRPC/PlRPC-0.202.0-r4.ebuild
index 4df0f0011502..5654d1cbf552 100644
--- a/dev-perl/PlRPC/PlRPC-0.202.0-r4.ebuild
+++ b/dev-perl/PlRPC/PlRPC-0.202.0-r4.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}
 DESCRIPTION="The Perl RPC Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=virtual/perl-Storable-1.0.7
 	>=dev-perl/Net-Daemon-0.34"
diff --git a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r2.ebuild b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r2.ebuild
index dbd96d539e3d..f31990f214c4 100644
--- a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r2.ebuild
+++ b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Checks if the documentation of a module is comprehensive"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Pod-Parser-1.130.0
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild
index 68ad811aa650..59d4d3c3a601 100644
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert Pod data to formatted LaTeX"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Pod-Parser
diff --git a/dev-perl/Pod-Markdown/Pod-Markdown-3.400.0.ebuild b/dev-perl/Pod-Markdown/Pod-Markdown-3.400.0.ebuild
index ad2e00748d17..eb138585355b 100644
--- a/dev-perl/Pod-Markdown/Pod-Markdown-3.400.0.ebuild
+++ b/dev-perl/Pod-Markdown/Pod-Markdown-3.400.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert POD to Markdown"
 
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~riscv x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Pod-Parser/Pod-Parser-1.660.0.ebuild b/dev-perl/Pod-Parser/Pod-Parser-1.660.0.ebuild
index b83d9ebc2dc7..4f82915f1444 100644
--- a/dev-perl/Pod-Parser/Pod-Parser-1.660.0.ebuild
+++ b/dev-perl/Pod-Parser/Pod-Parser-1.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="POD filters and translators"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0-r1.ebuild b/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0-r1.ebuild
index b41000ac4f5c..af5a5892f6df 100644
--- a/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0-r1.ebuild
+++ b/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="format Pod as LaTeX"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Pod-Simple-0.10.0
diff --git a/dev-perl/Pod-Spell/Pod-Spell-1.270.0-r1.ebuild b/dev-perl/Pod-Spell/Pod-Spell-1.270.0-r1.ebuild
index e438391f9c7c..30f72a55c6b2 100644
--- a/dev-perl/Pod-Spell/Pod-Spell-1.270.0-r1.ebuild
+++ b/dev-perl/Pod-Spell/Pod-Spell-1.270.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A formatter for spellchecking Pod"
 SRC_URI+=" mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild b/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild
index 63b14ea0160e..1a82351deb05 100644
--- a/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild
+++ b/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extracts embedded tests and code examples from POD"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc x86"
 
 RDEPEND="virtual/perl-File-Spec
 "
diff --git a/dev-perl/Probe-Perl/Probe-Perl-0.30.0-r1.ebuild b/dev-perl/Probe-Perl/Probe-Perl-0.30.0-r1.ebuild
index 1b9075238c5a..2285a5a83bf6 100644
--- a/dev-perl/Probe-Perl/Probe-Perl-0.30.0-r1.ebuild
+++ b/dev-perl/Probe-Perl/Probe-Perl-0.30.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Information about the currently running perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild b/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild
index 8de6c81fc7c7..735a706382ed 100644
--- a/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild
+++ b/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-perl/Module-Build-Tiny-0.35.0
diff --git a/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild b/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild
index b53a6fff3e8f..2c76390b8487 100644
--- a/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild
+++ b/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="XS Implementation for Ref::Util"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 LICENSE="MIT"
 
 RDEPEND="
diff --git a/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild b/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild
index 65229b88bf88..f6e0a786f2c0 100644
--- a/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild
+++ b/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Utility functions for checking references"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 LICENSE="MIT"
 IUSE="+xs"
 
diff --git a/dev-perl/Regexp-Common/Regexp-Common-2024080801.0.0-r1.ebuild b/dev-perl/Regexp-Common/Regexp-Common-2024080801.0.0-r1.ebuild
index 3d562a331bf7..ba17098c3e2a 100644
--- a/dev-perl/Regexp-Common/Regexp-Common-2024080801.0.0-r1.ebuild
+++ b/dev-perl/Regexp-Common/Regexp-Common-2024080801.0.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? ( dev-perl/Test-Regexp )
diff --git a/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r2.ebuild b/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r2.ebuild
index 5923810c9973..ab520a8313ba 100644
--- a/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r2.ebuild
+++ b/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Regexp::Shellish - Shell-like regular expressions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~mips ~ppc ppc64 ~sparc x86"
diff --git a/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild b/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild
index 03878b097fe0..cf4d463bc716 100644
--- a/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild
+++ b/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="General purpose utilities for working with Regular Expressions"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Exporter-Tiny
diff --git a/dev-perl/Role-Tiny/Role-Tiny-2.2.4.ebuild b/dev-perl/Role-Tiny/Role-Tiny-2.2.4.ebuild
index 8388db23d6ff..ae585abf4f41 100644
--- a/dev-perl/Role-Tiny/Role-Tiny-2.2.4.ebuild
+++ b/dev-perl/Role-Tiny/Role-Tiny-2.2.4.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Roles: a nouvelle cuisine portion size slice of Moose"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Roman/Roman-1.240.0-r1.ebuild b/dev-perl/Roman/Roman-1.240.0-r1.ebuild
index 0b3875b051ff..c2a92ddec261 100644
--- a/dev-perl/Roman/Roman-1.240.0-r1.ebuild
+++ b/dev-perl/Roman/Roman-1.240.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Perl module for conversion between Roman and Arabic numerals"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv ~s390 x86"
 
 DEPEND="test? (
 		dev-perl/Test-Pod
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.1-r2.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.1-r2.ebuild
index 2fe633dee124..19b5064736c8 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.1-r2.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.1-r2.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl library for parsing the output of nsgmls"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="dev-perl/Module-Build"
 
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild
index 7b38ceec0350..cac4a1ce3f55 100644
--- a/dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild
+++ b/dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lightweight interface to the SOAP protocol both on client and serve
 
 IUSE="ssl test xmpp"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 myconf="${myconf} --noprompt"
 
diff --git a/dev-perl/SQL-Statement/SQL-Statement-1.414.0-r1.ebuild b/dev-perl/SQL-Statement/SQL-Statement-1.414.0-r1.ebuild
index a775e79dea0e..f9671005441f 100644
--- a/dev-perl/SQL-Statement/SQL-Statement-1.414.0-r1.ebuild
+++ b/dev-perl/SQL-Statement/SQL-Statement-1.414.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Small SQL parser and engine"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/SUPER/SUPER-1.201.905.310.ebuild b/dev-perl/SUPER/SUPER-1.201.905.310.ebuild
index 15fe840b8ea8..2f283dbd66c5 100644
--- a/dev-perl/SUPER/SUPER-1.201.905.310.ebuild
+++ b/dev-perl/SUPER/SUPER-1.201.905.310.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="control superclass method dispatch"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r2.ebuild b/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r2.ebuild
index 679fee0f8800..cb1e4df48a57 100644
--- a/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r2.ebuild
+++ b/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="run-time properties on scalar variables"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/dev-perl/Scope-Guard/Scope-Guard-0.210.0-r1.ebuild b/dev-perl/Scope-Guard/Scope-Guard-0.210.0-r1.ebuild
index a4ad13ee6857..4148093bc104 100644
--- a/dev-perl/Scope-Guard/Scope-Guard-0.210.0-r1.ebuild
+++ b/dev-perl/Scope-Guard/Scope-Guard-0.210.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Lexically scoped resource management"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Set-IntSpan/Set-IntSpan-1.190.0-r2.ebuild b/dev-perl/Set-IntSpan/Set-IntSpan-1.190.0-r2.ebuild
index d7fb5c6b8c75..3d3520aab820 100644
--- a/dev-perl/Set-IntSpan/Set-IntSpan-1.190.0-r2.ebuild
+++ b/dev-perl/Set-IntSpan/Set-IntSpan-1.190.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Manages sets of integers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~riscv x86"
diff --git a/dev-perl/Set-Scalar/Set-Scalar-1.290.0-r1.ebuild b/dev-perl/Set-Scalar/Set-Scalar-1.290.0-r1.ebuild
index 7f7140da03d4..80f1dc9d7230 100644
--- a/dev-perl/Set-Scalar/Set-Scalar-1.290.0-r1.ebuild
+++ b/dev-perl/Set-Scalar/Set-Scalar-1.290.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Scalar set operations"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~m68k ppc ~ppc64 ~s390 ~sparc x86"
diff --git a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild
index 36db779860da..dda95bb3d87e 100644
--- a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild
+++ b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Import environment variable changes from external commands or shell scripts"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/Class-MethodMaker-2
diff --git a/dev-perl/Socket6/Socket6-0.290.0-r2.ebuild b/dev-perl/Socket6/Socket6-0.290.0-r2.ebuild
index 8580092ff4f4..967c3404d17e 100644
--- a/dev-perl/Socket6/Socket6-0.290.0-r2.ebuild
+++ b/dev-perl/Socket6/Socket6-0.290.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.290.0-pointer-warning.patch
diff --git a/dev-perl/Socket6/Socket6-0.290.0.ebuild b/dev-perl/Socket6/Socket6-0.290.0.ebuild
index 852fc2edfcca..173ddb4387b4 100644
--- a/dev-perl/Socket6/Socket6-0.290.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.290.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 src_unpack() {
 	default
diff --git a/dev-perl/Sort-Versions/Sort-Versions-1.620.0-r2.ebuild b/dev-perl/Sort-Versions/Sort-Versions-1.620.0-r2.ebuild
index 7652fc9aa546..1186cfedc925 100644
--- a/dev-perl/Sort-Versions/Sort-Versions-1.620.0-r2.ebuild
+++ b/dev-perl/Sort-Versions/Sort-Versions-1.620.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Module for sorting of revision-like numbers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
diff --git a/dev-perl/Spiffy/Spiffy-0.460.0-r1.ebuild b/dev-perl/Spiffy/Spiffy-0.460.0-r1.ebuild
index 4d3a4ac28213..66f2acf58e95 100644
--- a/dev-perl/Spiffy/Spiffy-0.460.0-r1.ebuild
+++ b/dev-perl/Spiffy/Spiffy-0.460.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Spiffy Perl Interface Framework For You"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.660.0.ebuild b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.660.0.ebuild
index 6b87158a6448..9657db681593 100644
--- a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.660.0.ebuild
+++ b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read information from an Excel file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="cjk unicode"
 
 # Digest::Perl::MD5 cannot be replaced by Digest::MD5, as this module actually
diff --git a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0-r1.ebuild b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0-r1.ebuild
index e9cc7a5989d2..c966f9d67fd1 100644
--- a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0-r1.ebuild
+++ b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Write cross-platform Excel binary file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-File-Temp
diff --git a/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild b/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
index 66ac23af4af1..037dc1654612 100644
--- a/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
diff --git a/dev-perl/String-Format/String-Format-1.180.0-r1.ebuild b/dev-perl/String-Format/String-Format-1.180.0-r1.ebuild
index 60c9d8e7cfd3..a778185a94c3 100644
--- a/dev-perl/String-Format/String-Format-1.180.0-r1.ebuild
+++ b/dev-perl/String-Format/String-Format-1.180.0-r1.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="sprintf-like string formatting capabilities with arbitrary format d
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
diff --git a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.55.ebuild b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.55.ebuild
index 976e722633bd..fe4b31dc0751 100644
--- a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.55.ebuild
+++ b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.55.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Helper routines for using Sub::Exporter to build methods"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Scalar-List-Utils
diff --git a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13-r1.ebuild b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13-r1.ebuild
index e0c085efbb38..f9cbadf8fb63 100644
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13-r1.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Only use Sub::Exporter if you need it"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Sub-Exporter
diff --git a/dev-perl/Sub-Exporter/Sub-Exporter-0.991.0.ebuild b/dev-perl/Sub-Exporter/Sub-Exporter-0.991.0.ebuild
index f1276d5efde2..a102666828c7 100644
--- a/dev-perl/Sub-Exporter/Sub-Exporter-0.991.0.ebuild
+++ b/dev-perl/Sub-Exporter/Sub-Exporter-0.991.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Sophisticated exporter for custom-built routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.140.0-r1.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.140.0-r1.ebuild
index 03ea427fd6f8..35f462c3f7d6 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.140.0-r1.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.140.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Retrieve names of code references"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Sub-Info/Sub-Info-0.2.0-r1.ebuild b/dev-perl/Sub-Info/Sub-Info-0.2.0-r1.ebuild
index 18a0ebe2f860..a58478e31fd1 100644
--- a/dev-perl/Sub-Info/Sub-Info-0.2.0-r1.ebuild
+++ b/dev-perl/Sub-Info/Sub-Info-0.2.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Tool for inspecting subroutines"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Sub-Install/Sub-Install-0.929.0.ebuild b/dev-perl/Sub-Install/Sub-Install-0.929.0.ebuild
index 18e76ef5480c..e3e5e1a6efaf 100644
--- a/dev-perl/Sub-Install/Sub-Install-0.929.0.ebuild
+++ b/dev-perl/Sub-Install/Sub-Install-0.929.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Install subroutines into packages easily"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Sub-Name/Sub-Name-0.280.0-r1.ebuild b/dev-perl/Sub-Name/Sub-Name-0.280.0-r1.ebuild
index 28b17b3e4593..4940bb0ad31c 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.280.0-r1.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.280.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="(Re)name a sub"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="suggested"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Override/Sub-Override-0.120.0.ebuild b/dev-perl/Sub-Override/Sub-Override-0.120.0.ebuild
index 63389bf29c85..c586af3e2586 100644
--- a/dev-perl/Sub-Override/Sub-Override-0.120.0.ebuild
+++ b/dev-perl/Sub-Override/Sub-Override-0.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for easily overriding subroutines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.6.8.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.6.8.ebuild
index cdb9d848f984..fcd2b6862350 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.6.8.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.6.8.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Efficient generation of subroutines via string eval"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.6.9.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.6.9.ebuild
index 4b0d179acad3..acb70d871b3b 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.6.9.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.6.9.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Efficient generation of subroutines via string eval"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/Moo-2.3.0
diff --git a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0-r1.ebuild b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0-r1.ebuild
index af602a761c28..df7f6d057d1f 100644
--- a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0-r1.ebuild
+++ b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Apparently run a function in a higher stack frame"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Switch/Switch-2.170.0-r1.ebuild b/dev-perl/Switch/Switch-2.170.0-r1.ebuild
index a3dfd80fffad..0fa85796875c 100644
--- a/dev-perl/Switch/Switch-2.170.0-r1.ebuild
+++ b/dev-perl/Switch/Switch-2.170.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="A switch statement for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
diff --git a/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.300.0.ebuild b/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.300.0.ebuild
index 6824003cc866..3d86b3313236 100644
--- a/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.300.0.ebuild
+++ b/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A try/catch/finally syntax for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-perl/XS-Parse-Keyword"
 BDEPEND="
diff --git a/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.310.0.ebuild b/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.310.0.ebuild
index 6e59f74c5a2e..4ee026570f7e 100644
--- a/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.310.0.ebuild
+++ b/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A try/catch/finally syntax for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-perl/XS-Parse-Keyword"
 BDEPEND="
diff --git a/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r2.ebuild b/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r2.ebuild
index 6300e7a909cd..878546ac3f04 100644
--- a/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r2.ebuild
+++ b/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Try every conceivable way to get full hostname"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r2.ebuild b/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r2.ebuild
index 7d60bd12c82a..3ffb6d7ca5fa 100644
--- a/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r2.ebuild
+++ b/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Runtime enable taint checking"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild b/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild
index 8aa0459079a5..4189e0b184fe 100644
--- a/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild
+++ b/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Ensure that a platform has weaken support"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.120.0-r2.ebuild b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.120.0-r2.ebuild
index b3fc27ceaaf6..b98d02b3fec4 100644
--- a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.120.0-r2.ebuild
+++ b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.120.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="LaTeX support for the Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-perl/LaTeX-Driver-0.70.0
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-3.101.0.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-3.101.0.ebuild
index 2b5c4794faa9..40247f12eb78 100644
--- a/dev-perl/Template-Toolkit/Template-Toolkit-3.101.0.ebuild
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-3.101.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 IUSE="xml gd mysql postgres latex vim-syntax test"
 
 RDEPEND="
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-3.102.0.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-3.102.0.ebuild
index 1574bf033e2d..b50a419187ee 100644
--- a/dev-perl/Template-Toolkit/Template-Toolkit-3.102.0.ebuild
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-3.102.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Template Toolkit"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 IUSE="gd mysql postgres latex vim-syntax test xml"
 
 RDEPEND="
diff --git a/dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild b/dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild
index 482810c13280..794af66c4714 100644
--- a/dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild
+++ b/dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XML plugins for the Template Toolkit"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	>=dev-perl/Template-Toolkit-2.150.0-r1
diff --git a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.230.0.ebuild b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.230.0.ebuild
index 8f1c6cf67452..863643ab93b1 100644
--- a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.230.0.ebuild
+++ b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.230.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Provide a progress meter on a standard terminal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.460.0-r1.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.460.0-r1.ebuild
index 8a055880e129..4f598012f43d 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.460.0-r1.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.460.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the GNU Readline/History Library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=sys-libs/readline-6.2:=
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.460.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.460.0.ebuild
index dfaf2aa07655..44c1028f6a12 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.460.0.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.460.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the GNU Readline/History Library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=sys-libs/readline-6.2:=
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.470.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.470.0.ebuild
index ba5e115f6865..77446454b51c 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.470.0.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.470.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the GNU Readline/History Library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=sys-libs/readline-6.2:=
diff --git a/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r3.ebuild b/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r3.ebuild
index 1472292f09de..1ad749a7168d 100644
--- a/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r3.ebuild
+++ b/dev-perl/Term-ReadLine-Perl/Term-ReadLine-Perl-1.30.300-r3.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Quick implementation of readline utilities"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0303-nointeractive.patch"
diff --git a/dev-perl/TermReadKey/TermReadKey-2.380.0-r1.ebuild b/dev-perl/TermReadKey/TermReadKey-2.380.0-r1.ebuild
index 67eade875ed2..0d387f0a4f42 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.380.0-r1.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.380.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Change terminal modes, and perform non-blocking reads"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.580.0
diff --git a/dev-perl/Test-Base/Test-Base-0.890.0.ebuild b/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
index 43e89a7bab6f..36b92071337d 100644
--- a/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
+++ b/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Data Driven Testing Framework"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Filter
diff --git a/dev-perl/Test-Class/Test-Class-0.520.0-r1.ebuild b/dev-perl/Test-Class/Test-Class-0.520.0-r1.ebuild
index 0402929e72f4..b6b7826624cc 100644
--- a/dev-perl/Test-Class/Test-Class-0.520.0-r1.ebuild
+++ b/dev-perl/Test-Class/Test-Class-0.520.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily create test classes in an xUnit/JUnit style"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-ClassAPI/Test-ClassAPI-1.70.0-r1.ebuild b/dev-perl/Test-ClassAPI/Test-ClassAPI-1.70.0-r1.ebuild
index 1cd541769132..35a36bbe5001 100644
--- a/dev-perl/Test-ClassAPI/Test-ClassAPI-1.70.0-r1.ebuild
+++ b/dev-perl/Test-ClassAPI/Test-ClassAPI-1.70.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provides basic first-pass API testing for large class trees"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/Class-Inspector-1.120.0
diff --git a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.240.0-r1.ebuild b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.240.0-r1.ebuild
index 966f3e9e0adf..ef94ed4b4b08 100644
--- a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.240.0-r1.ebuild
+++ b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.240.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check for uncleaned imports"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Test-Deep/Test-Deep-1.204.0.ebuild b/dev-perl/Test-Deep/Test-Deep-1.204.0.ebuild
index d3de171fd469..a413c094197f 100644
--- a/dev-perl/Test-Deep/Test-Deep-1.204.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-1.204.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extremely flexible deep comparison testing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Scalar-List-Utils-1.90.0
diff --git a/dev-perl/Test-Deep/Test-Deep-1.205.0.ebuild b/dev-perl/Test-Deep/Test-Deep-1.205.0.ebuild
index d7ebc05db559..0557b70e76b5 100644
--- a/dev-perl/Test-Deep/Test-Deep-1.205.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-1.205.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extremely flexible deep comparison testing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Scalar-List-Utils-1.90.0
diff --git a/dev-perl/Test-Differences/Test-Differences-0.710.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.710.0.ebuild
index e700909cd914..1c08c515ccc9 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.710.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.710.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Capture-Tiny-0.240.0
diff --git a/dev-perl/Test-Differences/Test-Differences-0.720.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.720.0.ebuild
index 23ee2d8c0b3c..1419f7c13251 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.720.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.720.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Capture-Tiny-0.240.0
diff --git a/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0-r2.ebuild b/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0-r2.ebuild
index 41de671b231f..f0bed9fd6aec 100644
--- a/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0-r2.ebuild
+++ b/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Author test that validates a package MANIFEST"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Test-Exception/Test-Exception-0.430.0-r1.ebuild b/dev-perl/Test-Exception/Test-Exception-0.430.0-r1.ebuild
index b449463a79bc..d1158aaa5428 100644
--- a/dev-perl/Test-Exception/Test-Exception-0.430.0-r1.ebuild
+++ b/dev-perl/Test-Exception/Test-Exception-0.430.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test functions for exception based code"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r2.ebuild b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r2.ebuild
index 1f7f2f62e99f..99a23bb2f366 100644
--- a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r2.ebuild
+++ b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Add test failures if warnings are caught"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 LICENSE="Apache-2.0"
 
 RDEPEND="
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.17.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.17.0.ebuild
index aed8c3bef01b..61783d4657a7 100644
--- a/dev-perl/Test-Fatal/Test-Fatal-0.17.0.ebuild
+++ b/dev-perl/Test-Fatal/Test-Fatal-0.17.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.18.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.18.0.ebuild
index e79d7db1318a..baa01b411beb 100644
--- a/dev-perl/Test-Fatal/Test-Fatal-0.18.0.ebuild
+++ b/dev-perl/Test-Fatal/Test-Fatal-0.18.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2-r1.ebuild b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2-r1.ebuild
index 6bfe89c54553..93e88a82b042 100644
--- a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2-r1.ebuild
+++ b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Create a Fake ShareDir for your modules for testing"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild b/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild
index 80f70b4852ff..f6d96c64d2e6 100644
--- a/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild
+++ b/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Inline test suite support for Perl"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86"
 
 RDEPEND="
 	>=dev-perl/Algorithm-Dependency-1.20.0
diff --git a/dev-perl/Test-Inter/Test-Inter-1.120.0-r1.ebuild b/dev-perl/Test-Inter/Test-Inter-1.120.0-r1.ebuild
index 09a380c456a9..df5215248ea0 100644
--- a/dev-perl/Test-Inter/Test-Inter-1.120.0-r1.ebuild
+++ b/dev-perl/Test-Inter/Test-Inter-1.120.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Framework for more readable interactive test scripts"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.300.0"
 
diff --git a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild
index 638fa30e0218..1d988e329839 100644
--- a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild
+++ b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Traces memory leaks"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild b/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild
index 7bb60892a484..ff56c2deb66a 100644
--- a/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild
+++ b/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library to test long strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="virtual/perl-Test-Simple"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Test-Manifest/Test-Manifest-2.24.0.ebuild b/dev-perl/Test-Manifest/Test-Manifest-2.24.0.ebuild
index 4b3094be84b9..fb34fac4cc82 100644
--- a/dev-perl/Test-Manifest/Test-Manifest-2.24.0.ebuild
+++ b/dev-perl/Test-Manifest/Test-Manifest-2.24.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interact with a t/test_manifest file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
 LICENSE="Artistic-2"
 
 RDEPEND="
diff --git a/dev-perl/Test-Manifest/Test-Manifest-2.26.0.ebuild b/dev-perl/Test-Manifest/Test-Manifest-2.26.0.ebuild
index 535bbea11e2d..96c114185fb5 100644
--- a/dev-perl/Test-Manifest/Test-Manifest-2.26.0.ebuild
+++ b/dev-perl/Test-Manifest/Test-Manifest-2.26.0.ebuild
@@ -10,5 +10,5 @@ inherit perl-module
 DESCRIPTION="Interact with a t/test_manifest file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
 LICENSE="Artistic-2"
diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild
index a7b153daf76d..349a6952a4cf 100644
--- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild
+++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check for memory leaks and circular memory references"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Devel-Cycle-1.70.0
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.178.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.178.0.ebuild
index 92cb6c1f164d..8ae739d4761c 100644
--- a/dev-perl/Test-MockModule/Test-MockModule-0.178.0.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.178.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Override subroutines in a module for unit testing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.180.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.180.0.ebuild
index 91c4aed36220..f08241753a10 100644
--- a/dev-perl/Test-MockModule/Test-MockModule-0.180.0.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Override subroutines in a module for unit testing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/SUPER-1.200.0
diff --git a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0-r1.ebuild b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0-r1.ebuild
index 857bf7effa40..b80151746821 100644
--- a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0-r1.ebuild
+++ b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Replaces random number generation with non-random number generation
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Test-Most/Test-Most-0.380.0.ebuild b/dev-perl/Test-Most/Test-Most-0.380.0.ebuild
index 8fea3afee0c0..ec9b7c5adaea 100644
--- a/dev-perl/Test-Most/Test-Most-0.380.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.380.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Most commonly needed test functions and features"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Exception-Class-1.140.0
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.10.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.10.ebuild
index 440b27545de3..04ff161bdfca 100644
--- a/dev-perl/Test-Needs/Test-Needs-0.2.10.ebuild
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.10.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Skip tests when modules not available"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.60.0.ebuild b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.60.0.ebuild
index 8f8ab5c74b41..0e00d746bafa 100644
--- a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.60.0.ebuild
+++ b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.60.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Make sure you didn't emit any warnings while testing"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="virtual/perl-Test-Simple"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0-r1.ebuild b/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0-r1.ebuild
index 6af0b7cdd579..4d1333d1b88a 100644
--- a/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0-r1.ebuild
+++ b/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Compare the difference between numbers against a given tolerance"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="minimal"
 
diff --git a/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild b/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild
index 305f6335b7b2..2b306e735315 100644
--- a/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild
+++ b/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Thoroughly testing objects via registered handlers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-Output/Test-Output-1.35.0.ebuild b/dev-perl/Test-Output/Test-Output-1.35.0.ebuild
index 5206337a0739..0217409b7c86 100644
--- a/dev-perl/Test-Output/Test-Output-1.35.0.ebuild
+++ b/dev-perl/Test-Output/Test-Output-1.35.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utilities to test STDOUT and STDERR messages"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Capture-Tiny-0.170.0
diff --git a/dev-perl/Test-Output/Test-Output-1.36.0.ebuild b/dev-perl/Test-Output/Test-Output-1.36.0.ebuild
index d594639a8755..02f8dab183ff 100644
--- a/dev-perl/Test-Output/Test-Output-1.36.0.ebuild
+++ b/dev-perl/Test-Output/Test-Output-1.36.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utilities to test STDOUT and STDERR messages"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Capture-Tiny-0.170.0
diff --git a/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0-r1.ebuild b/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0-r1.ebuild
index e0b429bbf094..098b90c105d2 100644
--- a/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0-r1.ebuild
+++ b/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check for pod coverage in your distribution"
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Test-Simple
diff --git a/dev-perl/Test-Pod/Test-Pod-1.520.0.ebuild b/dev-perl/Test-Pod/Test-Pod-1.520.0.ebuild
index 5d70187a39ba..892cb5259f1d 100644
--- a/dev-perl/Test-Pod/Test-Pod-1.520.0.ebuild
+++ b/dev-perl/Test-Pod/Test-Pod-1.520.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check for POD errors in files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Pod-Simple-3.50.0
diff --git a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
index 2a35e0b70af3..82a0df063c4e 100644
--- a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
+++ b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Test-Simple
diff --git a/dev-perl/Test-Requires/Test-Requires-0.110.0.ebuild b/dev-perl/Test-Requires/Test-Requires-0.110.0.ebuild
index b5820ef27233..7cafda717cee 100644
--- a/dev-perl/Test-Requires/Test-Requires-0.110.0.ebuild
+++ b/dev-perl/Test-Requires/Test-Requires-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Checks to see if the module can be loaded"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=virtual/perl-Test-Simple-0.470.0
diff --git a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0-r1.ebuild b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0-r1.ebuild
index 9f5661d55ba4..c918536097dc 100644
--- a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0-r1.ebuild
+++ b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily test network connectivity"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Socket
diff --git a/dev-perl/Test-Script/Test-Script-1.290.0-r1.ebuild b/dev-perl/Test-Script/Test-Script-1.290.0-r1.ebuild
index 49805e3d1b46..787a17c644d5 100644
--- a/dev-perl/Test-Script/Test-Script-1.290.0-r1.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.290.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform basic tests for scripts"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Capture-Tiny
diff --git a/dev-perl/Test-Script/Test-Script-1.310.0.ebuild b/dev-perl/Test-Script/Test-Script-1.310.0.ebuild
index 2fdb2065cf4e..93523de4cd30 100644
--- a/dev-perl/Test-Script/Test-Script-1.310.0.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform basic tests for scripts"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Capture-Tiny
diff --git a/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0-r1.ebuild b/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0-r1.ebuild
index 167f575a1bfc..be5e8931e44a 100644
--- a/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0-r1.ebuild
+++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Ensure that tests work correctly when fork() is used"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Temp
diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild
index d6b8d2af0a9e..baaaef65a073 100644
--- a/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild
+++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Track the number of times subs are called"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Test-TCP/Test-TCP-2.220.0.ebuild b/dev-perl/Test-TCP/Test-TCP-2.220.0.ebuild
index 82a5e61c9c22..7b7a188860de 100644
--- a/dev-perl/Test-TCP/Test-TCP-2.220.0.ebuild
+++ b/dev-perl/Test-TCP/Test-TCP-2.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Testing TCP program"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/Test-Taint/Test-Taint-1.80.0.ebuild b/dev-perl/Test-Taint/Test-Taint-1.80.0.ebuild
index 26b7e6e7ed9b..0338cc6349da 100644
--- a/dev-perl/Test-Taint/Test-Taint-1.80.0.ebuild
+++ b/dev-perl/Test-Taint/Test-Taint-1.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Tools to test taintedness"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_test() {
 	perl_rm_files t/pod-coverage.t t/pod.t
diff --git a/dev-perl/Test-Trap/Test-Trap-0.3.5.ebuild b/dev-perl/Test-Trap/Test-Trap-0.3.5.ebuild
index f5a59114e9e3..1715772dc1d9 100644
--- a/dev-perl/Test-Trap/Test-Trap-0.3.5.ebuild
+++ b/dev-perl/Test-Trap/Test-Trap-0.3.5.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Trap exit codes, exceptions, output, etc"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-WWW-Mechanize/Test-WWW-Mechanize-1.600.0.ebuild b/dev-perl/Test-WWW-Mechanize/Test-WWW-Mechanize-1.600.0.ebuild
index 8fdecf5f0431..cc7c3ec95a15 100644
--- a/dev-perl/Test-WWW-Mechanize/Test-WWW-Mechanize-1.600.0.ebuild
+++ b/dev-perl/Test-WWW-Mechanize/Test-WWW-Mechanize-1.600.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Testing-specific WWW::Mechanize subclass"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-Warn/Test-Warn-0.370.0.ebuild b/dev-perl/Test-Warn/Test-Warn-0.370.0.ebuild
index 70e6ced22709..cbb7d6e4056e 100644
--- a/dev-perl/Test-Warn/Test-Warn-0.370.0.ebuild
+++ b/dev-perl/Test-Warn/Test-Warn-0.370.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to test methods for warnings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Carp-1.220.0
diff --git a/dev-perl/Test-Warnings/Test-Warnings-0.37.0-r1.ebuild b/dev-perl/Test-Warnings/Test-Warnings-0.37.0-r1.ebuild
index 4feb31cff633..c994813dda90 100644
--- a/dev-perl/Test-Warnings/Test-Warnings-0.37.0-r1.ebuild
+++ b/dev-perl/Test-Warnings/Test-Warnings-0.37.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test for warnings and the lack of them"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="suggested"
 
 RDEPEND="
diff --git a/dev-perl/Test-Warnings/Test-Warnings-0.38.0.ebuild b/dev-perl/Test-Warnings/Test-Warnings-0.38.0.ebuild
index dee8a08d8998..84d63751dff7 100644
--- a/dev-perl/Test-Warnings/Test-Warnings-0.38.0.ebuild
+++ b/dev-perl/Test-Warnings/Test-Warnings-0.38.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test for warnings and the lack of them"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/File-pushd-1.4.0
diff --git a/dev-perl/Test-Without-Module/Test-Without-Module-0.210.0.ebuild b/dev-perl/Test-Without-Module/Test-Without-Module-0.210.0.ebuild
index 0ebd47b8c056..33cdc7f7769a 100644
--- a/dev-perl/Test-Without-Module/Test-Without-Module-0.210.0.ebuild
+++ b/dev-perl/Test-Without-Module/Test-Without-Module-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test fallback behaviour in absence of modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Test-Without-Module/Test-Without-Module-0.230.0.ebuild b/dev-perl/Test-Without-Module/Test-Without-Module-0.230.0.ebuild
index 4274ffe85f13..19e0fc1660fc 100644
--- a/dev-perl/Test-Without-Module/Test-Without-Module-0.230.0.ebuild
+++ b/dev-perl/Test-Without-Module/Test-Without-Module-0.230.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Test fallback behaviour in absence of modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Test-YAML/Test-YAML-1.70.0.ebuild b/dev-perl/Test-YAML/Test-YAML-1.70.0.ebuild
index 5141f2301325..e0092f7f16cc 100644
--- a/dev-perl/Test-YAML/Test-YAML-1.70.0.ebuild
+++ b/dev-perl/Test-YAML/Test-YAML-1.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Testing Module for YAML Implementations"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Test-Base-0.860.0
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.100.0-r1.ebuild b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.100.0-r1.ebuild
index e50d95f82879..4d0e777e2054 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.100.0-r1.ebuild
+++ b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.100.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fail if tests warn"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Text-Aspell/Text-Aspell-0.90.0-r3.ebuild b/dev-perl/Text-Aspell/Text-Aspell-0.90.0-r3.ebuild
index 356143b47269..3503bbab1d56 100644
--- a/dev-perl/Text-Aspell/Text-Aspell-0.90.0-r3.ebuild
+++ b/dev-perl/Text-Aspell/Text-Aspell-0.90.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to the GNU Aspell Library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 
 RDEPEND="app-text/aspell"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Text-Autoformat/Text-Autoformat-1.750.0.ebuild b/dev-perl/Text-Autoformat/Text-Autoformat-1.750.0.ebuild
index a5cea1db05b3..b5df7c9a35c5 100644
--- a/dev-perl/Text-Autoformat/Text-Autoformat-1.750.0.ebuild
+++ b/dev-perl/Text-Autoformat/Text-Autoformat-1.750.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automatic text wrapping and reformatting"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/Text-CSV-Simple/Text-CSV-Simple-1.0.0-r2.ebuild b/dev-perl/Text-CSV-Simple/Text-CSV-Simple-1.0.0-r2.ebuild
index 1a68c26c605b..0092e8704fe3 100644
--- a/dev-perl/Text-CSV-Simple/Text-CSV-Simple-1.0.0-r2.ebuild
+++ b/dev-perl/Text-CSV-Simple/Text-CSV-Simple-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Text::CSV::Simple - Simpler parsing of CSV files"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~mips ~x86"
 
 RDEPEND="
 	dev-perl/Text-CSV_XS
diff --git a/dev-perl/Text-CSV/Text-CSV-2.30.0.ebuild b/dev-perl/Text-CSV/Text-CSV-2.30.0.ebuild
index c8a5be0ef990..c99d7f1fa444 100644
--- a/dev-perl/Text-CSV/Text-CSV-2.30.0.ebuild
+++ b/dev-perl/Text-CSV/Text-CSV-2.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manipulate comma-separated value strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+xs"
 
 RDEPEND="
diff --git a/dev-perl/Text-CSV/Text-CSV-2.40.0.ebuild b/dev-perl/Text-CSV/Text-CSV-2.40.0.ebuild
index 7fb7deeda3f2..0bafbde389a5 100644
--- a/dev-perl/Text-CSV/Text-CSV-2.40.0.ebuild
+++ b/dev-perl/Text-CSV/Text-CSV-2.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manipulate comma-separated value strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+xs"
 
 RDEPEND="
diff --git a/dev-perl/Text-CSV/Text-CSV-2.60.0.ebuild b/dev-perl/Text-CSV/Text-CSV-2.60.0.ebuild
index b444bd439872..a7d509c40900 100644
--- a/dev-perl/Text-CSV/Text-CSV-2.60.0.ebuild
+++ b/dev-perl/Text-CSV/Text-CSV-2.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manipulate comma-separated value strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+xs"
 
 RDEPEND="
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.600.0-r1.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.600.0-r1.ebuild
index 085523fff3c0..b3faa68c25f9 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.600.0-r1.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.600.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Encode-3.210.0
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.610.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.610.0.ebuild
index ff4904255a97..ad71fd7658a6 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.610.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.610.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Encode-3.210.0
diff --git a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild
index 31b4c3ffa109..027edc480889 100644
--- a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild
+++ b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Get number of occupied columns of a string on terminal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Text-Diff/Text-Diff-1.450.0-r1.ebuild b/dev-perl/Text-Diff/Text-Diff-1.450.0-r1.ebuild
index e8cfafd48826..1c6c7aaf72e0 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.450.0-r1.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.450.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perform diffs on files and record sets"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Algorithm-Diff-1.190.0
diff --git a/dev-perl/Text-German/Text-German-0.60.0-r2.ebuild b/dev-perl/Text-German/Text-German-0.60.0-r2.ebuild
index 965b040cd143..3d142db467c1 100644
--- a/dev-perl/Text-German/Text-German-0.60.0-r2.ebuild
+++ b/dev-perl/Text-German/Text-German-0.60.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="German grundform reduction"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
diff --git a/dev-perl/Text-Glob/Text-Glob-0.110.0-r1.ebuild b/dev-perl/Text-Glob/Text-Glob-0.110.0-r1.ebuild
index 583465c08967..523c97667e36 100644
--- a/dev-perl/Text-Glob/Text-Glob-0.110.0-r1.ebuild
+++ b/dev-perl/Text-Glob/Text-Glob-0.110.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Match globbing patterns against text"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r3.ebuild b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r3.ebuild
index 128db07c0ce6..d07af917cad9 100644
--- a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r3.ebuild
+++ b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl interface to the iconv() codeset conversion function"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}"
diff --git a/dev-perl/Text-Kakasi/Text-Kakasi-2.40.0-r3.ebuild b/dev-perl/Text-Kakasi/Text-Kakasi-2.40.0-r3.ebuild
index fa31b961c200..0d4a3cff0082 100644
--- a/dev-perl/Text-Kakasi/Text-Kakasi-2.40.0-r3.ebuild
+++ b/dev-perl/Text-Kakasi/Text-Kakasi-2.40.0-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="This module provides libkakasi interface for Perl"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=app-i18n/kakasi-2.3.4"
 DEPEND="${RDEPEND}"
diff --git a/dev-perl/Text-Levenshtein/Text-Levenshtein-0.150.0-r1.ebuild b/dev-perl/Text-Levenshtein/Text-Levenshtein-0.150.0-r1.ebuild
index 9688e076b1bc..4511c6ee0ae0 100644
--- a/dev-perl/Text-Levenshtein/Text-Levenshtein-0.150.0-r1.ebuild
+++ b/dev-perl/Text-Levenshtein/Text-Levenshtein-0.150.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An implementation of the Levenshtein edit distance"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/Text-LevenshteinXS/Text-LevenshteinXS-0.30.0-r2.ebuild b/dev-perl/Text-LevenshteinXS/Text-LevenshteinXS-0.30.0-r2.ebuild
index 61b34ace31e2..cd388698acb5 100644
--- a/dev-perl/Text-LevenshteinXS/Text-LevenshteinXS-0.30.0-r2.ebuild
+++ b/dev-perl/Text-LevenshteinXS/Text-LevenshteinXS-0.30.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="An XS implementation of the Levenshtein edit distance"
 
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~sparc x86"
diff --git a/dev-perl/Text-Quoted/Text-Quoted-2.100.0.ebuild b/dev-perl/Text-Quoted/Text-Quoted-2.100.0.ebuild
index ae7a5b106ea8..090f3036c3b5 100644
--- a/dev-perl/Text-Quoted/Text-Quoted-2.100.0.ebuild
+++ b/dev-perl/Text-Quoted/Text-Quoted-2.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extract the structure of a quoted mail message"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-perl/Text-Autoformat
diff --git a/dev-perl/Text-Reform/Text-Reform-1.200.0-r2.ebuild b/dev-perl/Text-Reform/Text-Reform-1.200.0-r2.ebuild
index 465fae6c13b9..6ac659102939 100644
--- a/dev-perl/Text-Reform/Text-Reform-1.200.0-r2.ebuild
+++ b/dev-perl/Text-Reform/Text-Reform-1.200.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manual text wrapping and reformatting"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 BDEPEND="dev-perl/Module-Build
diff --git a/dev-perl/Text-Shellwords/Text-Shellwords-1.80.0-r2.ebuild b/dev-perl/Text-Shellwords/Text-Shellwords-1.80.0-r2.ebuild
index 149c22e64947..de9e0d5e3aac 100644
--- a/dev-perl/Text-Shellwords/Text-Shellwords-1.80.0-r2.ebuild
+++ b/dev-perl/Text-Shellwords/Text-Shellwords-1.80.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Parse text and return a set of tokens using the same rules as the Unix shell"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
diff --git a/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild b/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild
index 648664454c1a..d6017c746cfc 100644
--- a/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild
+++ b/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Implementation of the soundex algorithm"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild b/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild
index 5bc695949507..a8e3ad5808b9 100644
--- a/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild
+++ b/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Plain ASCII transliterations of Unicode text"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0-r1.ebuild b/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0-r1.ebuild
index 293991b3856d..31d363b75f9c 100644
--- a/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0-r1.ebuild
+++ b/dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Translate Wiki formatted text into other formats"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 RDEPEND="
 	dev-perl/URI
diff --git a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild
index 83d8a5c53a4f..525692818425 100644
--- a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild
+++ b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Internationalized substitute of Text::Wrap"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-perl/Text-CharWidth"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r3.ebuild b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r3.ebuild
index 2dbb1ca58cda..12e817b7ac27 100644
--- a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r3.ebuild
+++ b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Internationalized substitute of Text::Wrap"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-perl/Text-CharWidth"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r2.ebuild b/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r2.ebuild
index 6a8570a8fdf9..dd08fc24392a 100644
--- a/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r2.ebuild
+++ b/dev-perl/Tie-EncryptedHash/Tie-EncryptedHash-1.240.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Hashes (and objects based on hashes) with encrypting fields"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc x86"
 
 RDEPEND="dev-perl/Crypt-Blowfish
 	dev-perl/Crypt-DES
diff --git a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0-r1.ebuild b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0-r1.ebuild
index fd915ec283dd..9ef04c26a9cb 100644
--- a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0-r1.ebuild
+++ b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Ordered associative arrays for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 BDEPEND="
diff --git a/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r2.ebuild b/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r2.ebuild
index e81d2e7c4a20..03b6de23673c 100644
--- a/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r2.ebuild
+++ b/dev-perl/Tie-Sub/Tie-Sub-1.1.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Tying a subroutine, function or method to a hash"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 
 RDEPEND="dev-perl/Params-Validate"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Time-Duration/Time-Duration-1.210.0.ebuild b/dev-perl/Time-Duration/Time-Duration-1.210.0.ebuild
index 5e3e4745e8dc..1ac24a6ccbe2 100644
--- a/dev-perl/Time-Duration/Time-Duration-1.210.0.ebuild
+++ b/dev-perl/Time-Duration/Time-Duration-1.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Rounded or exact English expression of durations"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/TimeDate/TimeDate-2.330.0-r1.ebuild b/dev-perl/TimeDate/TimeDate-2.330.0-r1.ebuild
index 57f82b17f1e4..941c87782eaf 100644
--- a/dev-perl/TimeDate/TimeDate-2.330.0-r1.ebuild
+++ b/dev-perl/TimeDate/TimeDate-2.330.0-r1.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="A Date/Time Parsing Perl Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.290.0.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.290.0.ebuild
index 866a11564ef8..175a921eb561 100644
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.290.0.ebuild
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.290.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Create and manipulate tables in Perl + Tk"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/Tk-800.22.0
diff --git a/dev-perl/Tk/Tk-804.36.0-r5.ebuild b/dev-perl/Tk/Tk-804.36.0-r5.ebuild
index 81d3bb63fd3f..7b6440f76e53 100644
--- a/dev-perl/Tk/Tk-804.36.0-r5.ebuild
+++ b/dev-perl/Tk/Tk-804.36.0-r5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Perl Module for Tk"
 
 LICENSE+=" tcltk BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.320.0.ebuild b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.320.0.ebuild
index 5d0d260cfb39..a1113130e387 100644
--- a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.320.0.ebuild
+++ b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.320.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="(Super)class for representing nodes in a tree"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/File-Slurp-Tiny-0.3.0
diff --git a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.350.0.ebuild b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.350.0.ebuild
index 9eefc0da9652..66a4d8b0dc95 100644
--- a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.350.0.ebuild
+++ b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.350.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="(Super)class for representing nodes in a tree"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/File-Slurper-0.14.0
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.320.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.320.0.ebuild
index 0b08874f2a83..23a18e788c5c 100644
--- a/dev-perl/Try-Tiny/Try-Tiny-0.320.0.ebuild
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.320.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Minimal try/catch with proper localization of \$@"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.25.0.ebuild b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.25.0.ebuild
index 7f415b50ae1f..cb669bade1ef 100644
--- a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.25.0.ebuild
+++ b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.25.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="provides an XS boost for some of Type::Tiny's built-in type constraints"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Type-Tiny/Type-Tiny-2.6.0.ebuild b/dev-perl/Type-Tiny/Type-Tiny-2.6.0.ebuild
index 8b90ae495d77..05f9a9f6bc34 100644
--- a/dev-perl/Type-Tiny/Type-Tiny-2.6.0.ebuild
+++ b/dev-perl/Type-Tiny/Type-Tiny-2.6.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Tiny, yet Moo(se)-compatible type constraint"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Type-Tiny/Type-Tiny-2.8.2.ebuild b/dev-perl/Type-Tiny/Type-Tiny-2.8.2.ebuild
index c7255293cd71..59e5ed05dfda 100644
--- a/dev-perl/Type-Tiny/Type-Tiny-2.8.2.ebuild
+++ b/dev-perl/Type-Tiny/Type-Tiny-2.8.2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Tiny, yet Moo(se)-compatible type constraint"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Type-Tiny/Type-Tiny-2.8.3.ebuild b/dev-perl/Type-Tiny/Type-Tiny-2.8.3.ebuild
index 6e17b07ab99d..5e1ebfae9a6c 100644
--- a/dev-perl/Type-Tiny/Type-Tiny-2.8.3.ebuild
+++ b/dev-perl/Type-Tiny/Type-Tiny-2.8.3.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Tiny, yet Moo(se)-compatible type constraint"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Type-Tiny/Type-Tiny-2.8.4.ebuild b/dev-perl/Type-Tiny/Type-Tiny-2.8.4.ebuild
index ab2241d45975..4d64eaae4ff6 100644
--- a/dev-perl/Type-Tiny/Type-Tiny-2.8.4.ebuild
+++ b/dev-perl/Type-Tiny/Type-Tiny-2.8.4.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Tiny, yet Moo(se)-compatible type constraint"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Types-Serialiser/Types-Serialiser-1.10.0.ebuild b/dev-perl/Types-Serialiser/Types-Serialiser-1.10.0.ebuild
index 845e90122c58..4de5f90b9dbe 100644
--- a/dev-perl/Types-Serialiser/Types-Serialiser-1.10.0.ebuild
+++ b/dev-perl/Types-Serialiser/Types-Serialiser-1.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="simple data types for common serialisation formats"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/common-sense
diff --git a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.190.0.ebuild b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.190.0.ebuild
index 3baaf7e77bec..c4fb289eb3e7 100644
--- a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.190.0.ebuild
+++ b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="UNIVERSAL::require - require() modules from a variable"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild
index 9170a279336c..3a57852db80a 100644
--- a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild
+++ b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="East Asian Width properties"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0-r1.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0-r1.ebuild
index c6a41ff6d3c2..7e854c7641af 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0-r1.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="dev-perl/MIME-Charset"
 DEPEND="${RDEPEND}"
diff --git a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r2.ebuild b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r2.ebuild
index cd45f175530d..67e266ec18a1 100644
--- a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r2.ebuild
+++ b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r2.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Map charsets from and to utf16 code"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 PATCHES=( "${FILESDIR}"/0.112-no-scripts.patch )
diff --git a/dev-perl/Unicode-String/Unicode-String-2.100.0-r1.ebuild b/dev-perl/Unicode-String/Unicode-String-2.100.0-r1.ebuild
index fdbedff306a4..28f0f0f07659 100644
--- a/dev-perl/Unicode-String/Unicode-String-2.100.0-r1.ebuild
+++ b/dev-perl/Unicode-String/Unicode-String-2.100.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="String manipulation for Unicode strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=virtual/perl-MIME-Base64-2.110.0
diff --git a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0-r1.ebuild b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0-r1.ebuild
index 7bf758c791e7..f18288dd94e7 100644
--- a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0-r1.ebuild
+++ b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Encoding and decoding of UTF-8 encoding form"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Variable-Magic/Variable-Magic-0.640.0.ebuild b/dev-perl/Variable-Magic/Variable-Magic-0.640.0.ebuild
index 4d036110cd36..0eddd39dfe87 100644
--- a/dev-perl/Variable-Magic/Variable-Magic-0.640.0.ebuild
+++ b/dev-perl/Variable-Magic/Variable-Magic-0.640.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Associate user-defined magic to variables from Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-2.180.0-r1.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-2.180.0-r1.ebuild
index a599e1901b67..41f29f1a63eb 100644
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-2.180.0-r1.ebuild
+++ b/dev-perl/WWW-Mechanize/WWW-Mechanize-2.180.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handy web browsing in a Perl object"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc ~riscv x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-2.190.0.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-2.190.0.ebuild
index 1e3f928a9113..1be8a90ed97e 100644
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-2.190.0.ebuild
+++ b/dev-perl/WWW-Mechanize/WWW-Mechanize-2.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handy web browsing in a Perl object"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~riscv x86"
 
 RDEPEND="
 	>=dev-perl/HTML-Form-6.80.0
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-2.200.0.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-2.200.0.ebuild
index 07a362476a8e..0e3e87de1d11 100644
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-2.200.0.ebuild
+++ b/dev-perl/WWW-Mechanize/WWW-Mechanize-2.200.0.ebuild
@@ -10,7 +10,7 @@ inherit bash-completion-r1 perl-module
 DESCRIPTION="Handy web browsing in a Perl object"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
 
 RDEPEND="
 	>=dev-perl/HTML-Form-6.80.0
diff --git a/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r2.ebuild b/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r2.ebuild
index 9660a8efae13..d4cfe22f8141 100644
--- a/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r2.ebuild
+++ b/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse /robots.txt file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r3.ebuild b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r3.ebuild
index 1b03bd69b1fb..d3a31ed4cfe5 100644
--- a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r3.ebuild
+++ b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Client-side interface to the X11 Protocol"
 
 LICENSE="${LICENSE} MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libXrender
diff --git a/dev-perl/XML-DOM/XML-DOM-1.460.0-r2.ebuild b/dev-perl/XML-DOM/XML-DOM-1.460.0-r2.ebuild
index fe29a970cd81..5fb762de2b78 100644
--- a/dev-perl/XML-DOM/XML-DOM-1.460.0-r2.ebuild
+++ b/dev-perl/XML-DOM/XML-DOM-1.460.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-perl/libwww-perl
diff --git a/dev-perl/XML-Elemental/XML-Elemental-2.110.0-r2.ebuild b/dev-perl/XML-Elemental/XML-Elemental-2.110.0-r2.ebuild
index 92d2cb6a09ff..5e9096f02609 100644
--- a/dev-perl/XML-Elemental/XML-Elemental-2.110.0-r2.ebuild
+++ b/dev-perl/XML-Elemental/XML-Elemental-2.110.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="XML::Parser style and generic classes for handling of XML data"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~sparc x86"
 
 RDEPEND="
 	dev-perl/XML-Parser
diff --git a/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r2.ebuild b/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r2.ebuild
index adff53841ce3..99c0d521eab9 100644
--- a/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r2.ebuild
+++ b/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Filter to put all characters() in one event"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/XML-SAX-0.12
diff --git a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r3.ebuild b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r3.ebuild
index 334f7269ae5a..2613e9fd203f 100644
--- a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r3.ebuild
+++ b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Perl module providing a simple API to parsed XML instances"
 
 LICENSE="GPL-2" # GPL
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/libxml-perl-0.07-r1
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-2.3.0-r1.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-2.3.0-r1.ebuild
index 67703f6218cb..fa571fa549ba 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-2.3.0-r1.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-2.3.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Perl module to parse XSL Transformational sheets using GNOME's li
 # https://github.com/shlomif/perl-XML-LibXSLT/issues/5
 LICENSE="|| ( Artistic GPL-1+ ) MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/XML-LibXML-1.700.0
diff --git a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0-r1.ebuild b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0-r1.ebuild
index 4ee8914dbdaa..20eb369fa967 100644
--- a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0-r1.ebuild
+++ b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module that offers a simple to process namespaced XML names"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
diff --git a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.722.0.ebuild b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.722.0.ebuild
index bfa409189663..a842e50e74bf 100644
--- a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.722.0.ebuild
+++ b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.722.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lightweight regexp-based XML parser"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="minimal"
 
 # Note: Don't try to depend on XMLRPC-Lite or SOAP-Lite with tests,
diff --git a/dev-perl/XML-Parser/XML-Parser-2.470.0-r1.ebuild b/dev-perl/XML-Parser/XML-Parser-2.470.0-r1.ebuild
index 1ceda6c7c7c2..fb17e468e757 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.470.0-r1.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.470.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A perl module for parsing XML documents"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-libs/expat-1.95.1-r1
diff --git a/dev-perl/XML-RSS/XML-RSS-1.650.0-r1.ebuild b/dev-perl/XML-RSS/XML-RSS-1.650.0-r1.ebuild
index cc5aa5c0cc63..e044d6d2c4a1 100644
--- a/dev-perl/XML-RSS/XML-RSS-1.650.0-r1.ebuild
+++ b/dev-perl/XML-RSS/XML-RSS-1.650.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Basic framework for creating and maintaining RSS files"
 HOMEPAGE="https://perl-rss.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~x64-macos"
 
 RDEPEND="
 	dev-perl/DateTime-Format-Mail
diff --git a/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r2.ebuild b/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r2.ebuild
index e2edadc0829c..9d5ef16a4ca8 100644
--- a/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r2.ebuild
+++ b/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Regular expressions for XML tokens"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/XML-Parser-2.290.0
diff --git a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0-r1.ebuild b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0-r1.ebuild
index bbc93663c4fc..b694d8e84d1a 100644
--- a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0-r1.ebuild
+++ b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class SAX Drivers and Filters"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/XML-SAX-0.990.0
diff --git a/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0-r3.ebuild b/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0-r3.ebuild
index 8d6ba314c471..6bbcc9b6d801 100644
--- a/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0-r3.ebuild
+++ b/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0-r3.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="SAX2 Driver for Expat"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # >= on XML-Sax needed to avoid "miscompilation" (essentially empty install), as newer XML-Sax
 # has the ROOT check fixed. Didn't happen with XML-SAX-Expat, but best to be careful.
diff --git a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0-r2.ebuild b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0-r2.ebuild
index dfaa7e9115b8..a741f8dbcb25 100644
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0-r2.ebuild
+++ b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="SAX2 XML Writer"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Encode-2.120.0
diff --git a/dev-perl/XML-SAX/XML-SAX-1.20.0-r2.ebuild b/dev-perl/XML-SAX/XML-SAX-1.20.0-r2.ebuild
index a748be98b970..a273ccb5fae8 100644
--- a/dev-perl/XML-SAX/XML-SAX-1.20.0-r2.ebuild
+++ b/dev-perl/XML-SAX/XML-SAX-1.20.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl module for using and building Perl SAX2 XML parsers, filters, and drivers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/XML-SAX-Base-1.50.0
diff --git a/dev-perl/XML-Simple/XML-Simple-2.250.0-r1.ebuild b/dev-perl/XML-Simple/XML-Simple-2.250.0-r1.ebuild
index 38ad1104deb9..70fa650f83d1 100644
--- a/dev-perl/XML-Simple/XML-Simple-2.250.0-r1.ebuild
+++ b/dev-perl/XML-Simple/XML-Simple-2.250.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An API for simple XML files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Storable
diff --git a/dev-perl/XML-Stream/XML-Stream-1.240.0-r2.ebuild b/dev-perl/XML-Stream/XML-Stream-1.240.0-r2.ebuild
index da289a7a4031..b02fe3638483 100644
--- a/dev-perl/XML-Stream/XML-Stream-1.240.0-r2.ebuild
+++ b/dev-perl/XML-Stream/XML-Stream-1.240.0-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Creates and XML Stream connection and parses return data"
 SLOT="0"
 LICENSE="LGPL-2"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="ssl"
 
diff --git a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
index 83015f12d0d1..e9d59ea56661 100644
--- a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
+++ b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pure Perl implementation for parsing/writing XML documents"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ~riscv x86"
 
 RDEPEND="
 	dev-perl/libwww-perl
diff --git a/dev-perl/XML-Twig/XML-Twig-3.530.0.ebuild b/dev-perl/XML-Twig/XML-Twig-3.530.0.ebuild
index 62effb9d0c42..34c56dc96774 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.530.0.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.530.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Process huge XML documents in tree mode"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/dev-perl/XML-Twig/XML-Twig-3.540.0.ebuild b/dev-perl/XML-Twig/XML-Twig-3.540.0.ebuild
index 5a9b274d5541..2e2a9f26eb26 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.540.0.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.540.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Process huge XML documents in tree mode"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/dev-perl/XML-Writer/XML-Writer-0.900.0.ebuild b/dev-perl/XML-Writer/XML-Writer-0.900.0.ebuild
index bf809845f6f9..a651512ee6b0 100644
--- a/dev-perl/XML-Writer/XML-Writer-0.900.0.ebuild
+++ b/dev-perl/XML-Writer/XML-Writer-0.900.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="XML Writer Perl Module"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_test() {
 	perl_rm_files t/pod-coverage.t t/pod.t
diff --git a/dev-perl/XML-XPath/XML-XPath-1.480.0.ebuild b/dev-perl/XML-XPath/XML-XPath-1.480.0.ebuild
index ee1d3d54b406..98559ac978a8 100644
--- a/dev-perl/XML-XPath/XML-XPath-1.480.0.ebuild
+++ b/dev-perl/XML-XPath/XML-XPath-1.480.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An XPath Perl Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Scalar-List-Utils-1.450.0
diff --git a/dev-perl/XML-XQL/XML-XQL-0.680.0-r2.ebuild b/dev-perl/XML-XQL/XML-XQL-0.680.0-r2.ebuild
index 6b3b922edcc4..9107b63e2326 100644
--- a/dev-perl/XML-XQL/XML-XQL-0.680.0-r2.ebuild
+++ b/dev-perl/XML-XQL/XML-XQL-0.680.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module that allows you to perform XQL queries on XML trees"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/libxml-perl-0.70.0
diff --git a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.470.0.ebuild b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.470.0.ebuild
index e8fa04653ec8..64972b487e5e 100644
--- a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.470.0.ebuild
+++ b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.470.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS functions to assist in parsing keyword syntax"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/File-ShareDir
diff --git a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.480.0.ebuild b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.480.0.ebuild
index 92647afe9a2c..fef3bed4d852 100644
--- a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.480.0.ebuild
+++ b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.480.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS functions to assist in parsing keyword syntax"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/File-ShareDir
diff --git a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.490.0-r1.ebuild b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.490.0-r1.ebuild
index 6d4e4552fb08..b835d6ee8c38 100644
--- a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.490.0-r1.ebuild
+++ b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.490.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS functions to assist in parsing keyword syntax"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/File-ShareDir
diff --git a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.903.0.ebuild b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.903.0.ebuild
index 1de6f8bbd46f..d67f54074aee 100644
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.903.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.903.0.ebuild
@@ -9,6 +9,6 @@ inherit perl-module
 
 DESCRIPTION="Perl YAML Serialization using XS and libyaml"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PERL_RM_FILES=("t/author-pod-syntax.t")
diff --git a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.904.0.ebuild b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.904.0.ebuild
index 5675f6d96e36..eb2322cf1e51 100644
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.904.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.904.0.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Perl YAML Serialization using XS and libyaml"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PERL_RM_FILES=("t/author-pod-syntax.t")
diff --git a/dev-perl/YAML-PP/YAML-PP-0.39.0-r1.ebuild b/dev-perl/YAML-PP/YAML-PP-0.39.0-r1.ebuild
index 9bf3026577b3..3d282337946b 100644
--- a/dev-perl/YAML-PP/YAML-PP-0.39.0-r1.ebuild
+++ b/dev-perl/YAML-PP/YAML-PP-0.39.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="YAML 1.2 processor in perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Scalar-List-Utils-1.70.0
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.340.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.340.0.ebuild
index 4d148ca192da..2224b4906520 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.340.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.340.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_configure() {
 	export CC="$(tc-getCC) -std=gnu17"
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.360.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.360.0.ebuild
index e53c9aee60f6..d630e4f2b527 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.360.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.360.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 src_configure() {
 	# bug #943898
diff --git a/dev-perl/YAML-Tiny/YAML-Tiny-1.760.0-r1.ebuild b/dev-perl/YAML-Tiny/YAML-Tiny-1.760.0-r1.ebuild
index cf387bfc18ad..86b110772f0e 100644
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.760.0-r1.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.760.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read/Write YAML files with as little code as possible"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 BDEPEND="
diff --git a/dev-perl/YAML/YAML-1.310.0.ebuild b/dev-perl/YAML/YAML-1.310.0.ebuild
index deba045b0452..56cc01013233 100644
--- a/dev-perl/YAML/YAML-1.310.0.ebuild
+++ b/dev-perl/YAML/YAML-1.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="YAML Ain't Markup Language (tm)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/aliased/aliased-0.340.0-r2.ebuild b/dev-perl/aliased/aliased-0.340.0-r2.ebuild
index 938fd4059953..3c44dbbdb291 100644
--- a/dev-perl/aliased/aliased-0.340.0-r2.ebuild
+++ b/dev-perl/aliased/aliased-0.340.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use shorter versions of class names"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r2.ebuild b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r2.ebuild
index b80a9535d2df..05098cd8c6d1 100644
--- a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r2.ebuild
+++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Disables bareword filehandles"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Lexical::SealRequireHints only required with Perl < 5.12
 # We could add alternation here, but it would be work without benefit
diff --git a/dev-perl/common-sense/common-sense-3.750.0.ebuild b/dev-perl/common-sense/common-sense-3.750.0.ebuild
index 9fd46a303bef..599fc699304d 100644
--- a/dev-perl/common-sense/common-sense-3.750.0.ebuild
+++ b/dev-perl/common-sense/common-sense-3.750.0.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Save a tree AND a kitten, use common::sense!"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/glib-perl/glib-perl-1.329.400.ebuild b/dev-perl/glib-perl/glib-perl-1.329.400.ebuild
index bc005ea134b3..053f93946d09 100644
--- a/dev-perl/glib-perl/glib-perl-1.329.400.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.329.400.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gtk2-perl.sf.net/ https://metacpan.org/release/Glib https://gi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/indirect/indirect-0.390.0.ebuild b/dev-perl/indirect/indirect-0.390.0.ebuild
index ad853d6b8388..321652653c72 100644
--- a/dev-perl/indirect/indirect-0.390.0.ebuild
+++ b/dev-perl/indirect/indirect-0.390.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lexically warn about using the indirect method call syntax"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/libintl-perl/libintl-perl-1.350.0-r1.ebuild b/dev-perl/libintl-perl/libintl-perl-1.350.0-r1.ebuild
index 80ce6cb347af..083024483bd0 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.350.0-r1.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.350.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/rele
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/librg-utils-perl/librg-utils-perl-1.0.43-r2.ebuild b/dev-perl/librg-utils-perl/librg-utils-perl-1.0.43-r2.ebuild
index b61dd58c9a08..d4d647a1c22c 100644
--- a/dev-perl/librg-utils-perl/librg-utils-perl-1.0.43-r2.ebuild
+++ b/dev-perl/librg-utils-perl/librg-utils-perl-1.0.43-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://rostlab.org/librg-utils-perl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-perl/List-MoreUtils"
 DEPEND="${RDEPEND}
diff --git a/dev-perl/libwww-perl/libwww-perl-6.780.0-r1.ebuild b/dev-perl/libwww-perl/libwww-perl-6.780.0-r1.ebuild
index 6d930550be33..ec5f5eb85fea 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.780.0-r1.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.780.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of Perl Modules for the WWW"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="ssl"
 
 RDEPEND="
diff --git a/dev-perl/libwww-perl/libwww-perl-6.790.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.790.0.ebuild
index 2e2015983f43..2f0cd44df0db 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.790.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.790.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of Perl Modules for the WWW"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="ssl"
 
 RDEPEND="
diff --git a/dev-perl/libwww-perl/libwww-perl-6.800.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.800.0.ebuild
index 6e8eec23f60d..de2f90876bb9 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.800.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.800.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of Perl Modules for the WWW"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="ssl"
 
 RDEPEND="
diff --git a/dev-perl/libwww-perl/libwww-perl-6.810.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.810.0.ebuild
index 7f62d8a23307..f86b70145eef 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.810.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.810.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of Perl Modules for the WWW"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="ssl"
 
 RDEPEND="
diff --git a/dev-perl/libxml-perl/libxml-perl-0.80.0-r3.ebuild b/dev-perl/libxml-perl/libxml-perl-0.80.0-r3.ebuild
index 0bae78928fba..d90e415509dc 100644
--- a/dev-perl/libxml-perl/libxml-perl-0.80.0-r3.ebuild
+++ b/dev-perl/libxml-perl/libxml-perl-0.80.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of Perl modules for working with XML"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/XML-Parser-2.290.0
diff --git a/dev-perl/multidimensional/multidimensional-0.14.0.ebuild b/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
index 8a794096e754..4cab93f8a60a 100644
--- a/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
+++ b/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="disables multidimensional array emulation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/B-Hooks-OP-Check-0.190.0
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.310.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.310.0.ebuild
index 1e27c73ccc07..e8379d815b39 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.310.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keep imports out of your namespace"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/B-Hooks-EndOfScope-0.120.0
diff --git a/dev-perl/namespace-clean/namespace-clean-0.270.0-r1.ebuild b/dev-perl/namespace-clean/namespace-clean-0.270.0-r1.ebuild
index 87d5386e9fe2..055d43b6014a 100644
--- a/dev-perl/namespace-clean/namespace-clean-0.270.0-r1.ebuild
+++ b/dev-perl/namespace-clean/namespace-clean-0.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keep imports and functions out of your namespace"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/B-Hooks-EndOfScope-0.120.0
diff --git a/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild b/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild
index ea9d5652c092..68e4d81780d7 100644
--- a/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl modules which provide an object-oriented interface to LDAP servers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="sasl xml ssl"
 
 RDEPEND="
diff --git a/dev-perl/prefork/prefork-1.50.0.ebuild b/dev-perl/prefork/prefork-1.50.0.ebuild
index 15a7a0031645..c60e9e252ac0 100644
--- a/dev-perl/prefork/prefork-1.50.0.ebuild
+++ b/dev-perl/prefork/prefork-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Optimized module loading for forking or non-forking processes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/strictures/strictures-2.0.6.ebuild b/dev-perl/strictures/strictures-2.0.6.ebuild
index 804152ae841e..1f0846c1b673 100644
--- a/dev-perl/strictures/strictures-2.0.6.ebuild
+++ b/dev-perl/strictures/strictures-2.0.6.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Turn on strict and make most warnings fatal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-python/appdirs/appdirs-1.4.4-r3.ebuild b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild
index 5cc075632120..1b125ed31875 100644
--- a/dev-python/appdirs/appdirs-1.4.4-r3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 python_test() {
 	"${EPYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/argcomplete/argcomplete-3.6.2.ebuild b/dev-python/argcomplete/argcomplete-3.6.2.ebuild
index b32480e407e5..6b161197f706 100644
--- a/dev-python/argcomplete/argcomplete-3.6.2.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.6.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argcomplete/argcomplete-3.6.3.ebuild b/dev-python/argcomplete/argcomplete-3.6.3.ebuild
index 395fb93233d8..8292d539f509 100644
--- a/dev-python/argcomplete/argcomplete-3.6.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.6.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/asn1crypto/asn1crypto-1.5.1_p20231012.ebuild b/dev-python/asn1crypto/asn1crypto-1.5.1_p20231012.ebuild
index e1a6108a07f7..76852b5cd4f7 100644
--- a/dev-python/asn1crypto/asn1crypto-1.5.1_p20231012.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-1.5.1_p20231012.ebuild
@@ -24,6 +24,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/attrs/attrs-25.3.0.ebuild b/dev-python/attrs/attrs-25.3.0.ebuild
index 6d5b5b92c805..d0d1a8cea44d 100644
--- a/dev-python/attrs/attrs-25.3.0.ebuild
+++ b/dev-python/attrs/attrs-25.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-python/hatchling-1.26.0[${PYTHON_USEDEP}]
diff --git a/dev-python/attrs/attrs-25.4.0.ebuild b/dev-python/attrs/attrs-25.4.0.ebuild
index 9c6d5ec7ede2..c95d74d59667 100644
--- a/dev-python/attrs/attrs-25.4.0.ebuild
+++ b/dev-python/attrs/attrs-25.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-python/hatchling-1.26.0[${PYTHON_USEDEP}]
diff --git a/dev-python/automat/automat-25.4.16.ebuild b/dev-python/automat/automat-25.4.16.ebuild
index 6efab1924fc2..7fa9513a7c33 100644
--- a/dev-python/automat/automat-25.4.16.ebuild
+++ b/dev-python/automat/automat-25.4.16.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/autopep8/autopep8-2.3.2.ebuild b/dev-python/autopep8/autopep8-2.3.2.ebuild
index e3d7be60bda7..8111801b66d9 100644
--- a/dev-python/autopep8/autopep8-2.3.2.ebuild
+++ b/dev-python/autopep8/autopep8-2.3.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pycodestyle-2.12.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.101.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.101.0.ebuild
index 41f6facdbd8a..e161910487fa 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.101.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.101.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.102.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.102.0.ebuild
index 01b028e65abd..b25a5a64b999 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.102.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.102.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.103.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.103.0.ebuild
index 01b028e65abd..b25a5a64b999 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.103.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.103.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.104.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.104.0.ebuild
index 01b028e65abd..b25a5a64b999 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.104.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.104.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.105.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.105.0.ebuild
index 01b028e65abd..b25a5a64b999 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.105.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.105.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.106.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.106.0.ebuild
index 01b028e65abd..b25a5a64b999 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.106.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.106.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-xray-sdk/aws-xray-sdk-2.14.0.ebuild b/dev-python/aws-xray-sdk/aws-xray-sdk-2.14.0.ebuild
index c36e57c70ca0..7cb90e13e6f5 100644
--- a/dev-python/aws-xray-sdk/aws-xray-sdk-2.14.0.ebuild
+++ b/dev-python/aws-xray-sdk/aws-xray-sdk-2.14.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-xray-sdk/aws-xray-sdk-2.15.0.ebuild b/dev-python/aws-xray-sdk/aws-xray-sdk-2.15.0.ebuild
index 0a6c5dbf8159..421b21dcbe73 100644
--- a/dev-python/aws-xray-sdk/aws-xray-sdk-2.15.0.ebuild
+++ b/dev-python/aws-xray-sdk/aws-xray-sdk-2.15.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
diff --git a/dev-python/bitarray/bitarray-3.7.1.ebuild b/dev-python/bitarray/bitarray-3.7.1.ebuild
index e988a6477fa3..bf6458bbe892 100644
--- a/dev-python/bitarray/bitarray-3.7.1.ebuild
+++ b/dev-python/bitarray/bitarray-3.7.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitarray/bitarray-3.7.2.ebuild b/dev-python/bitarray/bitarray-3.7.2.ebuild
index e988a6477fa3..bf6458bbe892 100644
--- a/dev-python/bitarray/bitarray-3.7.2.ebuild
+++ b/dev-python/bitarray/bitarray-3.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitarray/bitarray-3.8.0.ebuild b/dev-python/bitarray/bitarray-3.8.0.ebuild
index 53f5006a7d88..5124c7401a79 100644
--- a/dev-python/bitarray/bitarray-3.8.0.ebuild
+++ b/dev-python/bitarray/bitarray-3.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/blinker/blinker-1.9.0.ebuild b/dev-python/blinker/blinker-1.9.0.ebuild
index 7bc00c4bc180..05961b471ffa 100644
--- a/dev-python/blinker/blinker-1.9.0.ebuild
+++ b/dev-python/blinker/blinker-1.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/blosc/blosc-1.11.3.ebuild b/dev-python/blosc/blosc-1.11.3.ebuild
index c5b067ec8a13..28e21b42e0d5 100644
--- a/dev-python/blosc/blosc-1.11.3.ebuild
+++ b/dev-python/blosc/blosc-1.11.3.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/boto3-1.40.74.ebuild b/dev-python/boto3/boto3-1.40.74.ebuild
index 850de9393d0c..db014eb7eb6d 100644
--- a/dev-python/boto3/boto3-1.40.74.ebuild
+++ b/dev-python/boto3/boto3-1.40.74.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.41.2.ebuild b/dev-python/boto3/boto3-1.41.2.ebuild
index 89a3e32e4861..d1490d2a5274 100644
--- a/dev-python/boto3/boto3-1.41.2.ebuild
+++ b/dev-python/boto3/boto3-1.41.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.41.5.ebuild b/dev-python/boto3/boto3-1.41.5.ebuild
index 89a3e32e4861..d1490d2a5274 100644
--- a/dev-python/boto3/boto3-1.41.5.ebuild
+++ b/dev-python/boto3/boto3-1.41.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.42.11.ebuild b/dev-python/boto3/boto3-1.42.11.ebuild
index 56b1da52789f..8dfb7bbab0b4 100644
--- a/dev-python/boto3/boto3-1.42.11.ebuild
+++ b/dev-python/boto3/boto3-1.42.11.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.42.12.ebuild b/dev-python/boto3/boto3-1.42.12.ebuild
index 56b1da52789f..8dfb7bbab0b4 100644
--- a/dev-python/boto3/boto3-1.42.12.ebuild
+++ b/dev-python/boto3/boto3-1.42.12.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.42.13.ebuild b/dev-python/boto3/boto3-1.42.13.ebuild
index 56b1da52789f..8dfb7bbab0b4 100644
--- a/dev-python/boto3/boto3-1.42.13.ebuild
+++ b/dev-python/boto3/boto3-1.42.13.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.42.4.ebuild b/dev-python/boto3/boto3-1.42.4.ebuild
index 56b1da52789f..8dfb7bbab0b4 100644
--- a/dev-python/boto3/boto3-1.42.4.ebuild
+++ b/dev-python/boto3/boto3-1.42.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.42.9.ebuild b/dev-python/boto3/boto3-1.42.9.ebuild
index 56b1da52789f..8dfb7bbab0b4 100644
--- a/dev-python/boto3/boto3-1.42.9.ebuild
+++ b/dev-python/boto3/boto3-1.42.9.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.40.74.ebuild b/dev-python/botocore/botocore-1.40.74.ebuild
index 5d6a29be5655..00ae0971fc39 100644
--- a/dev-python/botocore/botocore-1.40.74.ebuild
+++ b/dev-python/botocore/botocore-1.40.74.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.41.2.ebuild b/dev-python/botocore/botocore-1.41.2.ebuild
index a931fcaefec4..e5d96291daff 100644
--- a/dev-python/botocore/botocore-1.41.2.ebuild
+++ b/dev-python/botocore/botocore-1.41.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.41.5.ebuild b/dev-python/botocore/botocore-1.41.5.ebuild
index a931fcaefec4..e5d96291daff 100644
--- a/dev-python/botocore/botocore-1.41.5.ebuild
+++ b/dev-python/botocore/botocore-1.41.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.42.11.ebuild b/dev-python/botocore/botocore-1.42.11.ebuild
index a931fcaefec4..e5d96291daff 100644
--- a/dev-python/botocore/botocore-1.42.11.ebuild
+++ b/dev-python/botocore/botocore-1.42.11.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.42.12.ebuild b/dev-python/botocore/botocore-1.42.12.ebuild
index a931fcaefec4..e5d96291daff 100644
--- a/dev-python/botocore/botocore-1.42.12.ebuild
+++ b/dev-python/botocore/botocore-1.42.12.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.42.13.ebuild b/dev-python/botocore/botocore-1.42.13.ebuild
index a931fcaefec4..e5d96291daff 100644
--- a/dev-python/botocore/botocore-1.42.13.ebuild
+++ b/dev-python/botocore/botocore-1.42.13.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.42.4.ebuild b/dev-python/botocore/botocore-1.42.4.ebuild
index a931fcaefec4..e5d96291daff 100644
--- a/dev-python/botocore/botocore-1.42.4.ebuild
+++ b/dev-python/botocore/botocore-1.42.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.42.9.ebuild b/dev-python/botocore/botocore-1.42.9.ebuild
index a931fcaefec4..e5d96291daff 100644
--- a/dev-python/botocore/botocore-1.42.9.ebuild
+++ b/dev-python/botocore/botocore-1.42.9.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/bottleneck/bottleneck-1.5.0.ebuild b/dev-python/bottleneck/bottleneck-1.5.0.ebuild
index fd4b1281f893..c84743fa8de4 100644
--- a/dev-python/bottleneck/bottleneck-1.5.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.5.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
diff --git a/dev-python/bottleneck/bottleneck-1.6.0.ebuild b/dev-python/bottleneck/bottleneck-1.6.0.ebuild
index eb8982f50c00..3fffebb44139 100644
--- a/dev-python/bottleneck/bottleneck-1.6.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
diff --git a/dev-python/breathe/breathe-4.36.0.ebuild b/dev-python/breathe/breathe-4.36.0.ebuild
index 219c3a0e1a34..a5a5d2f600de 100644
--- a/dev-python/breathe/breathe-4.36.0.ebuild
+++ b/dev-python/breathe/breathe-4.36.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	app-text/doxygen
diff --git a/dev-python/brotlicffi/brotlicffi-1.1.0.0.ebuild b/dev-python/brotlicffi/brotlicffi-1.1.0.0.ebuild
index 3340e6524eef..1a3c068060ed 100644
--- a/dev-python/brotlicffi/brotlicffi-1.1.0.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.1.0.0.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/brotlicffi/brotlicffi-1.2.0.0.ebuild b/dev-python/brotlicffi/brotlicffi-1.2.0.0.ebuild
index 92735553c1c2..422a979f839a 100644
--- a/dev-python/brotlicffi/brotlicffi-1.2.0.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.2.0.0.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 DEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/calver/calver-2025.10.20.ebuild b/dev-python/calver/calver-2025.10.20.ebuild
index f20ef1f5bd4f..9ffd5e451774 100644
--- a/dev-python/calver/calver-2025.10.20.ebuild
+++ b/dev-python/calver/calver-2025.10.20.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/calver/calver-2025.4.17.ebuild b/dev-python/calver/calver-2025.4.17.ebuild
index 4639e75fc8de..7e31eda97ab5 100644
--- a/dev-python/calver/calver-2025.4.17.ebuild
+++ b/dev-python/calver/calver-2025.4.17.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-python/setuptools-77.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/capturer/capturer-3.0-r1.ebuild b/dev-python/capturer/capturer-3.0-r1.ebuild
index 8db8b947833c..ab6f3d09088a 100644
--- a/dev-python/capturer/capturer-3.0-r1.ebuild
+++ b/dev-python/capturer/capturer-3.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://capturer.readthedocs.io/en/latest/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/certifi/certifi-3024.7.22.ebuild b/dev-python/certifi/certifi-3024.7.22.ebuild
index 9fe222dfb2d6..1bc566c605ca 100644
--- a/dev-python/certifi/certifi-3024.7.22.ebuild
+++ b/dev-python/certifi/certifi-3024.7.22.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-python/cffi/cffi-1.17.1.ebuild b/dev-python/cffi/cffi-1.17.1.ebuild
index 8fce85cd6aef..081f538a02f2 100644
--- a/dev-python/cffi/cffi-1.17.1.ebuild
+++ b/dev-python/cffi/cffi-1.17.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Needs recent libffi for HPPA fixes
 DEPEND="
diff --git a/dev-python/cffi/cffi-2.0.0.ebuild b/dev-python/cffi/cffi-2.0.0.ebuild
index 9aaa1f1ea345..022eab5bd79b 100644
--- a/dev-python/cffi/cffi-2.0.0.ebuild
+++ b/dev-python/cffi/cffi-2.0.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Needs recent libffi for HPPA fixes
 DEPEND="
diff --git a/dev-python/chardet/chardet-5.2.0.ebuild b/dev-python/chardet/chardet-5.2.0.ebuild
index bb61b3ed2342..ed4bbbb264dd 100644
--- a/dev-python/chardet/chardet-5.2.0.ebuild
+++ b/dev-python/chardet/chardet-5.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cloudpickle/cloudpickle-3.1.1.ebuild b/dev-python/cloudpickle/cloudpickle-3.1.1.ebuild
index db2e3710f13a..fde718574617 100644
--- a/dev-python/cloudpickle/cloudpickle-3.1.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-3.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cloudpickle/cloudpickle-3.1.2.ebuild b/dev-python/cloudpickle/cloudpickle-3.1.2.ebuild
index f86f5ce7339d..fb5753dd20ed 100644
--- a/dev-python/cloudpickle/cloudpickle-3.1.2.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-3.1.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cmd2/cmd2-2.6.2.ebuild b/dev-python/cmd2/cmd2-2.6.2.ebuild
index 94036bf953a2..52b6245ca425 100644
--- a/dev-python/cmd2/cmd2-2.6.2.ebuild
+++ b/dev-python/cmd2/cmd2-2.6.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pyperclip-1.8[${PYTHON_USEDEP}]
diff --git a/dev-python/colorama/colorama-0.4.6.ebuild b/dev-python/colorama/colorama-0.4.6.ebuild
index 2c8667dcbb89..42a55f0ff6e5 100644
--- a/dev-python/colorama/colorama-0.4.6.ebuild
+++ b/dev-python/colorama/colorama-0.4.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples"
 
 distutils_enable_tests pytest
diff --git a/dev-python/coloredlogs/coloredlogs-15.0.1-r2.ebuild b/dev-python/coloredlogs/coloredlogs-15.0.1-r2.ebuild
index 366e2d911821..cd5456bfe5ea 100644
--- a/dev-python/coloredlogs/coloredlogs-15.0.1-r2.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-15.0.1-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND="
 	>=dev-python/humanfriendly-9.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/commonmark/commonmark-0.9.1-r1.ebuild b/dev-python/commonmark/commonmark-0.9.1-r1.ebuild
index c1351bf2e7ab..11e2437be729 100644
--- a/dev-python/commonmark/commonmark-0.9.1-r1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/configobj/configobj-5.0.9.ebuild b/dev-python/configobj/configobj-5.0.9.ebuild
index be169869de09..482687f0596f 100644
--- a/dev-python/configobj/configobj-5.0.9.ebuild
+++ b/dev-python/configobj/configobj-5.0.9.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/constantly/constantly-23.10.4.ebuild b/dev-python/constantly/constantly-23.10.4.ebuild
index 9bc71a2b997c..6f8208423211 100644
--- a/dev-python/constantly/constantly-23.10.4.ebuild
+++ b/dev-python/constantly/constantly-23.10.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cookies/cookies-2.2.1-r2.ebuild b/dev-python/cookies/cookies-2.2.1-r2.ebuild
index 922f4470db8a..dbc72a9aef21 100644
--- a/dev-python/cookies/cookies-2.2.1-r2.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://gitlab.com/sashahart/cookies"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/curtsies/curtsies-0.4.3.ebuild b/dev-python/curtsies/curtsies-0.4.3.ebuild
index 7f5caedeac4b..09a7d52e69ae 100644
--- a/dev-python/curtsies/curtsies-0.4.3.ebuild
+++ b/dev-python/curtsies/curtsies-0.4.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/blessed-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/cvxopt/cvxopt-1.3.2.ebuild b/dev-python/cvxopt/cvxopt-1.3.2.ebuild
index 25c2b2161146..8f27bf589a57 100644
--- a/dev-python/cvxopt/cvxopt-1.3.2.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.3.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="+dsdp examples fftw +glpk gsl"
 
 DEPEND="
diff --git a/dev-python/cycler/cycler-0.12.1.ebuild b/dev-python/cycler/cycler-0.12.1.ebuild
index d1160a1dfdeb..3a8024387e2a 100644
--- a/dev-python/cycler/cycler-0.12.1.ebuild
+++ b/dev-python/cycler/cycler-0.12.1.ebuild
@@ -21,6 +21,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cython/cython-3.1.4.ebuild b/dev-python/cython/cython-3.1.4.ebuild
index 9ca4772ffca5..438ec2a0f496 100644
--- a/dev-python/cython/cython-3.1.4.ebuild
+++ b/dev-python/cython/cython-3.1.4.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-3.1.5.ebuild b/dev-python/cython/cython-3.1.5.ebuild
index 3bd9208ea5df..0e156a70a8b4 100644
--- a/dev-python/cython/cython-3.1.5.ebuild
+++ b/dev-python/cython/cython-3.1.5.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-3.1.6.ebuild b/dev-python/cython/cython-3.1.6.ebuild
index 3741cc961ae8..d2d260e044cc 100644
--- a/dev-python/cython/cython-3.1.6.ebuild
+++ b/dev-python/cython/cython-3.1.6.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-3.1.7.ebuild b/dev-python/cython/cython-3.1.7.ebuild
index 3741cc961ae8..d2d260e044cc 100644
--- a/dev-python/cython/cython-3.1.7.ebuild
+++ b/dev-python/cython/cython-3.1.7.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-3.2.0.ebuild b/dev-python/cython/cython-3.2.0.ebuild
index 3bd9208ea5df..0e156a70a8b4 100644
--- a/dev-python/cython/cython-3.2.0.ebuild
+++ b/dev-python/cython/cython-3.2.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-3.2.1.ebuild b/dev-python/cython/cython-3.2.1.ebuild
index 3bd9208ea5df..0e156a70a8b4 100644
--- a/dev-python/cython/cython-3.2.1.ebuild
+++ b/dev-python/cython/cython-3.2.1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-3.2.2.ebuild b/dev-python/cython/cython-3.2.2.ebuild
index 45e92a7f5ca1..23fc59df0adf 100644
--- a/dev-python/cython/cython-3.2.2.ebuild
+++ b/dev-python/cython/cython-3.2.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-3.2.3.ebuild b/dev-python/cython/cython-3.2.3.ebuild
index 45e92a7f5ca1..23fc59df0adf 100644
--- a/dev-python/cython/cython-3.2.3.ebuild
+++ b/dev-python/cython/cython-3.2.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/decorator/decorator-5.2.1.ebuild b/dev-python/decorator/decorator-5.2.1.ebuild
index 25d4a7835af2..9e28a4e005e9 100644
--- a/dev-python/decorator/decorator-5.2.1.ebuild
+++ b/dev-python/decorator/decorator-5.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" tests/test.py -v || die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
index 309fcd35091d..ffe2b9cdd580 100644
--- a/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples"
 
 src_prepare() {
diff --git a/dev-python/defusedxml/defusedxml-0.8.0_rc2.ebuild b/dev-python/defusedxml/defusedxml-0.8.0_rc2.ebuild
index 943a97ec2e18..3a72160ad6d3 100644
--- a/dev-python/defusedxml/defusedxml-0.8.0_rc2.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.8.0_rc2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples"
 
 src_prepare() {
diff --git a/dev-python/dill/dill-0.4.0.ebuild b/dev-python/dill/dill-0.4.0.ebuild
index 44946f28de20..88dbfd0228d0 100644
--- a/dev-python/dill/dill-0.4.0.ebuild
+++ b/dev-python/dill/dill-0.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 python_test() {
 	"${EPYTHON}" -m dill.tests || die
diff --git a/dev-python/diskcache/diskcache-5.6.3.ebuild b/dev-python/diskcache/diskcache-5.6.3.ebuild
index 3e90dd4721e7..a9adb478a28e 100644
--- a/dev-python/diskcache/diskcache-5.6.3.ebuild
+++ b/dev-python/diskcache/diskcache-5.6.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/distro/distro-1.9.0.ebuild b/dev-python/distro/distro-1.9.0.ebuild
index 876dfba98021..6847893c144b 100644
--- a/dev-python/distro/distro-1.9.0.ebuild
+++ b/dev-python/distro/distro-1.9.0.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dj-database-url/dj-database-url-3.0.1.ebuild b/dev-python/dj-database-url/dj-database-url-3.0.1.ebuild
index cb8c543eac84..d14cfbee969f 100644
--- a/dev-python/dj-database-url/dj-database-url-3.0.1.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-3.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/django-4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/dnspython-2.7.0.ebuild b/dev-python/dnspython/dnspython-2.7.0.ebuild
index 942dc5fbf58a..010483e4b004 100644
--- a/dev-python/dnspython/dnspython-2.7.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.7.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="dnssec examples"
 
 RDEPEND="
diff --git a/dev-python/dnspython/dnspython-2.8.0.ebuild b/dev-python/dnspython/dnspython-2.8.0.ebuild
index 4ee376d025e7..3f2588f5abb1 100644
--- a/dev-python/dnspython/dnspython-2.8.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 x86 ~x64-macos"
 IUSE="dnssec examples https quic"
 
 RDEPEND="
diff --git a/dev-python/docopt/docopt-0.6.2-r5.ebuild b/dev-python/docopt/docopt-0.6.2-r5.ebuild
index 1a8843b7468a..d537c4a73d10 100644
--- a/dev-python/docopt/docopt-0.6.2-r5.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
diff --git a/dev-python/docutils-glep/docutils-glep-1.5.ebuild b/dev-python/docutils-glep/docutils-glep-1.5.ebuild
index 7396e4a6ef74..53bd04eef521 100644
--- a/dev-python/docutils-glep/docutils-glep-1.5.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/docutils-0.21.2.ebuild b/dev-python/docutils/docutils-0.21.2.ebuild
index c018996cc051..bb5c2fbd723a 100644
--- a/dev-python/docutils/docutils-0.21.2.ebuild
+++ b/dev-python/docutils/docutils-0.21.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 # GPL-3+ only for emacs/rst.el
 LICENSE="BSD BSD-2 GPL-3+ PSF-2.4 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/docutils-0.22.2.ebuild b/dev-python/docutils/docutils-0.22.2.ebuild
index 14fcd74d3b63..80cb5fafbea2 100644
--- a/dev-python/docutils/docutils-0.22.2.ebuild
+++ b/dev-python/docutils/docutils-0.22.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 # GPL-3+ only for emacs/rst.el
 LICENSE="BSD BSD-2 GPL-3+ PSF-2.4 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/docutils-0.22.3.ebuild b/dev-python/docutils/docutils-0.22.3.ebuild
index 1e9201807d93..5012dfcda787 100644
--- a/dev-python/docutils/docutils-0.22.3.ebuild
+++ b/dev-python/docutils/docutils-0.22.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 # GPL-3+ only for emacs/rst.el
 LICENSE="BSD BSD-2 GPL-3+ PSF-2.4 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/docutils-0.22.4.ebuild b/dev-python/docutils/docutils-0.22.4.ebuild
index 1e9201807d93..5012dfcda787 100644
--- a/dev-python/docutils/docutils-0.22.4.ebuild
+++ b/dev-python/docutils/docutils-0.22.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 # GPL-3+ only for emacs/rst.el
 LICENSE="BSD BSD-2 GPL-3+ PSF-2.4 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/dulwich-0.23.2-r1.ebuild b/dev-python/dulwich/dulwich-0.23.2-r1.ebuild
index c8bf2ac8b81f..234d8dd7ab76 100644
--- a/dev-python/dulwich/dulwich-0.23.2-r1.ebuild
+++ b/dev-python/dulwich/dulwich-0.23.2-r1.ebuild
@@ -50,7 +50,7 @@ LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
 LICENSE+=" )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/editables/editables-0.5.ebuild b/dev-python/editables/editables-0.5.ebuild
index 8aaa2a309a1e..21574c3065f3 100644
--- a/dev-python/editables/editables-0.5.ebuild
+++ b/dev-python/editables/editables-0.5.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/emcee/emcee-3.1.6.ebuild b/dev-python/emcee/emcee-3.1.6.ebuild
index ec7cc65e1f10..9b3abfa03093 100644
--- a/dev-python/emcee/emcee-3.1.6.ebuild
+++ b/dev-python/emcee/emcee-3.1.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-python/h5py[${PYTHON_USEDEP}]
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-25.2.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-25.2.ebuild
index 529bedd8aa75..795aa03abe72 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-25.2.ebuild
+++ b/dev-python/ensurepip-pip/ensurepip-pip-25.2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-rust"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-25.3.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-25.3.ebuild
index 8aa001c498f9..52b52013ad92 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-25.3.ebuild
+++ b/dev-python/ensurepip-pip/ensurepip-pip-25.3.ebuild
@@ -29,7 +29,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test test-rust"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-79.0.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-79.0.1.ebuild
index 7df298c05aeb..ffe5f412fbe9 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-79.0.1.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-79.0.1.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-80.9.0-r1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-80.9.0-r1.ebuild
index cb6294049558..f4b959d98c88 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-80.9.0-r1.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-80.9.0-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/et-xmlfile/et-xmlfile-2.0.0.ebuild b/dev-python/et-xmlfile/et-xmlfile-2.0.0.ebuild
index 73d5a707fe7f..0ebaf49a561a 100644
--- a/dev-python/et-xmlfile/et-xmlfile-2.0.0.ebuild
+++ b/dev-python/et-xmlfile/et-xmlfile-2.0.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/fasteners/fasteners-0.20.ebuild b/dev-python/fasteners/fasteners-0.20.ebuild
index c868a8b8d1aa..17b4e1572f46 100644
--- a/dev-python/fasteners/fasteners-0.20.ebuild
+++ b/dev-python/fasteners/fasteners-0.20.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fastimport/fastimport-0.9.14.ebuild b/dev-python/fastimport/fastimport-0.9.14.ebuild
index 8822ec7a6dea..43eba92f2736 100644
--- a/dev-python/fastimport/fastimport-0.9.14.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.14.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 
 python_test() {
 	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/fastimport/fastimport-0.9.16.ebuild b/dev-python/fastimport/fastimport-0.9.16.ebuild
index 8822ec7a6dea..43eba92f2736 100644
--- a/dev-python/fastimport/fastimport-0.9.16.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.16.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 
 python_test() {
 	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/feedparser/feedparser-6.0.11.ebuild b/dev-python/feedparser/feedparser-6.0.11.ebuild
index b0848e1b1ce4..c0360e0128d0 100644
--- a/dev-python/feedparser/feedparser-6.0.11.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.11.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/sgmllib3k[${PYTHON_USEDEP}]
diff --git a/dev-python/feedparser/feedparser-6.0.12.ebuild b/dev-python/feedparser/feedparser-6.0.12.ebuild
index f53a6fde5fc4..ddd037c1809b 100644
--- a/dev-python/feedparser/feedparser-6.0.12.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.12.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/sgmllib3k[${PYTHON_USEDEP}]
diff --git a/dev-python/fitsio/fitsio-1.2.8.ebuild b/dev-python/fitsio/fitsio-1.2.8.ebuild
index 75d7b9f5fe3b..c4f6d56efc2b 100644
--- a/dev-python/fitsio/fitsio-1.2.8.ebuild
+++ b/dev-python/fitsio/fitsio-1.2.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	>=dev-python/numpy-1.17:=[${PYTHON_USEDEP}]
diff --git a/dev-python/fitsio/fitsio-1.3.0.ebuild b/dev-python/fitsio/fitsio-1.3.0.ebuild
index 75d7b9f5fe3b..c4f6d56efc2b 100644
--- a/dev-python/fitsio/fitsio-1.3.0.ebuild
+++ b/dev-python/fitsio/fitsio-1.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	>=dev-python/numpy-1.17:=[${PYTHON_USEDEP}]
diff --git a/dev-python/fixtures/fixtures-4.2.5.ebuild b/dev-python/fixtures/fixtures-4.2.5.ebuild
index c495b6e62ba8..5ebc2cafb3f8 100644
--- a/dev-python/fixtures/fixtures-4.2.5.ebuild
+++ b/dev-python/fixtures/fixtures-4.2.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fixtures/fixtures-4.2.6.ebuild b/dev-python/fixtures/fixtures-4.2.6.ebuild
index c495b6e62ba8..5ebc2cafb3f8 100644
--- a/dev-python/fixtures/fixtures-4.2.6.ebuild
+++ b/dev-python/fixtures/fixtures-4.2.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flaky/flaky-3.8.1.ebuild b/dev-python/flaky/flaky-3.8.1.ebuild
index 391a261cbd9d..2ac3298eab30 100644
--- a/dev-python/flaky/flaky-3.8.1.ebuild
+++ b/dev-python/flaky/flaky-3.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flit-core/flit-core-3.12.0.ebuild b/dev-python/flit-core/flit-core-3.12.0.ebuild
index 86554f1a5cd8..f10cb335e918 100644
--- a/dev-python/flit-core/flit-core-3.12.0.ebuild
+++ b/dev-python/flit-core/flit-core-3.12.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
diff --git a/dev-python/freezegun/freezegun-1.5.3.ebuild b/dev-python/freezegun/freezegun-1.5.3.ebuild
index f62e95772c59..95f57811eb93 100644
--- a/dev-python/freezegun/freezegun-1.5.3.ebuild
+++ b/dev-python/freezegun/freezegun-1.5.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/freezegun/freezegun-1.5.4.ebuild b/dev-python/freezegun/freezegun-1.5.4.ebuild
index 106cda459c71..362c8daf3c3e 100644
--- a/dev-python/freezegun/freezegun-1.5.4.ebuild
+++ b/dev-python/freezegun/freezegun-1.5.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/freezegun/freezegun-1.5.5.ebuild b/dev-python/freezegun/freezegun-1.5.5.ebuild
index 106cda459c71..362c8daf3c3e 100644
--- a/dev-python/freezegun/freezegun-1.5.5.ebuild
+++ b/dev-python/freezegun/freezegun-1.5.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/fs/fs-2.4.16-r1.ebuild b/dev-python/fs/fs-2.4.16-r1.ebuild
index 682df69789b7..dcf2c979df95 100644
--- a/dev-python/fs/fs-2.4.16-r1.ebuild
+++ b/dev-python/fs/fs-2.4.16-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/genshi/genshi-0.7.10.ebuild b/dev-python/genshi/genshi-0.7.10.ebuild
index 0dc5e46442c6..c5b5b303814c 100644
--- a/dev-python/genshi/genshi-0.7.10.ebuild
+++ b/dev-python/genshi/genshi-0.7.10.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/genshi/genshi-0.7.9.ebuild b/dev-python/genshi/genshi-0.7.9.ebuild
index 73e0261c9c7d..4bcea0f05ab3 100644
--- a/dev-python/genshi/genshi-0.7.9.ebuild
+++ b/dev-python/genshi/genshi-0.7.9.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gentoo-common/gentoo-common-1.ebuild b/dev-python/gentoo-common/gentoo-common-1.ebuild
index ea8546af3f54..0dacf832f6b4 100644
--- a/dev-python/gentoo-common/gentoo-common-1.ebuild
+++ b/dev-python/gentoo-common/gentoo-common-1.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_install() {
 	insinto /usr/lib/python
diff --git a/dev-python/genty/genty-1.3.2-r3.ebuild b/dev-python/genty/genty-1.3.2-r3.ebuild
index e6c90b8c8af6..1deabfd908f6 100644
--- a/dev-python/genty/genty-1.3.2-r3.ebuild
+++ b/dev-python/genty/genty-1.3.2-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/git-review/git-review-2.4.0.ebuild b/dev-python/git-review/git-review-2.4.0.ebuild
index 05490757b80a..678731614128 100644
--- a/dev-python/git-review/git-review-2.4.0.ebuild
+++ b/dev-python/git-review/git-review-2.4.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
 else
 	inherit pypi
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/git-review/git-review-2.5.0.ebuild b/dev-python/git-review/git-review-2.5.0.ebuild
index fb8a2a2d4401..1517823355e4 100644
--- a/dev-python/git-review/git-review-2.5.0.ebuild
+++ b/dev-python/git-review/git-review-2.5.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 SRC_URI+="
 	test? (
diff --git a/dev-python/git-review/git-review-9999.ebuild b/dev-python/git-review/git-review-9999.ebuild
index fb8a2a2d4401..1517823355e4 100644
--- a/dev-python/git-review/git-review-9999.ebuild
+++ b/dev-python/git-review/git-review-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 SRC_URI+="
 	test? (
diff --git a/dev-python/gmpy2/gmpy2-2.2.1.ebuild b/dev-python/gmpy2/gmpy2-2.2.1.ebuild
index 42052dcfa6bf..34db3a14538b 100644
--- a/dev-python/gmpy2/gmpy2-2.2.1.ebuild
+++ b/dev-python/gmpy2/gmpy2-2.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 DEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/gmpy2/gmpy2-2.2.2.ebuild b/dev-python/gmpy2/gmpy2-2.2.2.ebuild
index cf4b0066e5a7..61d7ac561bb7 100644
--- a/dev-python/gmpy2/gmpy2-2.2.2.ebuild
+++ b/dev-python/gmpy2/gmpy2-2.2.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 DEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/gpep517/gpep517-19.ebuild b/dev-python/gpep517/gpep517-19.ebuild
index a674f8015521..f43120181512 100644
--- a/dev-python/gpep517/gpep517-19.ebuild
+++ b/dev-python/gpep517/gpep517-19.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/gpgmepy/gpgmepy-2.0.0-r1.ebuild b/dev-python/gpgmepy/gpgmepy-2.0.0-r1.ebuild
index d9a9a7c419f4..f6f88dddfadb 100644
--- a/dev-python/gpgmepy/gpgmepy-2.0.0-r1.ebuild
+++ b/dev-python/gpgmepy/gpgmepy-2.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ test? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/graphviz/graphviz-0.21.ebuild b/dev-python/graphviz/graphviz-0.21.ebuild
index 338767e4f3db..0472380730d8 100644
--- a/dev-python/graphviz/graphviz-0.21.ebuild
+++ b/dev-python/graphviz/graphviz-0.21.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	media-gfx/graphviz
diff --git a/dev-python/greenlet/greenlet-3.2.4.ebuild b/dev-python/greenlet/greenlet-3.2.4.ebuild
index ee741429ae4d..d2c3213c99d1 100644
--- a/dev-python/greenlet/greenlet-3.2.4.ebuild
+++ b/dev-python/greenlet/greenlet-3.2.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa ~m68k ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa ~m68k ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/greenlet/greenlet-3.3.0.ebuild b/dev-python/greenlet/greenlet-3.3.0.ebuild
index b3701bf1b18d..5cc9d94e1a99 100644
--- a/dev-python/greenlet/greenlet-3.3.0.ebuild
+++ b/dev-python/greenlet/greenlet-3.3.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gst-python/gst-python-1.22.11-r1.ebuild b/dev-python/gst-python/gst-python-1.22.11-r1.ebuild
index 467a575755ec..5145a788576c 100644
--- a/dev-python/gst-python/gst-python-1.22.11-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.22.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/gst-python/gst-python-1.22.12-r1.ebuild b/dev-python/gst-python/gst-python-1.22.12-r1.ebuild
index dea3ce718d10..677cdd8b663b 100644
--- a/dev-python/gst-python/gst-python-1.22.12-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.22.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/gst-python/gst-python-1.24.10-r1.ebuild b/dev-python/gst-python/gst-python-1.24.10-r1.ebuild
index a8119e21f263..674708d55489 100644
--- a/dev-python/gst-python/gst-python-1.24.10-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.24.10-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/gst-python/gst-python-1.24.11-r1.ebuild b/dev-python/gst-python/gst-python-1.24.11-r1.ebuild
index 917d145c6a16..4d473b054f42 100644
--- a/dev-python/gst-python/gst-python-1.24.11-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.24.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/h5py/h5py-3.14.0.ebuild b/dev-python/h5py/h5py-3.14.0.ebuild
index 290868cab7da..29430a82adbe 100644
--- a/dev-python/h5py/h5py-3.14.0.ebuild
+++ b/dev-python/h5py/h5py-3.14.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/h5py/h5py-3.15.1.ebuild b/dev-python/h5py/h5py-3.15.1.ebuild
index 237ff1217d21..f35ebfb334d3 100644
--- a/dev-python/h5py/h5py-3.15.1.ebuild
+++ b/dev-python/h5py/h5py-3.15.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/hatchling/hatchling-1.27.0.ebuild b/dev-python/hatchling/hatchling-1.27.0.ebuild
index b732b8fc64a8..afeb21abdbaf 100644
--- a/dev-python/hatchling/hatchling-1.27.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.27.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hatchling/hatchling-1.28.0.ebuild b/dev-python/hatchling/hatchling-1.28.0.ebuild
index 4695352b9e24..44e7f59ad800 100644
--- a/dev-python/hatchling/hatchling-1.28.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.28.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httplib2/httplib2-0.22.0.ebuild b/dev-python/httplib2/httplib2-0.22.0.ebuild
index 921dc4cb5d1c..ee1fe006c06e 100644
--- a/dev-python/httplib2/httplib2-0.22.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.22.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-python/httplib2/httplib2-0.30.0.ebuild b/dev-python/httplib2/httplib2-0.30.0.ebuild
index 35a9d193e37c..1bcf1f2d820f 100644
--- a/dev-python/httplib2/httplib2-0.30.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.30.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/httplib2/httplib2-0.31.0.ebuild b/dev-python/httplib2/httplib2-0.31.0.ebuild
index d0b64e73fcc4..6954bdbbcbcf 100644
--- a/dev-python/httplib2/httplib2-0.31.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.31.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/humanfriendly/humanfriendly-10.0-r2.ebuild b/dev-python/humanfriendly/humanfriendly-10.0-r2.ebuild
index 65c6ca10810b..50f8fbea4474 100644
--- a/dev-python/humanfriendly/humanfriendly-10.0-r2.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-10.0-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/humanfriendly/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild b/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
index 05fd3e749bae..88858fbcc97c 100644
--- a/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
+++ b/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]
diff --git a/dev-python/idna/idna-3.10.ebuild b/dev-python/idna/idna-3.10.ebuild
index 46ff61a082ee..621533bb780f 100644
--- a/dev-python/idna/idna-3.10.ebuild
+++ b/dev-python/idna/idna-3.10.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/idna/idna-3.11.ebuild b/dev-python/idna/idna-3.11.ebuild
index 46ff61a082ee..621533bb780f 100644
--- a/dev-python/idna/idna-3.11.ebuild
+++ b/dev-python/idna/idna-3.11.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/ifaddr/ifaddr-0.2.0.ebuild b/dev-python/ifaddr/ifaddr-0.2.0.ebuild
index 3556e925ef1d..c35119ef254a 100644
--- a/dev-python/ifaddr/ifaddr-0.2.0.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.2.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.7.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.7.0.ebuild
index 6d8ba33c681d..8c18a5456868 100644
--- a/dev-python/importlib-metadata/importlib-metadata-8.7.0.ebuild
+++ b/dev-python/importlib-metadata/importlib-metadata-8.7.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/zipp-3.20[${PYTHON_USEDEP}]
diff --git a/dev-python/incremental/incremental-24.11.0.ebuild b/dev-python/incremental/incremental-24.11.0.ebuild
index 5e99d7a16c20..4e073ee3a790 100644
--- a/dev-python/incremental/incremental-24.11.0.ebuild
+++ b/dev-python/incremental/incremental-24.11.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/incremental/incremental-24.7.2.ebuild b/dev-python/incremental/incremental-24.7.2.ebuild
index 413283042245..567c93457326 100644
--- a/dev-python/incremental/incremental-24.7.2.ebuild
+++ b/dev-python/incremental/incremental-24.7.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/inflect/inflect-7.5.0.ebuild b/dev-python/inflect/inflect-7.5.0.ebuild
index f6bf7a02fdf4..add6eef9d850 100644
--- a/dev-python/inflect/inflect-7.5.0.ebuild
+++ b/dev-python/inflect/inflect-7.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/typeguard-4.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/iniconfig/iniconfig-2.1.0.ebuild b/dev-python/iniconfig/iniconfig-2.1.0.ebuild
index 3cbbc793ae1e..227987be0b66 100644
--- a/dev-python/iniconfig/iniconfig-2.1.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-2.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/iniconfig/iniconfig-2.3.0.ebuild b/dev-python/iniconfig/iniconfig-2.3.0.ebuild
index 8402be8e7968..2ab24a5e88c6 100644
--- a/dev-python/iniconfig/iniconfig-2.3.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-2.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
diff --git a/dev-python/installer/installer-0.7.0.ebuild b/dev-python/installer/installer-0.7.0.ebuild
index 9347a7686337..80c144eee74b 100644
--- a/dev-python/installer/installer-0.7.0.ebuild
+++ b/dev-python/installer/installer-0.7.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-python/iso8601/iso8601-2.1.0.ebuild b/dev-python/iso8601/iso8601-2.1.0.ebuild
index 2782dea07e8f..db90f6ee2442 100644
--- a/dev-python/iso8601/iso8601-2.1.0.ebuild
+++ b/dev-python/iso8601/iso8601-2.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/isodate/isodate-0.6.1-r1.ebuild b/dev-python/isodate/isodate-0.6.1-r1.ebuild
index adf07cd30218..11185aa804a6 100644
--- a/dev-python/isodate/isodate-0.6.1-r1.ebuild
+++ b/dev-python/isodate/isodate-0.6.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/isodate/isodate-0.7.2.ebuild b/dev-python/isodate/isodate-0.7.2.ebuild
index 010209e49d08..5b755b0f7e1e 100644
--- a/dev-python/isodate/isodate-0.7.2.ebuild
+++ b/dev-python/isodate/isodate-0.7.2.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.2.0.ebuild b/dev-python/itsdangerous/itsdangerous-2.2.0.ebuild
index 0f61e3200822..b39be1545c69 100644
--- a/dev-python/itsdangerous/itsdangerous-2.2.0.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-2.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jaraco-functools/jaraco-functools-4.2.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-4.2.1.ebuild
index eca12ec08bde..ac9e0ccdc405 100644
--- a/dev-python/jaraco-functools/jaraco-functools-4.2.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-4.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/jaraco-functools-4.3.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-4.3.0.ebuild
index 976960e123b4..815aa6d7f2d2 100644
--- a/dev-python/jaraco-functools/jaraco-functools-4.3.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-4.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-4.0.0.ebuild b/dev-python/jaraco-text/jaraco-text-4.0.0.ebuild
index e493d8f9c5c7..bbd47bc73db2 100644
--- a/dev-python/jaraco-text/jaraco-text-4.0.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-4.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jdcal/jdcal-1.4.1-r1.ebuild b/dev-python/jdcal/jdcal-1.4.1-r1.ebuild
index 2295442b485d..94f3dda45808 100644
--- a/dev-python/jdcal/jdcal-1.4.1-r1.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.1-r1.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/jinja2/jinja2-3.1.6.ebuild b/dev-python/jinja2/jinja2-3.1.6.ebuild
index 1780fbdf256e..b1164120fa2a 100644
--- a/dev-python/jinja2/jinja2-3.1.6.ebuild
+++ b/dev-python/jinja2/jinja2-3.1.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jmespath/jmespath-1.0.1.ebuild b/dev-python/jmespath/jmespath-1.0.1.ebuild
index 575d9bece9a0..cafbfb346917 100644
--- a/dev-python/jmespath/jmespath-1.0.1.ebuild
+++ b/dev-python/jmespath/jmespath-1.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 EPYTEST_IGNORE=(
 	# fuzzing tests, they take forever
diff --git a/dev-python/jsondiff/jsondiff-2.2.1.ebuild b/dev-python/jsondiff/jsondiff-2.2.1.ebuild
index 73d657fc3d9e..649f0d989a06 100644
--- a/dev-python/jsondiff/jsondiff-2.2.1.ebuild
+++ b/dev-python/jsondiff/jsondiff-2.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpatch/jsonpatch-1.33.ebuild b/dev-python/jsonpatch/jsonpatch-1.33.ebuild
index 83f06497ed71..d91ec1f3b3b8 100644
--- a/dev-python/jsonpatch/jsonpatch-1.33.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.33.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpickle/jsonpickle-4.1.1.ebuild b/dev-python/jsonpickle/jsonpickle-4.1.1.ebuild
index eb9df01439bd..2233268ca1e5 100644
--- a/dev-python/jsonpickle/jsonpickle-4.1.1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-4.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="test-full"
 
 BDEPEND="
diff --git a/dev-python/jsonpointer/jsonpointer-2.4.ebuild b/dev-python/jsonpointer/jsonpointer-2.4.ebuild
index 7ab3bce4c07a..a4e34166a190 100644
--- a/dev-python/jsonpointer/jsonpointer-2.4.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonpointer/jsonpointer-3.0.0.ebuild b/dev-python/jsonpointer/jsonpointer-3.0.0.ebuild
index ee877c9a43c6..8a7377737dca 100644
--- a/dev-python/jsonpointer/jsonpointer-3.0.0.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-3.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.11.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.11.0.ebuild
index a913bf68d545..2cb50350c63c 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.11.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.11.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.12.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.12.0.ebuild
index c4b1166f23f9..948d63402ff7 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.12.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.12.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/lmdb/lmdb-1.7.3.ebuild b/dev-python/lmdb/lmdb-1.7.3.ebuild
index c2bb7b6cc327..499eea94a823 100644
--- a/dev-python/lmdb/lmdb-1.7.3.ebuild
+++ b/dev-python/lmdb/lmdb-1.7.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 # cffi is used only on pypy, so no dep
 DEPEND="
diff --git a/dev-python/lmdb/lmdb-1.7.5.ebuild b/dev-python/lmdb/lmdb-1.7.5.ebuild
index c2bb7b6cc327..499eea94a823 100644
--- a/dev-python/lmdb/lmdb-1.7.5.ebuild
+++ b/dev-python/lmdb/lmdb-1.7.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 # cffi is used only on pypy, so no dep
 DEPEND="
diff --git a/dev-python/lxml/lxml-5.4.0-r2.ebuild b/dev-python/lxml/lxml-5.4.0-r2.ebuild
index 93b098016eeb..f732ebb9c29b 100644
--- a/dev-python/lxml/lxml-5.4.0-r2.ebuild
+++ b/dev-python/lxml/lxml-5.4.0-r2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/lxml-6.0.0.ebuild b/dev-python/lxml/lxml-6.0.0.ebuild
index e24306178a23..7ca2ac69f47b 100644
--- a/dev-python/lxml/lxml-6.0.0.ebuild
+++ b/dev-python/lxml/lxml-6.0.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/lxml-6.0.1.ebuild b/dev-python/lxml/lxml-6.0.1.ebuild
index e24306178a23..7ca2ac69f47b 100644
--- a/dev-python/lxml/lxml-6.0.1.ebuild
+++ b/dev-python/lxml/lxml-6.0.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/lxml-6.0.2.ebuild b/dev-python/lxml/lxml-6.0.2.ebuild
index 72a0b0dd0250..995eae7de9d1 100644
--- a/dev-python/lxml/lxml-6.0.2.ebuild
+++ b/dev-python/lxml/lxml-6.0.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lz4/lz4-4.4.4.ebuild b/dev-python/lz4/lz4-4.4.4.ebuild
index 4099cf109613..5fc1ab6b21dc 100644
--- a/dev-python/lz4/lz4-4.4.4.ebuild
+++ b/dev-python/lz4/lz4-4.4.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~riscv ~sparc x86"
 
 DEPEND="
 	app-arch/lz4:=
diff --git a/dev-python/lz4/lz4-4.4.5.ebuild b/dev-python/lz4/lz4-4.4.5.ebuild
index ead1604d4101..40d0d249991c 100644
--- a/dev-python/lz4/lz4-4.4.5.ebuild
+++ b/dev-python/lz4/lz4-4.4.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~riscv ~sparc x86"
 
 DEPEND="
 	app-arch/lz4:=
diff --git a/dev-python/m2crypto/m2crypto-0.45.1.ebuild b/dev-python/m2crypto/m2crypto-0.45.1.ebuild
index a6b214583678..42256c809ea7 100644
--- a/dev-python/m2crypto/m2crypto-0.45.1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.45.1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 # openssl via src/SWIG/_lib11_compat.i
 LICENSE="BSD-2 openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="abi_mips_n32 abi_mips_n64 abi_mips_o32"
 
 DEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.46.0.ebuild b/dev-python/m2crypto/m2crypto-0.46.0.ebuild
index 10e65e03cf28..de4c03fb0171 100644
--- a/dev-python/m2crypto/m2crypto-0.46.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.46.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 # openssl via src/SWIG/_lib11_compat.i
 LICENSE="BSD-2 openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="abi_mips_n32 abi_mips_n64 abi_mips_o32"
 
 DEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.46.2.ebuild b/dev-python/m2crypto/m2crypto-0.46.2.ebuild
index da2b3a06d503..7968414cc453 100644
--- a/dev-python/m2crypto/m2crypto-0.46.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.46.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 # openssl via src/SWIG/_lib11_compat.i
 LICENSE="BSD-2 openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="abi_mips_n32 abi_mips_n64 abi_mips_o32"
 
 DEPEND="
diff --git a/dev-python/mako/mako-1.3.10.ebuild b/dev-python/mako/mako-1.3.10.ebuild
index 6caaff167334..e2e60a726943 100644
--- a/dev-python/mako/mako-1.3.10.ebuild
+++ b/dev-python/mako/mako-1.3.10.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/markdown/markdown-3.10.ebuild b/dev-python/markdown/markdown-3.10.ebuild
index 699b9f8a08e2..49b381e1378f 100644
--- a/dev-python/markdown/markdown-3.10.ebuild
+++ b/dev-python/markdown/markdown-3.10.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markdown/markdown-3.9.ebuild b/dev-python/markdown/markdown-3.9.ebuild
index 699b9f8a08e2..49b381e1378f 100644
--- a/dev-python/markdown/markdown-3.9.ebuild
+++ b/dev-python/markdown/markdown-3.9.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markdown2/markdown2-2.5.3.ebuild b/dev-python/markdown2/markdown2-2.5.3.ebuild
index 6764219baaa5..2b807207e503 100644
--- a/dev-python/markdown2/markdown2-2.5.3.ebuild
+++ b/dev-python/markdown2/markdown2-2.5.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pygments-2.7.3[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown2/markdown2-2.5.4.ebuild b/dev-python/markdown2/markdown2-2.5.4.ebuild
index 6764219baaa5..2b807207e503 100644
--- a/dev-python/markdown2/markdown2-2.5.4.ebuild
+++ b/dev-python/markdown2/markdown2-2.5.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pygments-2.7.3[${PYTHON_USEDEP}]
diff --git a/dev-python/markupsafe/markupsafe-3.0.2.ebuild b/dev-python/markupsafe/markupsafe-3.0.2.ebuild
index 036ebadc0844..06b19f6bfc13 100644
--- a/dev-python/markupsafe/markupsafe-3.0.2.ebuild
+++ b/dev-python/markupsafe/markupsafe-3.0.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+native-extensions"
 
 distutils_enable_tests pytest
diff --git a/dev-python/markupsafe/markupsafe-3.0.3.ebuild b/dev-python/markupsafe/markupsafe-3.0.3.ebuild
index 91456bbf5a72..a0a5fd506429 100644
--- a/dev-python/markupsafe/markupsafe-3.0.3.ebuild
+++ b/dev-python/markupsafe/markupsafe-3.0.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+native-extensions"
 
 EPYTEST_PLUGINS=()
diff --git a/dev-python/mccabe/mccabe-0.7.0.ebuild b/dev-python/mccabe/mccabe-0.7.0.ebuild
index 726751cd9bf1..2c567a4ed770 100644
--- a/dev-python/mccabe/mccabe-0.7.0.ebuild
+++ b/dev-python/mccabe/mccabe-0.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/flake8[${PYTHON_USEDEP}]
diff --git a/dev-python/mechanize/mechanize-0.4.10.ebuild b/dev-python/mechanize/mechanize-0.4.10.ebuild
index 120f4c9ab7a9..0127688a92a2 100644
--- a/dev-python/mechanize/mechanize-0.4.10.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.10.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( BSD ZPL )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/metakernel/metakernel-0.30.3.ebuild b/dev-python/metakernel/metakernel-0.30.3.ebuild
index 4d987509fa19..eab561f5868c 100644
--- a/dev-python/metakernel/metakernel-0.30.3.ebuild
+++ b/dev-python/metakernel/metakernel-0.30.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
diff --git a/dev-python/metakernel/metakernel-0.30.4.ebuild b/dev-python/metakernel/metakernel-0.30.4.ebuild
index b2603cb5cf01..e4b749cbf0fd 100644
--- a/dev-python/metakernel/metakernel-0.30.4.ebuild
+++ b/dev-python/metakernel/metakernel-0.30.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/ipykernel-5.5.6[${PYTHON_USEDEP}]
diff --git a/dev-python/mimerender/mimerender-0.6.0-r1.ebuild b/dev-python/mimerender/mimerender-0.6.0-r1.ebuild
index fa98ac44a677..afa6e3b80255 100644
--- a/dev-python/mimerender/mimerender-0.6.0-r1.ebuild
+++ b/dev-python/mimerender/mimerender-0.6.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/python-mimeparse[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/mistune/mistune-3.1.3.ebuild b/dev-python/mistune/mistune-3.1.3.ebuild
index 931ac254a9bb..c1832819b272 100644
--- a/dev-python/mistune/mistune-3.1.3.ebuild
+++ b/dev-python/mistune/mistune-3.1.3.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-3.1.4.ebuild b/dev-python/mistune/mistune-3.1.4.ebuild
index 508480f50379..0f890ff8551c 100644
--- a/dev-python/mistune/mistune-3.1.4.ebuild
+++ b/dev-python/mistune/mistune-3.1.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/mock/mock-5.2.0.ebuild b/dev-python/mock/mock-5.2.0.ebuild
index 96eac1d587c4..ad60f35304a8 100644
--- a/dev-python/mock/mock-5.2.0.ebuild
+++ b/dev-python/mock/mock-5.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/more-itertools/more-itertools-10.7.0.ebuild b/dev-python/more-itertools/more-itertools-10.7.0.ebuild
index 559493859446..b783db3a2472 100644
--- a/dev-python/more-itertools/more-itertools-10.7.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-10.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/furo
diff --git a/dev-python/more-itertools/more-itertools-10.8.0.ebuild b/dev-python/more-itertools/more-itertools-10.8.0.ebuild
index 559493859446..b783db3a2472 100644
--- a/dev-python/more-itertools/more-itertools-10.8.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-10.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/furo
diff --git a/dev-python/mpi4py/mpi4py-3.1.5.ebuild b/dev-python/mpi4py/mpi4py-3.1.5.ebuild
index 91b39fef9ee1..6a64732ff4c1 100644
--- a/dev-python/mpi4py/mpi4py-3.1.5.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.1.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/mpi4py/mpi4py https://pypi.org/project/mpi4py/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="doc examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/mpi4py/mpi4py-4.0.1.ebuild b/dev-python/mpi4py/mpi4py-4.0.1.ebuild
index 2082140a9e16..ce3d95dd87e1 100644
--- a/dev-python/mpi4py/mpi4py-4.0.1.ebuild
+++ b/dev-python/mpi4py/mpi4py-4.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/mpmath/mpmath-1.4.0_alpha6.ebuild b/dev-python/mpmath/mpmath-1.4.0_alpha6.ebuild
index abcc90909629..5977053e124d 100644
--- a/dev-python/mpmath/mpmath-1.4.0_alpha6.ebuild
+++ b/dev-python/mpmath/mpmath-1.4.0_alpha6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test-full"
 
 BDEPEND="
diff --git a/dev-python/mpmath/mpmath-1.4.0_alpha7.ebuild b/dev-python/mpmath/mpmath-1.4.0_alpha7.ebuild
index fff6773a1470..092e53e20d6b 100644
--- a/dev-python/mpmath/mpmath-1.4.0_alpha7.ebuild
+++ b/dev-python/mpmath/mpmath-1.4.0_alpha7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test-full"
 
 BDEPEND="
diff --git a/dev-python/mysqlclient/mysqlclient-2.2.6.ebuild b/dev-python/mysqlclient/mysqlclient-2.2.6.ebuild
index 1d776c578788..56f1d51858f0 100644
--- a/dev-python/mysqlclient/mysqlclient-2.2.6.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-2.2.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	dev-db/mysql-connector-c:0=
diff --git a/dev-python/mysqlclient/mysqlclient-2.2.7.ebuild b/dev-python/mysqlclient/mysqlclient-2.2.7.ebuild
index b7b4a65c81e3..958c97a04f6c 100644
--- a/dev-python/mysqlclient/mysqlclient-2.2.7.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-2.2.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	dev-db/mysql-connector-c:0=
diff --git a/dev-python/netaddr/netaddr-0.10.1.ebuild b/dev-python/netaddr/netaddr-0.10.1.ebuild
index c71d79c6a9b6..a77d1c937b42 100644
--- a/dev-python/netaddr/netaddr-0.10.1.ebuild
+++ b/dev-python/netaddr/netaddr-0.10.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 distutils_enable_sphinx docs/source \
 	dev-python/furo
diff --git a/dev-python/netaddr/netaddr-1.3.0.ebuild b/dev-python/netaddr/netaddr-1.3.0.ebuild
index 44612cb4327f..a626fd956465 100644
--- a/dev-python/netaddr/netaddr-1.3.0.ebuild
+++ b/dev-python/netaddr/netaddr-1.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/netcdf4/netcdf4-1.7.2.ebuild b/dev-python/netcdf4/netcdf4-1.7.2.ebuild
index ba2681d8441e..1c3feada888c 100644
--- a/dev-python/netcdf4/netcdf4-1.7.2.ebuild
+++ b/dev-python/netcdf4/netcdf4-1.7.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="blosc bzip2 mpi test szip zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/netcdf4/netcdf4-1.7.3.ebuild b/dev-python/netcdf4/netcdf4-1.7.3.ebuild
index f477e2ab86d2..ee5643352b7a 100644
--- a/dev-python/netcdf4/netcdf4-1.7.3.ebuild
+++ b/dev-python/netcdf4/netcdf4-1.7.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="blosc bzip2 mpi test szip zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/netifaces/netifaces-0.11.0-r2.ebuild b/dev-python/netifaces/netifaces-0.11.0-r2.ebuild
index 0d5fe63be5a1..8f27655fefd7 100644
--- a/dev-python/netifaces/netifaces-0.11.0-r2.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch
diff --git a/dev-python/networkx/networkx-3.5-r1.ebuild b/dev-python/networkx/networkx-3.5-r1.ebuild
index 4467a7b7d486..8fd2a20fd3dd 100644
--- a/dev-python/networkx/networkx-3.5-r1.ebuild
+++ b/dev-python/networkx/networkx-3.5-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/networkx/networkx-3.6.1.ebuild b/dev-python/networkx/networkx-3.6.1.ebuild
index 37af6a8ee4f6..ef129a1ace61 100644
--- a/dev-python/networkx/networkx-3.6.1.ebuild
+++ b/dev-python/networkx/networkx-3.6.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/networkx/networkx-3.6.ebuild b/dev-python/networkx/networkx-3.6.ebuild
index 37af6a8ee4f6..ef129a1ace61 100644
--- a/dev-python/networkx/networkx-3.6.ebuild
+++ b/dev-python/networkx/networkx-3.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/node-semver/node-semver-0.9.0.ebuild b/dev-python/node-semver/node-semver-0.9.0.ebuild
index 48392cd340e7..ca5ec440cfd2 100644
--- a/dev-python/node-semver/node-semver-0.9.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.9.0.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/numexpr/numexpr-2.11.0.ebuild b/dev-python/numexpr/numexpr-2.11.0.ebuild
index 9c6ba04075dd..c98e8cf5c9cf 100644
--- a/dev-python/numexpr/numexpr-2.11.0.ebuild
+++ b/dev-python/numexpr/numexpr-2.11.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-2.0.0_rc:=[${PYTHON_USEDEP}]
diff --git a/dev-python/numexpr/numexpr-2.12.1.ebuild b/dev-python/numexpr/numexpr-2.12.1.ebuild
index 38eb6c680c2c..e416c8508da5 100644
--- a/dev-python/numexpr/numexpr-2.12.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.12.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-2.0.0_rc:=[${PYTHON_USEDEP}]
diff --git a/dev-python/numexpr/numexpr-2.13.1.ebuild b/dev-python/numexpr/numexpr-2.13.1.ebuild
index 38eb6c680c2c..e416c8508da5 100644
--- a/dev-python/numexpr/numexpr-2.13.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.13.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-2.0.0_rc:=[${PYTHON_USEDEP}]
diff --git a/dev-python/numexpr/numexpr-2.14.1.ebuild b/dev-python/numexpr/numexpr-2.14.1.ebuild
index 6ff23753c1d6..53fc224838e7 100644
--- a/dev-python/numexpr/numexpr-2.14.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.14.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-2.0.0:=[${PYTHON_USEDEP}]
diff --git a/dev-python/objgraph/objgraph-3.6.2.ebuild b/dev-python/objgraph/objgraph-3.6.2.ebuild
index 750ad2dd284e..177c8cf2fcbd 100644
--- a/dev-python/objgraph/objgraph-3.6.2.ebuild
+++ b/dev-python/objgraph/objgraph-3.6.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/oct2py/oct2py-5.8.0.ebuild b/dev-python/oct2py/oct2py-5.8.0.ebuild
index e23b67c010d4..2149bfc0ec50 100644
--- a/dev-python/oct2py/oct2py-5.8.0.ebuild
+++ b/dev-python/oct2py/oct2py-5.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/octave-kernel/octave-kernel-0.36.0.ebuild b/dev-python/octave-kernel/octave-kernel-0.36.0.ebuild
index 641b7bd1dc68..807bc99e539b 100644
--- a/dev-python/octave-kernel/octave-kernel-0.36.0.ebuild
+++ b/dev-python/octave-kernel/octave-kernel-0.36.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/olefile/olefile-0.47.ebuild b/dev-python/olefile/olefile-0.47.ebuild
index 5a54627ffbf4..ddebd7715fe6 100644
--- a/dev-python/olefile/olefile-0.47.ebuild
+++ b/dev-python/olefile/olefile-0.47.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_sphinx doc \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/ordered-set/ordered-set-4.1.0-r1.ebuild b/dev-python/ordered-set/ordered-set-4.1.0-r1.ebuild
index 093d5496a849..cb8f16c7dd64 100644
--- a/dev-python/ordered-set/ordered-set-4.1.0-r1.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.1.0-r1.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/osc-lib/osc-lib-4.2.0.ebuild b/dev-python/osc-lib/osc-lib-4.2.0.ebuild
index d351fe0886cd..fd1160b0bb4c 100644
--- a/dev-python/osc-lib/osc-lib-4.2.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-4.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cliff-4.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/oslo-config-10.0.0.ebuild b/dev-python/oslo-config/oslo-config-10.0.0.ebuild
index 8cd2d342761a..fcc0dac86552 100644
--- a/dev-python/oslo-config/oslo-config-10.0.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-10.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/oslo-config-10.1.0.ebuild b/dev-python/oslo-config/oslo-config-10.1.0.ebuild
index 8cd2d342761a..fcc0dac86552 100644
--- a/dev-python/oslo-config/oslo-config-10.1.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-10.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/oslotest-5.0.1.ebuild b/dev-python/oslotest/oslotest-5.0.1.ebuild
index 183a29603f3e..8dee93083a55 100644
--- a/dev-python/oslotest/oslotest-5.0.1.ebuild
+++ b/dev-python/oslotest/oslotest-5.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/oslotest-6.0.0.ebuild b/dev-python/oslotest/oslotest-6.0.0.ebuild
index 15e2e8431707..813f1dfbd543 100644
--- a/dev-python/oslotest/oslotest-6.0.0.ebuild
+++ b/dev-python/oslotest/oslotest-6.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/packaging/packaging-24.2.ebuild b/dev-python/packaging/packaging-24.2.ebuild
index 87c37bc62fdd..c520544eefd0 100644
--- a/dev-python/packaging/packaging-24.2.ebuild
+++ b/dev-python/packaging/packaging-24.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-python/setuptools-67
diff --git a/dev-python/packaging/packaging-25.0.ebuild b/dev-python/packaging/packaging-25.0.ebuild
index db2718935a28..9619a1fdb0ef 100644
--- a/dev-python/packaging/packaging-25.0.ebuild
+++ b/dev-python/packaging/packaging-25.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-python/setuptools-67
diff --git a/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild b/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
index e3799ac92fe8..a82e2f9df1d4 100644
--- a/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
@@ -16,4 +16,4 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/dev-python/paramiko/paramiko-3.5.1.ebuild b/dev-python/paramiko/paramiko-3.5.1.ebuild
index 877576083b86..68ad830c89b1 100644
--- a/dev-python/paramiko/paramiko-3.5.1.ebuild
+++ b/dev-python/paramiko/paramiko-3.5.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/paramiko/paramiko-4.0.0-r1.ebuild b/dev-python/paramiko/paramiko-4.0.0-r1.ebuild
index 2eadfdc13a96..404a2ad20b17 100644
--- a/dev-python/paramiko/paramiko-4.0.0-r1.ebuild
+++ b/dev-python/paramiko/paramiko-4.0.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/paramiko/paramiko-4.0.0.ebuild b/dev-python/paramiko/paramiko-4.0.0.ebuild
index 74703eba2b4d..678d5e516781 100644
--- a/dev-python/paramiko/paramiko-4.0.0.ebuild
+++ b/dev-python/paramiko/paramiko-4.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/paste/paste-3.10.1.ebuild b/dev-python/paste/paste-3.10.1.ebuild
index 7d251de3b943..c00b21b6a6e5 100644
--- a/dev-python/paste/paste-3.10.1.ebuild
+++ b/dev-python/paste/paste-3.10.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/pastedeploy/pastedeploy-3.1.ebuild b/dev-python/pastedeploy/pastedeploy-3.1.ebuild
index 6a897dcf75e2..fc87a28d58ee 100644
--- a/dev-python/pastedeploy/pastedeploy-3.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-3.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	!dev-python/namespace-paste
diff --git a/dev-python/patch-ng/patch-ng-1.18.1.ebuild b/dev-python/patch-ng/patch-ng-1.18.1.ebuild
index 149c9043f763..4fdc521de16b 100644
--- a/dev-python/patch-ng/patch-ng-1.18.1.ebuild
+++ b/dev-python/patch-ng/patch-ng-1.18.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/patch-ng/patch-ng-1.19.0.ebuild b/dev-python/patch-ng/patch-ng-1.19.0.ebuild
index 38d207daa87a..48b1901c5504 100644
--- a/dev-python/patch-ng/patch-ng-1.19.0.ebuild
+++ b/dev-python/patch-ng/patch-ng-1.19.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/path/path-17.1.0.ebuild b/dev-python/path/path-17.1.0.ebuild
index 55108e36cfb6..b1c7f31c2f34 100644
--- a/dev-python/path/path-17.1.0.ebuild
+++ b/dev-python/path/path-17.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/path/path-17.1.1.ebuild b/dev-python/path/path-17.1.1.ebuild
index d08da8256c08..2e40327dad65 100644
--- a/dev-python/path/path-17.1.1.ebuild
+++ b/dev-python/path/path-17.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pathspec/pathspec-0.12.1.ebuild b/dev-python/pathspec/pathspec-0.12.1.ebuild
index 665ae0c417c8..132b07f38fed 100644
--- a/dev-python/pathspec/pathspec-0.12.1.ebuild
+++ b/dev-python/pathspec/pathspec-0.12.1.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/patsy/patsy-1.0.1-r1.ebuild b/dev-python/patsy/patsy-1.0.1-r1.ebuild
index 776fdc57ae34..541a6dd12462 100644
--- a/dev-python/patsy/patsy-1.0.1-r1.ebuild
+++ b/dev-python/patsy/patsy-1.0.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/patsy/patsy-1.0.1.ebuild b/dev-python/patsy/patsy-1.0.1.ebuild
index 94e60617936a..728b16d05425 100644
--- a/dev-python/patsy/patsy-1.0.1.ebuild
+++ b/dev-python/patsy/patsy-1.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/patsy/patsy-1.0.2.ebuild b/dev-python/patsy/patsy-1.0.2.ebuild
index 776fdc57ae34..541a6dd12462 100644
--- a/dev-python/patsy/patsy-1.0.2.ebuild
+++ b/dev-python/patsy/patsy-1.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild
index b3918714356d..e467da572b7e 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 python_test() {
 	"${EPYTHON}" test/test_pbkdf2.py -v || die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/pbr/pbr-7.0.1.ebuild b/dev-python/pbr/pbr-7.0.1.ebuild
index e2f0a7abcfef..cd0cd394cf52 100644
--- a/dev-python/pbr/pbr-7.0.1.ebuild
+++ b/dev-python/pbr/pbr-7.0.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/setuptools-64.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pbr/pbr-7.0.2.ebuild b/dev-python/pbr/pbr-7.0.2.ebuild
index 97df74a29883..bad931613970 100644
--- a/dev-python/pbr/pbr-7.0.2.ebuild
+++ b/dev-python/pbr/pbr-7.0.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/setuptools-64.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pbr/pbr-7.0.3.ebuild b/dev-python/pbr/pbr-7.0.3.ebuild
index 97df74a29883..bad931613970 100644
--- a/dev-python/pbr/pbr-7.0.3.ebuild
+++ b/dev-python/pbr/pbr-7.0.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/setuptools-64.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pexpect/pexpect-4.9.0.ebuild b/dev-python/pexpect/pexpect-4.9.0.ebuild
index 99ebafffa3d9..5713187d35ec 100644
--- a/dev-python/pexpect/pexpect-4.9.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.9.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pillow/pillow-11.3.0.ebuild b/dev-python/pillow/pillow-11.3.0.ebuild
index 74a0d2b036ee..9fb70e858545 100644
--- a/dev-python/pillow/pillow-11.3.0.ebuild
+++ b/dev-python/pillow/pillow-11.3.0.ebuild
@@ -35,7 +35,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="avif examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-12.0.0.ebuild b/dev-python/pillow/pillow-12.0.0.ebuild
index 99f42e4ef5de..130bfbe577a1 100644
--- a/dev-python/pillow/pillow-12.0.0.ebuild
+++ b/dev-python/pillow/pillow-12.0.0.ebuild
@@ -35,7 +35,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="avif examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
index 80f1a1c2e50e..80db757251ae 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	virtual/pkgconfig
diff --git a/dev-python/pluggy/pluggy-1.6.0.ebuild b/dev-python/pluggy/pluggy-1.6.0.ebuild
index d7b278a0775c..0011aab69561 100644
--- a/dev-python/pluggy/pluggy-1.6.0.ebuild
+++ b/dev-python/pluggy/pluggy-1.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/ply/ply-3.11-r2.ebuild b/dev-python/ply/ply-3.11-r2.ebuild
index 6d3ec00e171c..104c3d026779 100644
--- a/dev-python/ply/ply-3.11-r2.ebuild
+++ b/dev-python/ply/ply-3.11-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-py3.12-a
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 DOCS=( ANNOUNCE CHANGES TODO )
diff --git a/dev-python/pmw/pmw-2.1.1.ebuild b/dev-python/pmw/pmw-2.1.1.ebuild
index b39395a89f50..3848d8f8144f 100644
--- a/dev-python/pmw/pmw-2.1.1.ebuild
+++ b/dev-python/pmw/pmw-2.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://pypi.org/project/Pmw/"
 
 LICENSE="BSD"
 SLOT="py3"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ppc ~sparc x86 ~x64-macos"
 IUSE="doc test"
 # https://sourceforge.net/p/pmw/bugs/39/
 RESTRICT="test"
diff --git a/dev-python/pockets/pockets-0.9.1-r3.ebuild b/dev-python/pockets/pockets-0.9.1-r3.ebuild
index 67c80c89fef2..3aaba306ebaf 100644
--- a/dev-python/pockets/pockets-0.9.1-r3.ebuild
+++ b/dev-python/pockets/pockets-0.9.1-r3.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pretend/pretend-1.0.9-r2.ebuild b/dev-python/pretend/pretend-1.0.9-r2.ebuild
index 8c723f10d735..e2aed325754d 100644
--- a/dev-python/pretend/pretend-1.0.9-r2.ebuild
+++ b/dev-python/pretend/pretend-1.0.9-r2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/process-tests/process-tests-3.0.0.ebuild b/dev-python/process-tests/process-tests-3.0.0.ebuild
index 1d77c37c1128..41e71f5897b3 100644
--- a/dev-python/process-tests/process-tests-3.0.0.ebuild
+++ b/dev-python/process-tests/process-tests-3.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/progress/progress-1.6.1.ebuild b/dev-python/progress/progress-1.6.1.ebuild
index c361d3940a03..eb84febb6ed5 100644
--- a/dev-python/progress/progress-1.6.1.ebuild
+++ b/dev-python/progress/progress-1.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 
 python_test() {
 	"${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/protobuf/protobuf-5.29.5-r1.ebuild b/dev-python/protobuf/protobuf-5.29.5-r1.ebuild
index 80ade606cf1f..2a4a08fffcbe 100644
--- a/dev-python/protobuf/protobuf-5.29.5-r1.ebuild
+++ b/dev-python/protobuf/protobuf-5.29.5-r1.ebuild
@@ -26,4 +26,4 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
diff --git a/dev-python/protobuf/protobuf-6.30.2-r1.ebuild b/dev-python/protobuf/protobuf-6.30.2-r1.ebuild
index 590c6fa1c266..69336ab91e79 100644
--- a/dev-python/protobuf/protobuf-6.30.2-r1.ebuild
+++ b/dev-python/protobuf/protobuf-6.30.2-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 src_prepare() {
 	distutils-r1_src_prepare
diff --git a/dev-python/psutil/psutil-7.1.0.ebuild b/dev-python/psutil/psutil-7.1.0.ebuild
index 0d21fcb6c916..6f458d1cb583 100644
--- a/dev-python/psutil/psutil-7.1.0.ebuild
+++ b/dev-python/psutil/psutil-7.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 EPYTEST_PLUGINS=( pytest-subtests )
 distutils_enable_tests pytest
diff --git a/dev-python/psutil/psutil-7.1.1.ebuild b/dev-python/psutil/psutil-7.1.1.ebuild
index cdd9d496049b..36b29bc3f36e 100644
--- a/dev-python/psutil/psutil-7.1.1.ebuild
+++ b/dev-python/psutil/psutil-7.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 EPYTEST_PLUGINS=( pytest-subtests )
 distutils_enable_tests pytest
diff --git a/dev-python/psutil/psutil-7.1.2.ebuild b/dev-python/psutil/psutil-7.1.2.ebuild
index cdd9d496049b..36b29bc3f36e 100644
--- a/dev-python/psutil/psutil-7.1.2.ebuild
+++ b/dev-python/psutil/psutil-7.1.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 EPYTEST_PLUGINS=( pytest-subtests )
 distutils_enable_tests pytest
diff --git a/dev-python/psutil/psutil-7.1.3.ebuild b/dev-python/psutil/psutil-7.1.3.ebuild
index 0d21fcb6c916..6f458d1cb583 100644
--- a/dev-python/psutil/psutil-7.1.3.ebuild
+++ b/dev-python/psutil/psutil-7.1.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 EPYTEST_PLUGINS=( pytest-subtests )
 distutils_enable_tests pytest
diff --git a/dev-python/psycopg/psycopg-2.9.10.ebuild b/dev-python/psycopg/psycopg-2.9.10.ebuild
index 650ed128019e..ff68c2f55877 100644
--- a/dev-python/psycopg/psycopg-2.9.10.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.10.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/psycopg-2.9.11.ebuild b/dev-python/psycopg/psycopg-2.9.11.ebuild
index 45c95b1eaa70..bd251d7b90a1 100644
--- a/dev-python/psycopg/psycopg-2.9.11.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.11.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/psycopg-3.2.10.ebuild b/dev-python/psycopg/psycopg-3.2.10.ebuild
index 67542fb029ba..db724478eb3c 100644
--- a/dev-python/psycopg/psycopg-3.2.10.ebuild
+++ b/dev-python/psycopg/psycopg-3.2.10.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/psycopg/psycopg-3.2.11.ebuild b/dev-python/psycopg/psycopg-3.2.11.ebuild
index 3d30a58cdaf5..97b17c7e6f63 100644
--- a/dev-python/psycopg/psycopg-3.2.11.ebuild
+++ b/dev-python/psycopg/psycopg-3.2.11.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/psycopg/psycopg-3.2.12.ebuild b/dev-python/psycopg/psycopg-3.2.12.ebuild
index 3d30a58cdaf5..97b17c7e6f63 100644
--- a/dev-python/psycopg/psycopg-3.2.12.ebuild
+++ b/dev-python/psycopg/psycopg-3.2.12.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/psycopg/psycopg-3.2.13.ebuild b/dev-python/psycopg/psycopg-3.2.13.ebuild
index 3d30a58cdaf5..97b17c7e6f63 100644
--- a/dev-python/psycopg/psycopg-3.2.13.ebuild
+++ b/dev-python/psycopg/psycopg-3.2.13.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/psycopg/psycopg-3.2.9.ebuild b/dev-python/psycopg/psycopg-3.2.9.ebuild
index dee59a68e79b..5e27cc8c1677 100644
--- a/dev-python/psycopg/psycopg-3.2.9.ebuild
+++ b/dev-python/psycopg/psycopg-3.2.9.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/psycopg/psycopg-3.3.0.ebuild b/dev-python/psycopg/psycopg-3.3.0.ebuild
index 34494ece3b5a..e5467584766e 100644
--- a/dev-python/psycopg/psycopg-3.3.0.ebuild
+++ b/dev-python/psycopg/psycopg-3.3.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/psycopg/psycopg-3.3.1.ebuild b/dev-python/psycopg/psycopg-3.3.1.ebuild
index 34494ece3b5a..e5467584766e 100644
--- a/dev-python/psycopg/psycopg-3.3.1.ebuild
+++ b/dev-python/psycopg/psycopg-3.3.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/psycopg/psycopg-3.3.2.ebuild b/dev-python/psycopg/psycopg-3.3.2.ebuild
index 34494ece3b5a..e5467584766e 100644
--- a/dev-python/psycopg/psycopg-3.3.2.ebuild
+++ b/dev-python/psycopg/psycopg-3.3.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild b/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
index fd95f7014539..774da7e16308 100644
--- a/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
index e71ceae250f4..37d6d01ae99b 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild b/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
index 12fa8a67a074..251c9e22ed53 100644
--- a/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/py/py-1.11.0-r1.ebuild b/dev-python/py/py-1.11.0-r1.ebuild
index bac848c57066..7bad9bc4393a 100644
--- a/dev-python/py/py-1.11.0-r1.ebuild
+++ b/dev-python/py/py-1.11.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 # This package is unmaintained and keeps being broken periodically.
 RESTRICT=test
 
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.4.2.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.4.2.ebuild
index ef475de1b5cb..847c692cbb07 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.4.2.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.4.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	<dev-python/pyasn1-0.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyasn1/pyasn1-0.6.1.ebuild b/dev-python/pyasn1/pyasn1-0.6.1.ebuild
index d5b6344dd645..df45be4b05be 100644
--- a/dev-python/pyasn1/pyasn1-0.6.1.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 distutils_enable_tests unittest
 distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pycairo/pycairo-1.28.0.ebuild b/dev-python/pycairo/pycairo-1.28.0.ebuild
index 5864b5fda50a..d428ddea41da 100644
--- a/dev-python/pycairo/pycairo-1.28.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.28.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="X examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycairo/pycairo-1.29.0-r1.ebuild b/dev-python/pycairo/pycairo-1.29.0-r1.ebuild
index c3a0e0658325..42dcfe8ae647 100644
--- a/dev-python/pycairo/pycairo-1.29.0-r1.ebuild
+++ b/dev-python/pycairo/pycairo-1.29.0-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="X examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycodestyle/pycodestyle-2.14.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.14.0.ebuild
index f746426168bf..fec174772109 100644
--- a/dev-python/pycodestyle/pycodestyle-2.14.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.14.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/pycparser/pycparser-2.22.ebuild b/dev-python/pycparser/pycparser-2.22.ebuild
index 64f02b1d9d54..1ea0876bec9a 100644
--- a/dev-python/pycparser/pycparser-2.22.ebuild
+++ b/dev-python/pycparser/pycparser-2.22.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/ply:=[${PYTHON_USEDEP}]
diff --git a/dev-python/pycparser/pycparser-2.23.ebuild b/dev-python/pycparser/pycparser-2.23.ebuild
index 64f02b1d9d54..1ea0876bec9a 100644
--- a/dev-python/pycparser/pycparser-2.23.ebuild
+++ b/dev-python/pycparser/pycparser-2.23.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/ply:=[${PYTHON_USEDEP}]
diff --git a/dev-python/pycryptodome/pycryptodome-3.22.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.22.0.ebuild
index 5ef772578527..0682623464b7 100644
--- a/dev-python/pycryptodome/pycryptodome-3.22.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.22.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	dev-libs/gmp:=
diff --git a/dev-python/pycryptodome/pycryptodome-3.23.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.23.0.ebuild
index 5ef772578527..0682623464b7 100644
--- a/dev-python/pycryptodome/pycryptodome-3.23.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.23.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	dev-libs/gmp:=
diff --git a/dev-python/pycurl/pycurl-7.45.6.ebuild b/dev-python/pycurl/pycurl-7.45.6.ebuild
index 9bc70758ba36..1451aa8cae14 100644
--- a/dev-python/pycurl/pycurl-7.45.6.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="curl_ssl_gnutls +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pycurl/pycurl-7.45.7.ebuild b/dev-python/pycurl/pycurl-7.45.7.ebuild
index 5842e88192dc..558fb1f00889 100644
--- a/dev-python/pycurl/pycurl-7.45.7.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="curl_ssl_gnutls +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pycxx/pycxx-7.1.10.ebuild b/dev-python/pycxx/pycxx-7.1.10.ebuild
index 9116b3a4368e..df0ad6193638 100644
--- a/dev-python/pycxx/pycxx-7.1.10.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/cxx-code-r464-trunk/CXX
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycxx/pycxx-7.1.8-r3.ebuild b/dev-python/pycxx/pycxx-7.1.8-r3.ebuild
index 39368a0b4000..b9b0d571a1d1 100644
--- a/dev-python/pycxx/pycxx-7.1.8-r3.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.8-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-macos"
 IUSE="doc examples"
 
 BDEPEND="
diff --git a/dev-python/pydot/pydot-4.0.1.ebuild b/dev-python/pydot/pydot-4.0.1.ebuild
index d13ea30ad585..405a6c074347 100644
--- a/dev-python/pydot/pydot-4.0.1.ebuild
+++ b/dev-python/pydot/pydot-4.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyelftools/pyelftools-0.32.ebuild b/dev-python/pyelftools/pyelftools-0.32.ebuild
index ff177e0b8d7f..942cb4f7947c 100644
--- a/dev-python/pyelftools/pyelftools-0.32.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.32.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 python_test() {
 	# readelf_tests often fails due to host `readelf` changing output format
diff --git a/dev-python/pyflakes/pyflakes-3.4.0.ebuild b/dev-python/pyflakes/pyflakes-3.4.0.ebuild
index 1e97f4530941..d75b87e0ac00 100644
--- a/dev-python/pyflakes/pyflakes-3.4.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-3.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyftpdlib/pyftpdlib-2.0.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-2.0.1.ebuild
index ffde978d9767..c4342251c266 100644
--- a/dev-python/pyftpdlib/pyftpdlib-2.0.1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-2.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pyftpdlib/pyftpdlib-2.1.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-2.1.0.ebuild
index b09ad0c09b9b..6b7d5f069c55 100644
--- a/dev-python/pyftpdlib/pyftpdlib-2.1.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-2.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pyglet/pyglet-2.1.10.ebuild b/dev-python/pyglet/pyglet-2.1.10.ebuild
index 35fbf447c975..bda87407e086 100644
--- a/dev-python/pyglet/pyglet-2.1.10.ebuild
+++ b/dev-python/pyglet/pyglet-2.1.10.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="examples image +sound"
 
 RDEPEND="
diff --git a/dev-python/pyglet/pyglet-2.1.11.ebuild b/dev-python/pyglet/pyglet-2.1.11.ebuild
index 35fbf447c975..bda87407e086 100644
--- a/dev-python/pyglet/pyglet-2.1.11.ebuild
+++ b/dev-python/pyglet/pyglet-2.1.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="examples image +sound"
 
 RDEPEND="
diff --git a/dev-python/pyglet/pyglet-2.1.9.ebuild b/dev-python/pyglet/pyglet-2.1.9.ebuild
index 48e8e1159843..de4a273348ee 100644
--- a/dev-python/pyglet/pyglet-2.1.9.ebuild
+++ b/dev-python/pyglet/pyglet-2.1.9.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="examples image +sound"
 
 RDEPEND="
diff --git a/dev-python/pygobject/pygobject-3.48.2-r1.ebuild b/dev-python/pygobject/pygobject-3.48.2-r1.ebuild
index 37f21d012721..886ad23fe373 100644
--- a/dev-python/pygobject/pygobject-3.48.2-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.48.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://pygobject.gnome.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/pygobject-3.50.0.ebuild b/dev-python/pygobject/pygobject-3.50.0.ebuild
index 351afdda8844..8db4c1dfc67f 100644
--- a/dev-python/pygobject/pygobject-3.50.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.50.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pygobject.gnome.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+cairo test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/pygobject-3.50.1.ebuild b/dev-python/pygobject/pygobject-3.50.1.ebuild
index 80bb9bcfdcf8..f636b10c33cf 100644
--- a/dev-python/pygobject/pygobject-3.50.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.50.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pygobject.gnome.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+cairo test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/pygobject-3.52.3.ebuild b/dev-python/pygobject/pygobject-3.52.3.ebuild
index b147a9c7f286..1d3290e3e4ea 100644
--- a/dev-python/pygobject/pygobject-3.52.3.ebuild
+++ b/dev-python/pygobject/pygobject-3.52.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI+="
 "
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+cairo test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/pygobject-3.54.3.ebuild b/dev-python/pygobject/pygobject-3.54.3.ebuild
index d1d13f3d2524..261b9cd37b3f 100644
--- a/dev-python/pygobject/pygobject-3.54.3.ebuild
+++ b/dev-python/pygobject/pygobject-3.54.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+cairo test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/pygobject-3.54.5.ebuild b/dev-python/pygobject/pygobject-3.54.5.ebuild
index d1d13f3d2524..261b9cd37b3f 100644
--- a/dev-python/pygobject/pygobject-3.54.5.ebuild
+++ b/dev-python/pygobject/pygobject-3.54.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+cairo test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygraphviz/pygraphviz-1.14-r1.ebuild b/dev-python/pygraphviz/pygraphviz-1.14-r1.ebuild
index 5417ff5a804d..062c704ced38 100644
--- a/dev-python/pygraphviz/pygraphviz-1.14-r1.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.14-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 DEPEND="
diff --git a/dev-python/pygraphviz/pygraphviz-1.14-r2.ebuild b/dev-python/pygraphviz/pygraphviz-1.14-r2.ebuild
index 6a9c05c593f9..cdb5684f88ef 100644
--- a/dev-python/pygraphviz/pygraphviz-1.14-r2.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.14-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 DEPEND="
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.1.0.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.1.0.ebuild
index 91919a847da4..f13d3bcf042d 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.1.0.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.1.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pyinotify/pyinotify-0.9.6-r1.ebuild b/dev-python/pyinotify/pyinotify-0.9.6-r1.ebuild
index b42211a8847c..9bd95c56ccdc 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6-r1.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples"
 
 PATCHES=(
diff --git a/dev-python/pyjwt/pyjwt-2.10.1.ebuild b/dev-python/pyjwt/pyjwt-2.10.1.ebuild
index a044f80599e5..14f2eb370a84 100644
--- a/dev-python/pyjwt/pyjwt-2.10.1.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.10.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	!dev-python/python-jwt
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
index 2d9372ad3287..5b51c5e24e23 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdstat/pymdstat-0.4.3.ebuild b/dev-python/pymdstat/pymdstat-0.4.3.ebuild
index 1b5f9dbe5d54..0f6d25ff76ca 100644
--- a/dev-python/pymdstat/pymdstat-0.4.3.ebuild
+++ b/dev-python/pymdstat/pymdstat-0.4.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 python_prepare_all() {
 	# docs
diff --git a/dev-python/pynacl/pynacl-1.5.0-r4.ebuild b/dev-python/pynacl/pynacl-1.5.0-r4.ebuild
index dd617b36a518..2ded6c274370 100644
--- a/dev-python/pynacl/pynacl-1.5.0-r4.ebuild
+++ b/dev-python/pynacl/pynacl-1.5.0-r4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	dev-libs/libsodium:=
diff --git a/dev-python/pynacl/pynacl-1.6.0.ebuild b/dev-python/pynacl/pynacl-1.6.0.ebuild
index b4fbcfce05df..696332af5c11 100644
--- a/dev-python/pynacl/pynacl-1.6.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.6.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	dev-libs/libsodium:=
diff --git a/dev-python/pynacl/pynacl-1.6.1.ebuild b/dev-python/pynacl/pynacl-1.6.1.ebuild
index b4fbcfce05df..696332af5c11 100644
--- a/dev-python/pynacl/pynacl-1.6.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.6.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	dev-libs/libsodium:=
diff --git a/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.10.ebuild b/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.10.ebuild
index de9470411ac3..8647c89f10fa 100644
--- a/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.10.ebuild
+++ b/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.10.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="numpy"
 
 DEPEND="
diff --git a/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.9.ebuild b/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.9.ebuild
index 3a396e22c765..029c0830a691 100644
--- a/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.9.ebuild
+++ b/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.9.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="numpy"
 
 DEPEND="
diff --git a/dev-python/pyopengl-accelerate/pyopengl-accelerate-9999.ebuild b/dev-python/pyopengl-accelerate/pyopengl-accelerate-9999.ebuild
index e03b3e4172bd..3768d3936a46 100644
--- a/dev-python/pyopengl-accelerate/pyopengl-accelerate-9999.ebuild
+++ b/dev-python/pyopengl-accelerate/pyopengl-accelerate-9999.ebuild
@@ -26,7 +26,7 @@ else
 		https://github.com/mcfletch/pyopengl/archive/release-${PV}.tar.gz
 			-> ${MY_P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}/accelerate
 fi
 
diff --git a/dev-python/pyopengl/pyopengl-3.1.10.ebuild b/dev-python/pyopengl/pyopengl-3.1.10.ebuild
index 381052faa195..58f0061b2e79 100644
--- a/dev-python/pyopengl/pyopengl-3.1.10.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.10.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyopengl/pyopengl-3.1.8.ebuild b/dev-python/pyopengl/pyopengl-3.1.8.ebuild
index 22be12cbdf7f..ac9b61daf2a9 100644
--- a/dev-python/pyopengl/pyopengl-3.1.8.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.8.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${PN}-release-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyopengl/pyopengl-3.1.9.ebuild b/dev-python/pyopengl/pyopengl-3.1.9.ebuild
index 68670362c71d..4da0ab1309ec 100644
--- a/dev-python/pyopengl/pyopengl-3.1.9.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.9.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyparsing/pyparsing-3.2.3.ebuild b/dev-python/pyparsing/pyparsing-3.2.3.ebuild
index a4e4a83efdb8..822e75ba0897 100644
--- a/dev-python/pyparsing/pyparsing-3.2.3.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.2.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyparsing/pyparsing-3.2.4.ebuild b/dev-python/pyparsing/pyparsing-3.2.4.ebuild
index 2204ea1c6e67..92dd4c5e4fe3 100644
--- a/dev-python/pyparsing/pyparsing-3.2.4.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.2.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 EPYTEST_PLUGINS=()
diff --git a/dev-python/pyparsing/pyparsing-3.2.5.ebuild b/dev-python/pyparsing/pyparsing-3.2.5.ebuild
index 6ac19db343ad..11dbee44e05b 100644
--- a/dev-python/pyparsing/pyparsing-3.2.5.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.2.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 EPYTEST_PLUGINS=()
diff --git a/dev-python/pyproj/pyproj-3.7.1.ebuild b/dev-python/pyproj/pyproj-3.7.1.ebuild
index 01d0b9a3991b..c99f7dace153 100644
--- a/dev-python/pyproj/pyproj-3.7.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.7.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="
 	>=sci-libs/proj-9.0.0:=
diff --git a/dev-python/pyproj/pyproj-3.7.2.ebuild b/dev-python/pyproj/pyproj-3.7.2.ebuild
index ad3943d4c732..0e5479dad05c 100644
--- a/dev-python/pyproj/pyproj-3.7.2.ebuild
+++ b/dev-python/pyproj/pyproj-3.7.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="
 	>=sci-libs/proj-9.0.0:=
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.20.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.20.ebuild
index a8ea58949f75..7f77e4882834 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.20.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.20.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 DEPEND="
diff --git a/dev-python/pyrsistent/pyrsistent-0.20.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.20.0.ebuild
index 3ea849c72c70..e4550b3c67a0 100644
--- a/dev-python/pyrsistent/pyrsistent-0.20.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.20.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/pysocks/pysocks-1.7.1-r2.ebuild b/dev-python/pysocks/pysocks-1.7.1-r2.ebuild
index c3b8854eb928..bfc8ea297b44 100644
--- a/dev-python/pysocks/pysocks-1.7.1-r2.ebuild
+++ b/dev-python/pysocks/pysocks-1.7.1-r2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # tests are broken beyond repair and the package is no longer maintained
 RESTRICT="test"
diff --git a/dev-python/pysvn/pysvn-1.9.22-r1.ebuild b/dev-python/pysvn/pysvn-1.9.22-r1.ebuild
index b168e62c9958..79cbec71c4b3 100644
--- a/dev-python/pysvn/pysvn-1.9.22-r1.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.22-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/pysvn/pysvn/V${PV}/${P}.tar.g
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pysvn/pysvn-1.9.22.ebuild b/dev-python/pysvn/pysvn-1.9.22.ebuild
index 2dcebfc91b34..e2410f4cd5da 100644
--- a/dev-python/pysvn/pysvn-1.9.22.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/pysvn/pysvn/V${PV}/${P}.tar.g
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pyte/pyte-0.8.2.ebuild b/dev-python/pyte/pyte-0.8.2.ebuild
index 6b4bdde8f05a..0f24166a5224 100644
--- a/dev-python/pyte/pyte-0.8.2.ebuild
+++ b/dev-python/pyte/pyte-0.8.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild
index cd9238625243..d3bf6d84e5b8 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-15.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-15.1.ebuild
index dfe008fd1bf3..7c6207d996e5 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-15.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-15.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-16.0.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-16.0.1.ebuild
index 43ed9ef2544e..75bf591b6be1 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-16.0.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-16.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-16.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-16.1.ebuild
index 43ed9ef2544e..75bf591b6be1 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-16.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-16.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.4.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.4.0.ebuild
index c24bac6113b1..a717f6ffa9a5 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.4.0.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.23.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.23.0.ebuild
index 339818ff86cd..b9e99525a0af 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.23.0.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.23.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-1.0.2.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-1.0.2.ebuild
index 5e43c8f7db91..aef949ba1c89 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-1.0.2.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-1.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-8.4.2.ebuild b/dev-python/pytest/pytest-8.4.2.ebuild
index 36f6e033b84f..fa8dfa45faa2 100644
--- a/dev-python/pytest/pytest-8.4.2.ebuild
+++ b/dev-python/pytest/pytest-8.4.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-9.0.1.ebuild b/dev-python/pytest/pytest-9.0.1.ebuild
index dc5b6d331444..f89802b21bca 100644
--- a/dev-python/pytest/pytest-9.0.1.ebuild
+++ b/dev-python/pytest/pytest-9.0.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-9.0.2.ebuild b/dev-python/pytest/pytest-9.0.2.ebuild
index b011b6a98cca..eafbd80b71b5 100644
--- a/dev-python/pytest/pytest-9.0.2.ebuild
+++ b/dev-python/pytest/pytest-9.0.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.9.0_p0.ebuild b/dev-python/python-dateutil/python-dateutil-2.9.0_p0.ebuild
index b07de650b888..11b469942905 100644
--- a/dev-python/python-dateutil/python-dateutil-2.9.0_p0.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.9.0_p0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-jose/python-jose-3.5.0.ebuild b/dev-python/python-jose/python-jose-3.5.0.ebuild
index 8cb410f8abf8..438cdd8b54b9 100644
--- a/dev-python/python-jose/python-jose-3.5.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # TODO: require only one crypto backend?
 RDEPEND="
diff --git a/dev-python/python-lzo/python-lzo-1.15.ebuild b/dev-python/python-lzo/python-lzo-1.15.ebuild
index 66c79182d6c0..670a3d3123a0 100644
--- a/dev-python/python-lzo/python-lzo-1.15.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.15.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~riscv ~sparc x86"
 
 DEPEND="
 	dev-libs/lzo:2
diff --git a/dev-python/python-magic/python-magic-0.4.27.ebuild b/dev-python/python-magic/python-magic-0.4.27.ebuild
index eef5a12821d2..eb41c6e8d2d1 100644
--- a/dev-python/python-magic/python-magic-0.4.27.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.27.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	sys-apps/file[-python]
diff --git a/dev-python/python-memcached/python-memcached-1.62.ebuild b/dev-python/python-memcached/python-memcached-1.62.ebuild
index d59669abc214..3c1ba4bf7d86 100644
--- a/dev-python/python-memcached/python-memcached-1.62.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.62.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild b/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild
index 35b9099146d6..9304f6809784 100644
--- a/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pytrie/pytrie-0.4.0-r1.ebuild b/dev-python/pytrie/pytrie-0.4.0-r1.ebuild
index 8b5ff7e5375e..72c429b25568 100644
--- a/dev-python/pytrie/pytrie-0.4.0-r1.ebuild
+++ b/dev-python/pytrie/pytrie-0.4.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytz/pytz-2025.2.ebuild b/dev-python/pytz/pytz-2025.2.ebuild
index 8acb8e2de62e..feee370dbd55 100644
--- a/dev-python/pytz/pytz-2025.2.ebuild
+++ b/dev-python/pytz/pytz-2025.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pywavelets/pywavelets-1.8.0.ebuild b/dev-python/pywavelets/pywavelets-1.8.0.ebuild
index 3075d06baf2c..6f7ce372f176 100644
--- a/dev-python/pywavelets/pywavelets-1.8.0.ebuild
+++ b/dev-python/pywavelets/pywavelets-1.8.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pywavelets/pywavelets-1.9.0.ebuild b/dev-python/pywavelets/pywavelets-1.9.0.ebuild
index d86c7a41161c..dc130b61e920 100644
--- a/dev-python/pywavelets/pywavelets-1.9.0.ebuild
+++ b/dev-python/pywavelets/pywavelets-1.9.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pyxattr/pyxattr-0.8.1.ebuild b/dev-python/pyxattr/pyxattr-0.8.1.ebuild
index c76851e84397..89dd126e364c 100644
--- a/dev-python/pyxattr/pyxattr-0.8.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.8.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	sys-apps/attr:=
diff --git a/dev-python/pyyaml/pyyaml-6.0.2.ebuild b/dev-python/pyyaml/pyyaml-6.0.2.ebuild
index 3f09e60423ea..132261a127ab 100644
--- a/dev-python/pyyaml/pyyaml-6.0.2.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/pyyaml/pyyaml-6.0.3.ebuild b/dev-python/pyyaml/pyyaml-6.0.3.ebuild
index 0f4e97740da8..fb655f8369ba 100644
--- a/dev-python/pyyaml/pyyaml-6.0.3.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.3.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/pyzmq/pyzmq-26.4.0.ebuild b/dev-python/pyzmq/pyzmq-26.4.0.ebuild
index 1289177d39b8..5df8efba51b7 100644
--- a/dev-python/pyzmq/pyzmq-26.4.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-26.4.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/pyzmq/pyzmq-27.0.0.ebuild b/dev-python/pyzmq/pyzmq-27.0.0.ebuild
index c0188f22ad0e..f7a605c65e83 100644
--- a/dev-python/pyzmq/pyzmq-27.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-27.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/pyzmq/pyzmq-27.0.1.ebuild b/dev-python/pyzmq/pyzmq-27.0.1.ebuild
index 68b036dab9cb..9fc8305ecf14 100644
--- a/dev-python/pyzmq/pyzmq-27.0.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-27.0.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/pyzmq/pyzmq-27.0.2.ebuild b/dev-python/pyzmq/pyzmq-27.0.2.ebuild
index 68b036dab9cb..9fc8305ecf14 100644
--- a/dev-python/pyzmq/pyzmq-27.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-27.0.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/pyzmq/pyzmq-27.1.0.ebuild b/dev-python/pyzmq/pyzmq-27.1.0.ebuild
index 68b036dab9cb..9fc8305ecf14 100644
--- a/dev-python/pyzmq/pyzmq-27.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-27.1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
index a1cae8ca887d..01f8f4c47808 100644
--- a/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/rencode/rencode-1.0.8-r1.ebuild b/dev-python/rencode/rencode-1.0.8-r1.ebuild
index cc03a610e886..2af6ddaee1c0 100644
--- a/dev-python/rencode/rencode-1.0.8-r1.ebuild
+++ b/dev-python/rencode/rencode-1.0.8-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~sparc x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/reportlab-4.4.4.ebuild b/dev-python/reportlab/reportlab-4.4.4.ebuild
index 847d9681fdba..93e57d21bb33 100644
--- a/dev-python/reportlab/reportlab-4.4.4.ebuild
+++ b/dev-python/reportlab/reportlab-4.4.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/charset-normalizer[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/reportlab-4.4.5.ebuild b/dev-python/reportlab/reportlab-4.4.5.ebuild
index 51f70832eb60..60eb2d4b2276 100644
--- a/dev-python/reportlab/reportlab-4.4.5.ebuild
+++ b/dev-python/reportlab/reportlab-4.4.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/charset-normalizer[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/reportlab-4.4.6.ebuild b/dev-python/reportlab/reportlab-4.4.6.ebuild
index 51f70832eb60..60eb2d4b2276 100644
--- a/dev-python/reportlab/reportlab-4.4.6.ebuild
+++ b/dev-python/reportlab/reportlab-4.4.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/charset-normalizer[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-futures/requests-futures-1.0.2.ebuild b/dev-python/requests-futures/requests-futures-1.0.2.ebuild
index 0876e3f8851d..be74df5f2b29 100644
--- a/dev-python/requests-futures/requests-futures-1.0.2.ebuild
+++ b/dev-python/requests-futures/requests-futures-1.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/requests-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r3.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r3.ebuild
index ca1e5cce209e..9bdd965571e3 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r3.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 # dev-python/regex doesn't support pypy. The package falls back to re and has most
 # functionality without it.
diff --git a/dev-python/rich-click/rich-click-1.8.9.ebuild b/dev-python/rich-click/rich-click-1.8.9.ebuild
index 4c819888ae73..1a362c7468ba 100644
--- a/dev-python/rich-click/rich-click-1.8.9.ebuild
+++ b/dev-python/rich-click/rich-click-1.8.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ewels/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/click-7[${PYTHON_USEDEP}]
diff --git a/dev-python/routes/routes-2.5.1-r2.ebuild b/dev-python/routes/routes-2.5.1-r2.ebuild
index 054e20c785db..6699c41cf24a 100644
--- a/dev-python/routes/routes-2.5.1-r2.ebuild
+++ b/dev-python/routes/routes-2.5.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
diff --git a/dev-python/rpy2/rpy2-3.5.14.ebuild b/dev-python/rpy2/rpy2-3.5.14.ebuild
index 3eb5183bba9b..8b4627b0e4d0 100644
--- a/dev-python/rpy2/rpy2-3.5.14.ebuild
+++ b/dev-python/rpy2/rpy2-3.5.14.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-lang/R-4.0
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.76.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.76.ebuild
index 589f349329d5..ee8dfe750fae 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.76.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.76.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/pyudev[${PYTHON_USEDEP}]
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.2.3.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.2.3.ebuild
index 897abdcf6ff3..1b8b29a1698e 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.2.3.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/pyudev[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/s3transfer-0.14.0.ebuild b/dev-python/s3transfer/s3transfer-0.14.0.ebuild
index 48387ed8e560..3586f7612007 100644
--- a/dev-python/s3transfer/s3transfer-0.14.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.14.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	<dev-python/botocore-2[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/s3transfer-0.15.0.ebuild b/dev-python/s3transfer/s3transfer-0.15.0.ebuild
index e9d8d56ccd2b..7ab0ee67b6f8 100644
--- a/dev-python/s3transfer/s3transfer-0.15.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.15.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/botocore-2[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/s3transfer-0.16.0.ebuild b/dev-python/s3transfer/s3transfer-0.16.0.ebuild
index e9d8d56ccd2b..7ab0ee67b6f8 100644
--- a/dev-python/s3transfer/s3transfer-0.16.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.16.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/botocore-2[${PYTHON_USEDEP}]
diff --git a/dev-python/seaborn/seaborn-0.13.2.ebuild b/dev-python/seaborn/seaborn-0.13.2.ebuild
index dec22c29c233..e66e8a943312 100644
--- a/dev-python/seaborn/seaborn-0.13.2.ebuild
+++ b/dev-python/seaborn/seaborn-0.13.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~amd64-linux"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/matplotlib-3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/secretstorage/secretstorage-3.4.0.ebuild b/dev-python/secretstorage/secretstorage-3.4.0.ebuild
index d6248169516e..666419fba3be 100644
--- a/dev-python/secretstorage/secretstorage-3.4.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/secretstorage/secretstorage-3.4.1.ebuild b/dev-python/secretstorage/secretstorage-3.4.1.ebuild
index 33445fbf03be..09c0e818271d 100644
--- a/dev-python/secretstorage/secretstorage-3.4.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/secretstorage/secretstorage-3.5.0.ebuild b/dev-python/secretstorage/secretstorage-3.5.0.ebuild
index e4683d411a9c..0f57d9cc3d11 100644
--- a/dev-python/secretstorage/secretstorage-3.5.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.5.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/service-identity/service-identity-24.2.0.ebuild b/dev-python/service-identity/service-identity-24.2.0.ebuild
index 2a1a87fd1fc0..8893b517c439 100644
--- a/dev-python/service-identity/service-identity-24.2.0.ebuild
+++ b/dev-python/service-identity/service-identity-24.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/setproctitle/setproctitle-1.3.5.ebuild b/dev-python/setproctitle/setproctitle-1.3.5.ebuild
index a075c7e0eed1..9b4f203d5892 100644
--- a/dev-python/setproctitle/setproctitle-1.3.5.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.3.5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/setproctitle/setproctitle-1.3.7.ebuild b/dev-python/setproctitle/setproctitle-1.3.7.ebuild
index 0b897587cb3e..70e668817989 100644
--- a/dev-python/setproctitle/setproctitle-1.3.7.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.3.7.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools-scm/setuptools-scm-8.3.1.ebuild b/dev-python/setuptools-scm/setuptools-scm-8.3.1.ebuild
index 94b40b5b2d50..1edec363a312 100644
--- a/dev-python/setuptools-scm/setuptools-scm-8.3.1.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-8.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # there's an optional dep on rich for cute logs
 RDEPEND="
diff --git a/dev-python/setuptools-scm/setuptools-scm-9.2.0.ebuild b/dev-python/setuptools-scm/setuptools-scm-9.2.0.ebuild
index 6e91c11e4925..8e4e74d74e78 100644
--- a/dev-python/setuptools-scm/setuptools-scm-9.2.0.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-9.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # there's an optional dep on rich for cute logs
 RDEPEND="
diff --git a/dev-python/setuptools-scm/setuptools-scm-9.2.1.ebuild b/dev-python/setuptools-scm/setuptools-scm-9.2.1.ebuild
index 95a96db391ce..7b20cb72f27a 100644
--- a/dev-python/setuptools-scm/setuptools-scm-9.2.1.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-9.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # there's an optional dep on rich for cute logs
 RDEPEND="
diff --git a/dev-python/setuptools-scm/setuptools-scm-9.2.2.ebuild b/dev-python/setuptools-scm/setuptools-scm-9.2.2.ebuild
index 150dd96c1a42..332c0f91a6f2 100644
--- a/dev-python/setuptools-scm/setuptools-scm-9.2.2.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-9.2.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # there's an optional dep on rich for cute logs
 RDEPEND="
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
index 641c8c404e79..7607a6e3dbdf 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sh/sh-2.2.2.ebuild b/dev-python/sh/sh-2.2.2.ebuild
index b30403281b13..6b9355e05008 100644
--- a/dev-python/sh/sh-2.2.2.ebuild
+++ b/dev-python/sh/sh-2.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/simplejson/simplejson-3.20.1.ebuild b/dev-python/simplejson/simplejson-3.20.1.ebuild
index c29653c8a793..bc9d83fe85b9 100644
--- a/dev-python/simplejson/simplejson-3.20.1.ebuild
+++ b/dev-python/simplejson/simplejson-3.20.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DOCS=( README.rst CHANGES.txt )
diff --git a/dev-python/simplejson/simplejson-3.20.2.ebuild b/dev-python/simplejson/simplejson-3.20.2.ebuild
index c29653c8a793..bc9d83fe85b9 100644
--- a/dev-python/simplejson/simplejson-3.20.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.20.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 DOCS=( README.rst CHANGES.txt )
diff --git a/dev-python/simpy/simpy-4.1.1.ebuild b/dev-python/simpy/simpy-4.1.1.ebuild
index 0c423bf8d931..ac9e58688544 100644
--- a/dev-python/simpy/simpy-4.1.1.ebuild
+++ b/dev-python/simpy/simpy-4.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/six/six-1.17.0.ebuild b/dev-python/six/six-1.17.0.ebuild
index dc195b8f0c8c..48c8485225c7 100644
--- a/dev-python/six/six-1.17.0.ebuild
+++ b/dev-python/six/six-1.17.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
index 15dad9984a80..94952202ffe4 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
index f63fca45d495..0ddf3f161100 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.19.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.19.0.ebuild
index 491d9054b760..91bc0d107920 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.19.0.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.19.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.20.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.20.0.ebuild
index ba8d07795379..0686cb138977 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.20.0.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.20.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-issues/sphinx-issues-5.0.1.ebuild b/dev-python/sphinx-issues/sphinx-issues-5.0.1.ebuild
index dbb5b390186e..05554386cc9b 100644
--- a/dev-python/sphinx-issues/sphinx-issues-5.0.1.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-5.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0-r1.ebuild
index 2b62a52af960..0284f5e41649 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0.ebuild
index 274dfa07e438..a15ec0e31561 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-2.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0-r1.ebuild
index 679a64d3af3b..939c22be4fa1 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0.ebuild
index f2997eb8ed34..788c8575a29d 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-2.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.13.0.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.13.0.ebuild
index 9fd0350666ca..19f1fdceeb31 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.13.0.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.13.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/doxylink-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0-r1.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0-r1.ebuild
index e38c1dbb2264..4b3bbfc58e9b 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0.ebuild
index 6d41d565c0df..f2bf211aed85 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild
index 11db4fbac6fc..16f0f518ab28 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r4.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r4.ebuild
index 470b7f0b93c0..a033bb34ad34 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r4.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild
index 2fd8383f20d6..17d600c3c1c7 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0-r1.ebuild
index ba98cef27723..7e8dc015d05c 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0.ebuild
index 4d44fa495dbf..cd90534f69f5 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-2.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0-r1.ebuild
index 978ae9b47b71..2e99301ef955 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0.ebuild
index 6dd2d38bbbc5..80935b65491a 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-2.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.1.ebuild
index abd1bb9ba768..97fa5c8810a7 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pyenchant-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.2.ebuild
index 6830e40bc562..7c7c420b9e16 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.2.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/pyenchant-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7-r1.ebuild
index eaca8621132d..2eda49a61a46 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7-r1.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	dev-python/jinja2[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
index f6d6a92c273e..7a441dc84cb5 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	dev-python/jinja2[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-2.0.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-2.0.0.ebuild
index 9fa59464a073..c596487a3c3b 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-2.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	dev-python/jinja2[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild
index c172b3be1fac..8f737254a6c4 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.44.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.44.ebuild
index 2abff28f2759..48596839b110 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.44.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.44.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.45.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.45.ebuild
index 8246d3bea095..3b16aad93895 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.45.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.45.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlparse/sqlparse-0.5.3.ebuild b/dev-python/sqlparse/sqlparse-0.5.3.ebuild
index 962326d9818a..233af52721cc 100644
--- a/dev-python/sqlparse/sqlparse-0.5.3.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.5.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
diff --git a/dev-python/sqlparse/sqlparse-0.5.4.ebuild b/dev-python/sqlparse/sqlparse-0.5.4.ebuild
index 50a59c1c44a0..eee1681890ba 100644
--- a/dev-python/sqlparse/sqlparse-0.5.4.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.5.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_sphinx docs/source
 EPYTEST_PLUGINS=()
diff --git a/dev-python/statsd/statsd-4.0.1.ebuild b/dev-python/statsd/statsd-4.0.1.ebuild
index 5db195e6fab3..920f867e83d6 100644
--- a/dev-python/statsd/statsd-4.0.1.ebuild
+++ b/dev-python/statsd/statsd-4.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/statsmodels/statsmodels-0.14.4.ebuild b/dev-python/statsmodels/statsmodels-0.14.4.ebuild
index b643638d78be..8c62e1ae3f7c 100644
--- a/dev-python/statsmodels/statsmodels-0.14.4.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.14.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv ~amd64-linux"
+KEYWORDS="amd64 arm64 ~riscv"
 IUSE="examples"
 
 # NB: upstream requires building with numpy-2 but supports 1.x
diff --git a/dev-python/statsmodels/statsmodels-0.14.5-r1.ebuild b/dev-python/statsmodels/statsmodels-0.14.5-r1.ebuild
index f8d2060bf69f..5afd262071c4 100644
--- a/dev-python/statsmodels/statsmodels-0.14.5-r1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.14.5-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="examples"
 
 # NB: upstream requires building with numpy-2 but supports 1.x
diff --git a/dev-python/statsmodels/statsmodels-0.14.5.ebuild b/dev-python/statsmodels/statsmodels-0.14.5.ebuild
index 8673181c0bb2..29fbebdfca73 100644
--- a/dev-python/statsmodels/statsmodels-0.14.5.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.14.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE="examples"
 
 # NB: upstream requires building with numpy-2 but supports 1.x
diff --git a/dev-python/statsmodels/statsmodels-0.14.6.ebuild b/dev-python/statsmodels/statsmodels-0.14.6.ebuild
index f8d2060bf69f..5afd262071c4 100644
--- a/dev-python/statsmodels/statsmodels-0.14.6.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.14.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="examples"
 
 # NB: upstream requires building with numpy-2 but supports 1.x
diff --git a/dev-python/stestr/stestr-4.2.0.ebuild b/dev-python/stestr/stestr-4.2.0.ebuild
index c6ca580dedef..597ed8a5c6ed 100644
--- a/dev-python/stestr/stestr-4.2.0.ebuild
+++ b/dev-python/stestr/stestr-4.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
index 9161b048dffd..cc3258445dee 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/suds-community/suds-community-1.2.0.ebuild b/dev-python/suds-community/suds-community-1.2.0.ebuild
index 8014954e6c50..b968d2938256 100644
--- a/dev-python/suds-community/suds-community-1.2.0.ebuild
+++ b/dev-python/suds-community/suds-community-1.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86"
 
 DOCS=( README.md notes/. )
 
diff --git a/dev-python/sympy/sympy-1.14.0-r1.ebuild b/dev-python/sympy/sympy-1.14.0-r1.ebuild
index 3c1b6e37fc69..f663110ad791 100644
--- a/dev-python/sympy/sympy-1.14.0-r1.ebuild
+++ b/dev-python/sympy/sympy-1.14.0-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~x64-macos"
 IUSE="imaging ipython latex mathml pdf png pyglet symengine"
 
 RDEPEND="
diff --git a/dev-python/sympy/sympy-1.14.0-r2.ebuild b/dev-python/sympy/sympy-1.14.0-r2.ebuild
index e3acd90157d4..6f9dcc8125e5 100644
--- a/dev-python/sympy/sympy-1.14.0-r2.ebuild
+++ b/dev-python/sympy/sympy-1.14.0-r2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="imaging ipython latex mathml pdf png pyglet symengine"
 
 RDEPEND="
diff --git a/dev-python/tables/tables-3.10.2-r1.ebuild b/dev-python/tables/tables-3.10.2-r1.ebuild
index 0672ecd61de9..a4fca6803698 100644
--- a/dev-python/tables/tables-3.10.2-r1.ebuild
+++ b/dev-python/tables/tables-3.10.2-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+cpudetection examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tables/tables-3.10.2.ebuild b/dev-python/tables/tables-3.10.2.ebuild
index 224c6ffd49cc..d6035f0e1e04 100644
--- a/dev-python/tables/tables-3.10.2.ebuild
+++ b/dev-python/tables/tables-3.10.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="+cpudetection examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tabulate/tabulate-0.9.0-r1.ebuild b/dev-python/tabulate/tabulate-0.9.0-r1.ebuild
index fb5f9ffb2228..2f0a81122944 100644
--- a/dev-python/tabulate/tabulate-0.9.0-r1.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/tblib/tblib-3.1.0.ebuild b/dev-python/tblib/tblib-3.1.0.ebuild
index f4e22b1d600c..90076f86b639 100644
--- a/dev-python/tblib/tblib-3.1.0.ebuild
+++ b/dev-python/tblib/tblib-3.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tblib/tblib-3.2.0.ebuild b/dev-python/tblib/tblib-3.2.0.ebuild
index f4e22b1d600c..90076f86b639 100644
--- a/dev-python/tblib/tblib-3.2.0.ebuild
+++ b/dev-python/tblib/tblib-3.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tblib/tblib-3.2.1.ebuild b/dev-python/tblib/tblib-3.2.1.ebuild
index feab6aeb56a3..b9839c96945f 100644
--- a/dev-python/tblib/tblib-3.2.1.ebuild
+++ b/dev-python/tblib/tblib-3.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tblib/tblib-3.2.2.ebuild b/dev-python/tblib/tblib-3.2.2.ebuild
index e5b78cc6199a..e9af49f769f3 100644
--- a/dev-python/tblib/tblib-3.2.2.ebuild
+++ b/dev-python/tblib/tblib-3.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/termcolor/termcolor-3.1.0.ebuild b/dev-python/termcolor/termcolor-3.1.0.ebuild
index a6f8720688f1..58d439e33e0a 100644
--- a/dev-python/termcolor/termcolor-3.1.0.ebuild
+++ b/dev-python/termcolor/termcolor-3.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="$(pypi_sdist_url) -> ${P}.py.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/termcolor/termcolor-3.2.0.ebuild b/dev-python/termcolor/termcolor-3.2.0.ebuild
index 60a6c36b32ee..ef0fd43e4e5e 100644
--- a/dev-python/termcolor/termcolor-3.2.0.ebuild
+++ b/dev-python/termcolor/termcolor-3.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="$(pypi_sdist_url) -> ${P}.py.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/terminado-0.18.1.ebuild b/dev-python/terminado/terminado-0.18.1.ebuild
index 1b40814a36ac..c0149864e0b1 100644
--- a/dev-python/terminado/terminado-0.18.1.ebuild
+++ b/dev-python/terminado/terminado-0.18.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/testfixtures-10.0.0.ebuild b/dev-python/testfixtures/testfixtures-10.0.0.ebuild
index f5e138902703..a11c5ccda165 100644
--- a/dev-python/testfixtures/testfixtures-10.0.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-10.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/testfixtures/testfixtures-9.1.0.ebuild b/dev-python/testfixtures/testfixtures-9.1.0.ebuild
index 4c9621ffa2db..42ffe7944f1a 100644
--- a/dev-python/testfixtures/testfixtures-9.1.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-9.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/testfixtures/testfixtures-9.2.0.ebuild b/dev-python/testfixtures/testfixtures-9.2.0.ebuild
index f5e138902703..a11c5ccda165 100644
--- a/dev-python/testfixtures/testfixtures-9.2.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-9.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/testresources/testresources-2.0.2.ebuild b/dev-python/testresources/testresources-2.0.2.ebuild
index 9506c2b3a708..a88395445cc2 100644
--- a/dev-python/testresources/testresources-2.0.2.ebuild
+++ b/dev-python/testresources/testresources-2.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
index 400df4f6e4e4..6c171ef7e808 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/testtools[${PYTHON_USEDEP}]
diff --git a/dev-python/testtools/testtools-2.7.2-r1.ebuild b/dev-python/testtools/testtools-2.7.2-r1.ebuild
index 93db7d0b9df6..2f7c192d17bf 100644
--- a/dev-python/testtools/testtools-2.7.2-r1.ebuild
+++ b/dev-python/testtools/testtools-2.7.2-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/testtools-2.8.0.ebuild b/dev-python/testtools/testtools-2.8.0.ebuild
index 3d4cd6f067f5..ad3ca8dd856b 100644
--- a/dev-python/testtools/testtools-2.8.0.ebuild
+++ b/dev-python/testtools/testtools-2.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/thrift/thrift-0.22.0.ebuild b/dev-python/thrift/thrift-0.22.0.ebuild
index c5044b85a61f..20cdbd043939 100644
--- a/dev-python/thrift/thrift-0.22.0.ebuild
+++ b/dev-python/thrift/thrift-0.22.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${P}/lib/py"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/tomli/tomli-2.2.1.ebuild b/dev-python/tomli/tomli-2.2.1.ebuild
index 5a27a93930d3..7abe55f4d61b 100644
--- a/dev-python/tomli/tomli-2.2.1.ebuild
+++ b/dev-python/tomli/tomli-2.2.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-python/tomli/tomli-2.3.0.ebuild b/dev-python/tomli/tomli-2.3.0.ebuild
index 5a27a93930d3..7abe55f4d61b 100644
--- a/dev-python/tomli/tomli-2.3.0.ebuild
+++ b/dev-python/tomli/tomli-2.3.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-python/toolz/toolz-1.0.0-r1.ebuild b/dev-python/toolz/toolz-1.0.0-r1.ebuild
index 3092c77ba536..93d150551f6d 100644
--- a/dev-python/toolz/toolz-1.0.0-r1.ebuild
+++ b/dev-python/toolz/toolz-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/toolz/toolz-1.0.0.ebuild b/dev-python/toolz/toolz-1.0.0.ebuild
index 0338e343e524..d5f574908874 100644
--- a/dev-python/toolz/toolz-1.0.0.ebuild
+++ b/dev-python/toolz/toolz-1.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/toolz/toolz-1.1.0.ebuild b/dev-python/toolz/toolz-1.1.0.ebuild
index 0159747634d8..2bb22f448955 100644
--- a/dev-python/toolz/toolz-1.1.0.ebuild
+++ b/dev-python/toolz/toolz-1.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/tornado/tornado-6.5.2.ebuild b/dev-python/tornado/tornado-6.5.2.ebuild
index 6bdeb9788b39..148d8366b71e 100644
--- a/dev-python/tornado/tornado-6.5.2.ebuild
+++ b/dev-python/tornado/tornado-6.5.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tornado/tornado-6.5.3.ebuild b/dev-python/tornado/tornado-6.5.3.ebuild
index 429b768a0c23..c16bdca7f91b 100644
--- a/dev-python/tornado/tornado-6.5.3.ebuild
+++ b/dev-python/tornado/tornado-6.5.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tornado/tornado-6.5.4.ebuild b/dev-python/tornado/tornado-6.5.4.ebuild
index f66239f03372..8565204821e1 100644
--- a/dev-python/tornado/tornado-6.5.4.ebuild
+++ b/dev-python/tornado/tornado-6.5.4.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.11.14.15.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.11.14.15.ebuild
index 5763a4277f9d..8aa6c9a0c3af 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2025.11.14.15.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2025.11.14.15.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.12.1.14.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.12.1.14.ebuild
index d30bc2b3e3b6..a8cd3ab1972d 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2025.12.1.14.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2025.12.1.14.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.9.11.17.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.9.11.17.ebuild
index 5763a4277f9d..8aa6c9a0c3af 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2025.9.11.17.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2025.9.11.17.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/trustme/trustme-1.2.1.ebuild b/dev-python/trustme/trustme-1.2.1.ebuild
index e1dbd37e34af..6e91fb837125 100644
--- a/dev-python/trustme/trustme-1.2.1.ebuild
+++ b/dev-python/trustme/trustme-1.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/txaio/txaio-25.12.2.ebuild b/dev-python/txaio/txaio-25.12.2.ebuild
index 9a5f62375378..c8a7e3c60368 100644
--- a/dev-python/txaio/txaio-25.12.2.ebuild
+++ b/dev-python/txaio/txaio-25.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/txaio/txaio-25.9.2.ebuild b/dev-python/txaio/txaio-25.9.2.ebuild
index 96e4a698d8b0..821be3a7f5ba 100644
--- a/dev-python/txaio/txaio-25.9.2.ebuild
+++ b/dev-python/txaio/txaio-25.9.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/typing-extensions/typing-extensions-4.14.1.ebuild b/dev-python/typing-extensions/typing-extensions-4.14.1.ebuild
index a89dbb355b4b..e8082ec69078 100644
--- a/dev-python/typing-extensions/typing-extensions-4.14.1.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.14.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/typing-extensions/typing-extensions-4.15.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.15.0.ebuild
index a89dbb355b4b..e8082ec69078 100644
--- a/dev-python/typing-extensions/typing-extensions-4.15.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.15.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.8.0.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.8.0.ebuild
index e0f15bc76556..b9a0f1f707fe 100644
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.8.0.ebuild
+++ b/dev-python/u-msgpack-python/u-msgpack-python-2.8.0.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ujson/ujson-5.10.0.ebuild b/dev-python/ujson/ujson-5.10.0.ebuild
index 5b12ceff8b4d..9ef43e678b33 100644
--- a/dev-python/ujson/ujson-5.10.0.ebuild
+++ b/dev-python/ujson/ujson-5.10.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-python/ujson/ujson-5.11.0.ebuild b/dev-python/ujson/ujson-5.11.0.ebuild
index 7e434356d3c7..10fc979d1c73 100644
--- a/dev-python/ujson/ujson-5.11.0.ebuild
+++ b/dev-python/ujson/ujson-5.11.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-python/uncertainties/uncertainties-3.2.3.ebuild b/dev-python/uncertainties/uncertainties-3.2.3.ebuild
index 8e7c6a0a9bca..27bac5c760c9 100644
--- a/dev-python/uncertainties/uncertainties-3.2.3.ebuild
+++ b/dev-python/uncertainties/uncertainties-3.2.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/uritemplate/uritemplate-4.2.0.ebuild b/dev-python/uritemplate/uritemplate-4.2.0.ebuild
index ed6d3f98800d..d14c36c0f57c 100644
--- a/dev-python/uritemplate/uritemplate-4.2.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-4.2.0.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/urwid/urwid-3.0.3.ebuild b/dev-python/urwid/urwid-3.0.3.ebuild
index 3481244c8f84..844b05b83b90 100644
--- a/dev-python/urwid/urwid-3.0.3.ebuild
+++ b/dev-python/urwid/urwid-3.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/urwid/urwid-3.0.4.ebuild b/dev-python/urwid/urwid-3.0.4.ebuild
index f959066e21e5..e4602af063bd 100644
--- a/dev-python/urwid/urwid-3.0.4.ebuild
+++ b/dev-python/urwid/urwid-3.0.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/verboselogs/verboselogs-1.7-r1.ebuild b/dev-python/verboselogs/verboselogs-1.7-r1.ebuild
index f405f43d2da2..9b63d8ff0a86 100644
--- a/dev-python/verboselogs/verboselogs-1.7-r1.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.7-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/versioneer/versioneer-0.29-r1.ebuild b/dev-python/versioneer/versioneer-0.29-r1.ebuild
index b67eafefc0f2..07eede719962 100644
--- a/dev-python/versioneer/versioneer-0.29-r1.ebuild
+++ b/dev-python/versioneer/versioneer-0.29-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/voluptuous/voluptuous-0.15.2.ebuild b/dev-python/voluptuous/voluptuous-0.15.2.ebuild
index 1fdd0d361568..58e22d7a6b96 100644
--- a/dev-python/voluptuous/voluptuous-0.15.2.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.15.2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/voluptuous/voluptuous-0.16.0.ebuild b/dev-python/voluptuous/voluptuous-0.16.0.ebuild
index 0c201c4807c7..6a317279fd04 100644
--- a/dev-python/voluptuous/voluptuous-0.16.0.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.16.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/warlock/warlock-2.1.0.ebuild b/dev-python/warlock/warlock-2.1.0.ebuild
index cc5567f61fdf..6fa1bc527681 100644
--- a/dev-python/warlock/warlock-2.1.0.ebuild
+++ b/dev-python/warlock/warlock-2.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	=dev-python/jsonpatch-1*[${PYTHON_USEDEP}]
diff --git a/dev-python/wcwidth/wcwidth-0.2.13.ebuild b/dev-python/wcwidth/wcwidth-0.2.13.ebuild
index f53931886d6a..9eddfc82fd61 100644
--- a/dev-python/wcwidth/wcwidth-0.2.13.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.13.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/wcwidth/wcwidth-0.2.14.ebuild b/dev-python/wcwidth/wcwidth-0.2.14.ebuild
index 4c3bbc7355b8..1ce26eb6b55a 100644
--- a/dev-python/wcwidth/wcwidth-0.2.14.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.14.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/webcolors/webcolors-24.11.1.ebuild b/dev-python/webcolors/webcolors-24.11.1.ebuild
index 5fea93694fb8..e0674925eb43 100644
--- a/dev-python/webcolors/webcolors-24.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-24.11.1.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/webcolors/webcolors-25.10.0.ebuild b/dev-python/webcolors/webcolors-25.10.0.ebuild
index 0034de98af5e..c2922759da52 100644
--- a/dev-python/webcolors/webcolors-25.10.0.ebuild
+++ b/dev-python/webcolors/webcolors-25.10.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/webencodings/webencodings-0.5.1-r2.ebuild b/dev-python/webencodings/webencodings-0.5.1-r2.ebuild
index c0a2b9f5c13d..bfa55a519cb2 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r2.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/webob/webob-1.8.9.ebuild b/dev-python/webob/webob-1.8.9.ebuild
index ba6351c96742..c068c5cf18b2 100644
--- a/dev-python/webob/webob-1.8.9.ebuild
+++ b/dev-python/webob/webob-1.8.9.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.14-r1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.14-r1.ebuild
index e7fda957e9ec..45797e29bb08 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.14-r1.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.14-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.14.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.14.ebuild
index 4923be41f8fd..ad177ffaeb36 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.14.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.14.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.15.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.15.ebuild
index 4500c6a8d8cc..7a6c4e2449f2 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.15.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.15.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/wrapt/wrapt-1.17.3.ebuild b/dev-python/wrapt/wrapt-1.17.3.ebuild
index 337122e1c0aa..0f83bec0ac29 100644
--- a/dev-python/wrapt/wrapt-1.17.3.ebuild
+++ b/dev-python/wrapt/wrapt-1.17.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 EPYTEST_PLUGINS=()
diff --git a/dev-python/wrapt/wrapt-2.0.0.ebuild b/dev-python/wrapt/wrapt-2.0.0.ebuild
index 1daf6623e580..e7a910daa69b 100644
--- a/dev-python/wrapt/wrapt-2.0.0.ebuild
+++ b/dev-python/wrapt/wrapt-2.0.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 EPYTEST_PLUGINS=()
diff --git a/dev-python/wrapt/wrapt-2.0.1.ebuild b/dev-python/wrapt/wrapt-2.0.1.ebuild
index 1daf6623e580..e7a910daa69b 100644
--- a/dev-python/wrapt/wrapt-2.0.1.ebuild
+++ b/dev-python/wrapt/wrapt-2.0.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 EPYTEST_PLUGINS=()
diff --git a/dev-python/wsaccel/wsaccel-0.6.7.ebuild b/dev-python/wsaccel/wsaccel-0.6.7.ebuild
index 718e715df3cd..a2d92297af0e 100644
--- a/dev-python/wsaccel/wsaccel-0.6.7.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/xlrd/xlrd-2.0.2.ebuild b/dev-python/xlrd/xlrd-2.0.2.ebuild
index 39b1690cb00f..1874921d83ec 100644
--- a/dev-python/xlrd/xlrd-2.0.2.ebuild
+++ b/dev-python/xlrd/xlrd-2.0.2.ebuild
@@ -21,6 +21,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.2.3.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.2.3.ebuild
index 9ea9250fef39..c8ea2f110cc3 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.2.3.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.2.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.2.5.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.2.5.ebuild
index 606d8148ccd1..14bbeb89fd3c 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.2.5.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.2.5.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.2.6.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.2.6.ebuild
index 606d8148ccd1..14bbeb89fd3c 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.2.6.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.2.6.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.2.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.2.7.ebuild
index 606d8148ccd1..14bbeb89fd3c 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.2.7.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.2.7.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.2.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.2.8.ebuild
index 606d8148ccd1..14bbeb89fd3c 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.2.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.2.8.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.2.9.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.2.9.ebuild
index f4ab5c9c7dcd..fb3d1b1873ba 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.2.9.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.2.9.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
index 4a298c8124a0..f3025f30798f 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/zeroconf/zeroconf-0.147.0.ebuild b/dev-python/zeroconf/zeroconf-0.147.0.ebuild
index 9352572d55c1..9f0a3d3974c8 100644
--- a/dev-python/zeroconf/zeroconf-0.147.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.147.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/zeroconf/zeroconf-0.147.2.ebuild b/dev-python/zeroconf/zeroconf-0.147.2.ebuild
index 7c91aa1d8911..58bd7232d9de 100644
--- a/dev-python/zeroconf/zeroconf-0.147.2.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.147.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/zeroconf/zeroconf-0.148.0.ebuild b/dev-python/zeroconf/zeroconf-0.148.0.ebuild
index 7c91aa1d8911..58bd7232d9de 100644
--- a/dev-python/zeroconf/zeroconf-0.148.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.148.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/zipp/zipp-3.23.0.ebuild b/dev-python/zipp/zipp-3.23.0.ebuild
index 78c8eca74cbb..70ac03d20018 100644
--- a/dev-python/zipp/zipp-3.23.0.ebuild
+++ b/dev-python/zipp/zipp-3.23.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # big_o is only used in test_complexity, that we ignore
 BDEPEND="
diff --git a/dev-python/zope-event/zope-event-6.0.ebuild b/dev-python/zope-event/zope-event-6.0.ebuild
index 2d984f729b2b..14661370c48a 100644
--- a/dev-python/zope-event/zope-event-6.0.ebuild
+++ b/dev-python/zope-event/zope-event-6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/zope-event/zope-event-6.1.ebuild b/dev-python/zope-event/zope-event-6.1.ebuild
index 2d984f729b2b..14661370c48a 100644
--- a/dev-python/zope-event/zope-event-6.1.ebuild
+++ b/dev-python/zope-event/zope-event-6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/zope-interface/zope-interface-8.0.1.ebuild b/dev-python/zope-interface/zope-interface-8.0.1.ebuild
index 1207e2f3ce26..a43a5f5fb3ae 100644
--- a/dev-python/zope-interface/zope-interface-8.0.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-8.0.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zope-interface/zope-interface-8.1.1.ebuild b/dev-python/zope-interface/zope-interface-8.1.1.ebuild
index 3c42615d1e40..ff3ba6207b89 100644
--- a/dev-python/zope-interface/zope-interface-8.1.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-8.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zope-interface/zope-interface-8.1.ebuild b/dev-python/zope-interface/zope-interface-8.1.ebuild
index 1207e2f3ce26..a43a5f5fb3ae 100644
--- a/dev-python/zope-interface/zope-interface-8.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-8.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zope-testing/zope-testing-6.0.ebuild b/dev-python/zope-testing/zope-testing-6.0.ebuild
index 46e22d7a2511..b30a1e42f816 100644
--- a/dev-python/zope-testing/zope-testing-6.0.ebuild
+++ b/dev-python/zope-testing/zope-testing-6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/zope-testing/zope-testing-6.1.ebuild b/dev-python/zope-testing/zope-testing-6.1.ebuild
index b0573fcc06fb..c15801265896 100644
--- a/dev-python/zope-testing/zope-testing-6.1.ebuild
+++ b/dev-python/zope-testing/zope-testing-6.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/zstandard/zstandard-0.23.0-r3.ebuild b/dev-python/zstandard/zstandard-0.23.0-r3.ebuild
index d59964c0f069..5299091326bc 100644
--- a/dev-python/zstandard/zstandard-0.23.0-r3.ebuild
+++ b/dev-python/zstandard/zstandard-0.23.0-r3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="
 	>=app-arch/zstd-1.5.7:=
diff --git a/dev-python/zstandard/zstandard-0.24.0.ebuild b/dev-python/zstandard/zstandard-0.24.0.ebuild
index e6f03d948bf3..147c8af18976 100644
--- a/dev-python/zstandard/zstandard-0.24.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.24.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="
 	>=app-arch/zstd-1.5.7:=
diff --git a/dev-python/zstandard/zstandard-0.25.0.ebuild b/dev-python/zstandard/zstandard-0.25.0.ebuild
index cfdb999fd48f..b5591e05c911 100644
--- a/dev-python/zstandard/zstandard-0.25.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.25.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="
 	>=app-arch/zstd-1.5.7:=
diff --git a/dev-ruby/abbrev/abbrev-0.1.2.ebuild b/dev-ruby/abbrev/abbrev-0.1.2.ebuild
index 567f7c1cd394..48657c19f4d8 100644
--- a/dev-ruby/abbrev/abbrev-0.1.2.ebuild
+++ b/dev-ruby/abbrev/abbrev-0.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/abbrev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/abstract/abstract-1.0.0-r5.ebuild b/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
index 607ca6163270..51f1700a372b 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rubygems.org/gems/abstract"
 
 LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 each_ruby_test() {
diff --git a/dev-ruby/addressable/addressable-2.8.7.ebuild b/dev-ruby/addressable/addressable-2.8.7.ebuild
index ef781660399a..0b49e9e79d48 100644
--- a/dev-ruby/addressable/addressable-2.8.7.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.7.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/public_suffix:6"
diff --git a/dev-ruby/addressable/addressable-2.8.8.ebuild b/dev-ruby/addressable/addressable-2.8.8.ebuild
index ff9305302c9d..dbd5078b1817 100644
--- a/dev-ruby/addressable/addressable-2.8.8.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.8.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "|| ( dev-ruby/public_suffix:7 dev-ruby/public_suffix:6 )"
diff --git a/dev-ruby/bacon/bacon-1.2.0-r4.ebuild b/dev-ruby/bacon/bacon-1.2.0-r4.ebuild
index 715ae5c89541..fc61de71c151 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r4.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r4.ebuild
@@ -14,6 +14,6 @@ HOMEPAGE="https://leahneukirchen.org/repos/bacon/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/base64/base64-0.2.0.ebuild b/dev-ruby/base64/base64-0.2.0.ebuild
index 2d9e9455948b..ed8612b7c3e9 100644
--- a/dev-ruby/base64/base64-0.2.0.ebuild
+++ b/dev-ruby/base64/base64-0.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/base64/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__FILE__/"base64.gemspec"/' \
diff --git a/dev-ruby/base64/base64-0.3.0.ebuild b/dev-ruby/base64/base64-0.3.0.ebuild
index 24cefb6c6d21..cb860c1ebb9e 100644
--- a/dev-ruby/base64/base64-0.3.0.ebuild
+++ b/dev-ruby/base64/base64-0.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/base64/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__FILE__/"base64.gemspec"/' \
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild
index e20799cc7cc8..82a9654d947f 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/bcrypt-ruby/bcrypt-ruby/archive/refs/tags/v${PV}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	rm Gemfile || die
diff --git a/dev-ruby/benchmark/benchmark-0.4.0.ebuild b/dev-ruby/benchmark/benchmark-0.4.0.ebuild
index b8c0cd25517d..0c942b62a700 100644
--- a/dev-ruby/benchmark/benchmark-0.4.0.ebuild
+++ b/dev-ruby/benchmark/benchmark-0.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/benchmark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby BSD-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's:_relative ": "./:' \
diff --git a/dev-ruby/benchmark/benchmark-0.4.1.ebuild b/dev-ruby/benchmark/benchmark-0.4.1.ebuild
index 501a87ee2714..eeff9f661757 100644
--- a/dev-ruby/benchmark/benchmark-0.4.1.ebuild
+++ b/dev-ruby/benchmark/benchmark-0.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/benchmark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby BSD-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's:_relative ": "./:' \
diff --git a/dev-ruby/benchmark/benchmark-0.5.0.ebuild b/dev-ruby/benchmark/benchmark-0.5.0.ebuild
index d2911cd61f29..7454441f5471 100644
--- a/dev-ruby/benchmark/benchmark-0.5.0.ebuild
+++ b/dev-ruby/benchmark/benchmark-0.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/benchmark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby BSD-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's:_relative ": "./:' \
diff --git a/dev-ruby/bigdecimal/bigdecimal-3.2.3.ebuild b/dev-ruby/bigdecimal/bigdecimal-3.2.3.ebuild
index ca8d5f2f2033..87a138b6d0c5 100644
--- a/dev-ruby/bigdecimal/bigdecimal-3.2.3.ebuild
+++ b/dev-ruby/bigdecimal/bigdecimal-3.2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/bigdecimal/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/bigdecimal/bigdecimal-3.3.1.ebuild b/dev-ruby/bigdecimal/bigdecimal-3.3.1.ebuild
index 77c5769e4ee6..5d6b2757c159 100644
--- a/dev-ruby/bigdecimal/bigdecimal-3.3.1.ebuild
+++ b/dev-ruby/bigdecimal/bigdecimal-3.3.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/bigdecimal/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/bigdecimal/bigdecimal-4.0.0.ebuild b/dev-ruby/bigdecimal/bigdecimal-4.0.0.ebuild
index 989b71cf6a67..0fb073ca8e07 100644
--- a/dev-ruby/bigdecimal/bigdecimal-4.0.0.ebuild
+++ b/dev-ruby/bigdecimal/bigdecimal-4.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/bigdecimal/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/bigdecimal/bigdecimal-4.0.1.ebuild b/dev-ruby/bigdecimal/bigdecimal-4.0.1.ebuild
index 989b71cf6a67..0fb073ca8e07 100644
--- a/dev-ruby/bigdecimal/bigdecimal-4.0.1.ebuild
+++ b/dev-ruby/bigdecimal/bigdecimal-4.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/bigdecimal/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r4.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r4.ebuild
index 683786346fdc..0db16b475a8d 100644
--- a/dev-ruby/bsearch/bsearch-1.5.0-r4.ebuild
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://0xcc.net/ruby-bsearch/"
 
 LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
 
 all_ruby_prepare() {
 	sed -i 's/ruby/\$\{RUBY\}/' test/test.sh || die
diff --git a/dev-ruby/builder/builder-3.2.4-r1.ebuild b/dev-ruby/builder/builder-3.2.4-r1.ebuild
index b1df0b3b02ed..d9ac1ec28c18 100644
--- a/dev-ruby/builder/builder-3.2.4-r1.ebuild
+++ b/dev-ruby/builder/builder-3.2.4-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/builder/builder-3.3.0.ebuild b/dev-ruby/builder/builder-3.3.0.ebuild
index 2d5b40118ff7..f3100b0eaa15 100644
--- a/dev-ruby/builder/builder-3.3.0.ebuild
+++ b/dev-ruby/builder/builder-3.3.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -i \
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.9.2.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.9.2.ebuild
index 330b0005b76b..911544a368eb 100644
--- a/dev-ruby/bundler-audit/bundler-audit-0.9.2.ebuild
+++ b/dev-ruby/bundler-audit/bundler-audit-0.9.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rubysec/bundler-audit"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 #tests are trying to download files
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.9.3.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.9.3.ebuild
index b7c5bbff9377..84124e6e3766 100644
--- a/dev-ruby/bundler-audit/bundler-audit-0.9.3.ebuild
+++ b/dev-ruby/bundler-audit/bundler-audit-0.9.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rubysec/bundler-audit"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 #tests are trying to download files
diff --git a/dev-ruby/bundler/bundler-2.4.22.ebuild b/dev-ruby/bundler/bundler-2.4.22.ebuild
index 295101a31a64..31272ae12bdd 100644
--- a/dev-ruby/bundler/bundler-2.4.22.ebuild
+++ b/dev-ruby/bundler/bundler-2.4.22.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.5.23.ebuild b/dev-ruby/bundler/bundler-2.5.23.ebuild
index 1d546b91afeb..6ec8626d1389 100644
--- a/dev-ruby/bundler/bundler-2.5.23.ebuild
+++ b/dev-ruby/bundler/bundler-2.5.23.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.6.7.ebuild b/dev-ruby/bundler/bundler-2.6.7.ebuild
index 84b4f66275ab..4336df393712 100644
--- a/dev-ruby/bundler/bundler-2.6.7.ebuild
+++ b/dev-ruby/bundler/bundler-2.6.7.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.6.8.ebuild b/dev-ruby/bundler/bundler-2.6.8.ebuild
index 84b4f66275ab..4336df393712 100644
--- a/dev-ruby/bundler/bundler-2.6.8.ebuild
+++ b/dev-ruby/bundler/bundler-2.6.8.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.6.9.ebuild b/dev-ruby/bundler/bundler-2.6.9.ebuild
index 0d3723b8e642..ff4e04eb2e26 100644
--- a/dev-ruby/bundler/bundler-2.6.9.ebuild
+++ b/dev-ruby/bundler/bundler-2.6.9.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.7.0.ebuild b/dev-ruby/bundler/bundler-2.7.0.ebuild
index 94dba902eeda..0dc72a98e7fd 100644
--- a/dev-ruby/bundler/bundler-2.7.0.ebuild
+++ b/dev-ruby/bundler/bundler-2.7.0.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.7.1.ebuild b/dev-ruby/bundler/bundler-2.7.1.ebuild
index 94dba902eeda..0dc72a98e7fd 100644
--- a/dev-ruby/bundler/bundler-2.7.1.ebuild
+++ b/dev-ruby/bundler/bundler-2.7.1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.7.2.ebuild b/dev-ruby/bundler/bundler-2.7.2.ebuild
index 94dba902eeda..0dc72a98e7fd 100644
--- a/dev-ruby/bundler/bundler-2.7.2.ebuild
+++ b/dev-ruby/bundler/bundler-2.7.2.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/capistrano/capistrano-2.15.11.ebuild b/dev-ruby/capistrano/capistrano-2.15.11.ebuild
index 840e6da4e9a6..bf3834ab1acc 100644
--- a/dev-ruby/capistrano/capistrano-2.15.11.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.11.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/cgi/cgi-0.4.2.ebuild b/dev-ruby/cgi/cgi-0.4.2.ebuild
index 0c4f74bb47f3..6648a73b8c26 100644
--- a/dev-ruby/cgi/cgi-0.4.2.ebuild
+++ b/dev-ruby/cgi/cgi-0.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/cgi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/cgi/cgi-0.5.0.ebuild b/dev-ruby/cgi/cgi-0.5.0.ebuild
index 1a328d253425..e1f00ace9ff4 100644
--- a/dev-ruby/cgi/cgi-0.5.0.ebuild
+++ b/dev-ruby/cgi/cgi-0.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/cgi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/cgi/cgi-0.5.1.ebuild b/dev-ruby/cgi/cgi-0.5.1.ebuild
index 1a328d253425..e1f00ace9ff4 100644
--- a/dev-ruby/cgi/cgi-0.5.1.ebuild
+++ b/dev-ruby/cgi/cgi-0.5.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/cgi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/coderay/coderay-1.1.3-r2.ebuild b/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
index c56e67cebecc..29ed3894f231 100644
--- a/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 PATCHES=("${FILESDIR}/${P}-ruby30.patch")
diff --git a/dev-ruby/coffee-rails/coffee-rails-5.0.0-r3.ebuild b/dev-ruby/coffee-rails/coffee-rails-5.0.0-r3.ebuild
index 49eaa6ad1370..4a9992af603e 100644
--- a/dev-ruby/coffee-rails/coffee-rails-5.0.0-r3.ebuild
+++ b/dev-ruby/coffee-rails/coffee-rails-5.0.0-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/coffee-script-2.2.0
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r2.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r2.ebuild
index dd27b082905a..847549e11e61 100644
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r2.ebuild
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r2.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://coffeescript.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
diff --git a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
index 04f1125b91ef..d23e954d497e 100644
--- a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
+++ b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="https://github.com/rails/ruby-coffee-script https://github.com/rails/c
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 ruby_add_rdepend "dev-ruby/coffee-script-source dev-ruby/execjs:*"
diff --git a/dev-ruby/columnize/columnize-0.9.0-r2.ebuild b/dev-ruby/columnize/columnize-0.9.0-r2.ebuild
index c4e321218ab8..f74862714272 100644
--- a/dev-ruby/columnize/columnize-0.9.0-r2.ebuild
+++ b/dev-ruby/columnize/columnize-0.9.0-r2.ebuild
@@ -13,4 +13,4 @@ HOMEPAGE="https://github.com/rocky/columnize"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.5.ebuild
index 9c754477cd60..494c5d5611ce 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.5.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.6.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.6.ebuild
index fefb83327e0c..4d5c93e3b2a4 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.6.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
diff --git a/dev-ruby/crack/crack-0.4.6.ebuild b/dev-ruby/crack/crack-0.4.6.ebuild
index 088ebc06caa4..1edb488f3a74 100644
--- a/dev-ruby/crack/crack-0.4.6.ebuild
+++ b/dev-ruby/crack/crack-0.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/rexml"
diff --git a/dev-ruby/crack/crack-1.0.0.ebuild b/dev-ruby/crack/crack-1.0.0.ebuild
index 6b6836c0f710..9def7112d44d 100644
--- a/dev-ruby/crack/crack-1.0.0.ebuild
+++ b/dev-ruby/crack/crack-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/rexml"
diff --git a/dev-ruby/crack/crack-1.0.1.ebuild b/dev-ruby/crack/crack-1.0.1.ebuild
index f124bf9cc888..3771590205a0 100644
--- a/dev-ruby/crack/crack-1.0.1.ebuild
+++ b/dev-ruby/crack/crack-1.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/rexml"
diff --git a/dev-ruby/csv/csv-3.3.2.ebuild b/dev-ruby/csv/csv-3.3.2.ebuild
index ee3edde95ec5..2c27ac3c9006 100644
--- a/dev-ruby/csv/csv-3.3.2.ebuild
+++ b/dev-ruby/csv/csv-3.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
 
diff --git a/dev-ruby/csv/csv-3.3.3.ebuild b/dev-ruby/csv/csv-3.3.3.ebuild
index 3f087efcd2d6..7c2df5e6af29 100644
--- a/dev-ruby/csv/csv-3.3.3.ebuild
+++ b/dev-ruby/csv/csv-3.3.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
 
diff --git a/dev-ruby/csv/csv-3.3.4.ebuild b/dev-ruby/csv/csv-3.3.4.ebuild
index 3f087efcd2d6..7c2df5e6af29 100644
--- a/dev-ruby/csv/csv-3.3.4.ebuild
+++ b/dev-ruby/csv/csv-3.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
 
diff --git a/dev-ruby/csv/csv-3.3.5.ebuild b/dev-ruby/csv/csv-3.3.5.ebuild
index b097ba234916..249b32c4a3e1 100644
--- a/dev-ruby/csv/csv-3.3.5.ebuild
+++ b/dev-ruby/csv/csv-3.3.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
 
diff --git a/dev-ruby/daemons/daemons-1.4.1.ebuild b/dev-ruby/daemons/daemons-1.4.1.ebuild
index 82770d62e8f6..5c67341b71ba 100644
--- a/dev-ruby/daemons/daemons-1.4.1.ebuild
+++ b/dev-ruby/daemons/daemons-1.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/date/date-3.4.1.ebuild b/dev-ruby/date/date-3.4.1.ebuild
index 6b695fe98a27..b91153bad262 100644
--- a/dev-ruby/date/date-3.4.1.ebuild
+++ b/dev-ruby/date/date-3.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/date/date-3.5.0.ebuild b/dev-ruby/date/date-3.5.0.ebuild
index f227cbbf02b7..b063b4825f67 100644
--- a/dev-ruby/date/date-3.5.0.ebuild
+++ b/dev-ruby/date/date-3.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/date/date-3.5.1.ebuild b/dev-ruby/date/date-3.5.1.ebuild
index f227cbbf02b7..b063b4825f67 100644
--- a/dev-ruby/date/date-3.5.1.ebuild
+++ b/dev-ruby/date/date-3.5.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/debug/debug-1.10.0.ebuild b/dev-ruby/debug/debug-1.10.0.ebuild
index 949432ce8c3e..1265bbf54bbc 100644
--- a/dev-ruby/debug/debug-1.10.0.ebuild
+++ b/dev-ruby/debug/debug-1.10.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Avoid tests for now since the results in a very deep dependency list for ruby32
 #ruby_add_depend "test? ( dev-ruby/rr )"
diff --git a/dev-ruby/debug/debug-1.11.0.ebuild b/dev-ruby/debug/debug-1.11.0.ebuild
index 482f6116bdb3..3d5ae843792c 100644
--- a/dev-ruby/debug/debug-1.11.0.ebuild
+++ b/dev-ruby/debug/debug-1.11.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Avoid tests for now since the results in a very deep dependency list for ruby32
 #ruby_add_depend "test? ( dev-ruby/rr )"
diff --git a/dev-ruby/debug/debug-1.11.1.ebuild b/dev-ruby/debug/debug-1.11.1.ebuild
index 64777d683a59..a764e8b11212 100644
--- a/dev-ruby/debug/debug-1.11.1.ebuild
+++ b/dev-ruby/debug/debug-1.11.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Avoid tests for now since the results in a very deep dependency list for ruby32
 #ruby_add_depend "test? ( dev-ruby/rr )"
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
index 782db2c585a7..37cfa13e32cd 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-ruby33.patch" )
diff --git a/dev-ruby/did_you_mean/did_you_mean-2.0.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-2.0.0.ebuild
index 56f6c6390cc5..18362edef574 100644
--- a/dev-ruby/did_you_mean/did_you_mean-2.0.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-2.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ruby/did_you_mean"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.6.1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.6.1.ebuild
index 4bfb9f398771..347b1a1c0a6a 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.6.1.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.6.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( Artistic MIT GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 each_ruby_prepare() {
 	# Use the current ruby to test script invocation
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.6.2.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.6.2.ebuild
index 645cee5dde1d..2d0d02b40061 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.6.2.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.6.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( Artistic MIT GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 each_ruby_prepare() {
 	# Use the current ruby to test script invocation
diff --git a/dev-ruby/digest/digest-3.2.0.ebuild b/dev-ruby/digest/digest-3.2.0.ebuild
index 16e4e9927569..788c7c2e8666 100644
--- a/dev-ruby/digest/digest-3.2.0.ebuild
+++ b/dev-ruby/digest/digest-3.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/digest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_depend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/digest/digest-3.2.1.ebuild b/dev-ruby/digest/digest-3.2.1.ebuild
index 8f6fa6246e0c..38a746dff4b2 100644
--- a/dev-ruby/digest/digest-3.2.1.ebuild
+++ b/dev-ruby/digest/digest-3.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/digest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_depend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/domain_name/domain_name-0.6.20240107.ebuild b/dev-ruby/domain_name/domain_name-0.6.20240107.ebuild
index bc4bf5b940a2..739a89f93dc8 100644
--- a/dev-ruby/domain_name/domain_name-0.6.20240107.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.6.20240107.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-domain_name"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/drb/drb-2.2.1.ebuild b/dev-ruby/drb/drb-2.2.1.ebuild
index 02d08b3f3b0b..cfa6120ebe7b 100644
--- a/dev-ruby/drb/drb-2.2.1.ebuild
+++ b/dev-ruby/drb/drb-2.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/drb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/ruby2_keywords"
diff --git a/dev-ruby/drb/drb-2.2.3.ebuild b/dev-ruby/drb/drb-2.2.3.ebuild
index 44de8e72a01d..499b0f472e86 100644
--- a/dev-ruby/drb/drb-2.2.3.ebuild
+++ b/dev-ruby/drb/drb-2.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/drb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/ruby2_keywords"
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.3-r1.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.3-r1.ebuild
index adb61d19e790..f8f77ccf97a5 100644
--- a/dev-ruby/em-websocket/em-websocket-0.5.3-r1.ebuild
+++ b/dev-ruby/em-websocket/em-websocket-0.5.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/erb/erb-5.1.3.ebuild b/dev-ruby/erb/erb-5.1.3.ebuild
index 77d1f5ca2835..ba53b794c006 100644
--- a/dev-ruby/erb/erb-5.1.3.ebuild
+++ b/dev-ruby/erb/erb-5.1.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/ruby/erb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e "s:_relative ': './:" \
diff --git a/dev-ruby/erb/erb-6.0.0.ebuild b/dev-ruby/erb/erb-6.0.0.ebuild
index 6e4bb5882295..df7e56f8b2aa 100644
--- a/dev-ruby/erb/erb-6.0.0.ebuild
+++ b/dev-ruby/erb/erb-6.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/ruby/erb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e "s:_relative ': './:" \
diff --git a/dev-ruby/erb/erb-6.0.1.ebuild b/dev-ruby/erb/erb-6.0.1.ebuild
index 6e4bb5882295..df7e56f8b2aa 100644
--- a/dev-ruby/erb/erb-6.0.1.ebuild
+++ b/dev-ruby/erb/erb-6.0.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/ruby/erb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e "s:_relative ': './:" \
diff --git a/dev-ruby/erubis/erubis-2.7.0-r4.ebuild b/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
index 8537fbc0eec0..333d0a572da1 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.kuwata-lab.com/erubis/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
index 00875d2a0a55..756a8de65e8d 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
@@ -23,7 +23,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-openssl-
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/execjs/execjs-2.10.0.ebuild b/dev-ruby/execjs/execjs-2.10.0.ebuild
index fd9702e4059b..b13d18417253 100644
--- a/dev-ruby/execjs/execjs-2.10.0.ebuild
+++ b/dev-ruby/execjs/execjs-2.10.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 IUSE="test"
 
diff --git a/dev-ruby/fakefs/fakefs-2.5.0.ebuild b/dev-ruby/fakefs/fakefs-2.5.0.ebuild
index 498d592b7358..dc2dc8c28e3f 100644
--- a/dev-ruby/fakefs/fakefs-2.5.0.ebuild
+++ b/dev-ruby/fakefs/fakefs-2.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/fakefs/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-2.7.1.ebuild b/dev-ruby/fakefs/fakefs-2.7.1.ebuild
index 6de439a6bb03..6099f00e9dcb 100644
--- a/dev-ruby/fakefs/fakefs-2.7.1.ebuild
+++ b/dev-ruby/fakefs/fakefs-2.7.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/fakefs/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-3.0.3.ebuild b/dev-ruby/fakefs/fakefs-3.0.3.ebuild
index 3e3f8c71c581..947a7203666c 100644
--- a/dev-ruby/fakefs/fakefs-3.0.3.ebuild
+++ b/dev-ruby/fakefs/fakefs-3.0.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/fakefs/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-3.0.4.ebuild b/dev-ruby/fakefs/fakefs-3.0.4.ebuild
index 3e3f8c71c581..947a7203666c 100644
--- a/dev-ruby/fakefs/fakefs-3.0.4.ebuild
+++ b/dev-ruby/fakefs/fakefs-3.0.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/fakefs/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.2.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.2.ebuild
index db6f69153b83..0ec18196d705 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.2.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng"
 LICENSE="MIT Ruby-BSD"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
 
 DEPEND+=" dev-libs/fcgi"
 RDEPEND+=" dev-libs/fcgi"
diff --git a/dev-ruby/ffi/ffi-1.17.0.ebuild b/dev-ruby/ffi/ffi-1.17.0.ebuild
index f54258b0f502..e1a53873c870 100644
--- a/dev-ruby/ffi/ffi-1.17.0.ebuild
+++ b/dev-ruby/ffi/ffi-1.17.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Needs recent libffi for HPPA fixes (and probably Apple arm64 too)
 RDEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
diff --git a/dev-ruby/ffi/ffi-1.17.1.ebuild b/dev-ruby/ffi/ffi-1.17.1.ebuild
index d46fba3e50b9..c9436b8a1472 100644
--- a/dev-ruby/ffi/ffi-1.17.1.ebuild
+++ b/dev-ruby/ffi/ffi-1.17.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 # Needs recent libffi for HPPA fixes (and probably Apple arm64 too)
 RDEPEND=">=dev-libs/libffi-3.4.4-r1:="
diff --git a/dev-ruby/ffi/ffi-1.17.2.ebuild b/dev-ruby/ffi/ffi-1.17.2.ebuild
index ec2ae5fdb7ac..ba20a0d7caa3 100644
--- a/dev-ruby/ffi/ffi-1.17.2.ebuild
+++ b/dev-ruby/ffi/ffi-1.17.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Needs recent libffi for HPPA fixes (and probably Apple arm64 too)
 RDEPEND=">=dev-libs/libffi-3.4.8:="
diff --git a/dev-ruby/fileutils/fileutils-1.7.3.ebuild b/dev-ruby/fileutils/fileutils-1.7.3.ebuild
index 2b8436dc96fd..9831991576de 100644
--- a/dev-ruby/fileutils/fileutils-1.7.3.ebuild
+++ b/dev-ruby/fileutils/fileutils-1.7.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/fileutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/fileutils/fileutils-1.8.0.ebuild b/dev-ruby/fileutils/fileutils-1.8.0.ebuild
index 0afc55c2d1a4..8d787a5e3d5b 100644
--- a/dev-ruby/fileutils/fileutils-1.8.0.ebuild
+++ b/dev-ruby/fileutils/fileutils-1.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/fileutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/flexmock/flexmock-2.4.2.ebuild b/dev-ruby/flexmock/flexmock-2.4.2.ebuild
index 83cff2970e22..51cabfc05fd2 100644
--- a/dev-ruby/flexmock/flexmock-2.4.2.ebuild
+++ b/dev-ruby/flexmock/flexmock-2.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="flexmock"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}"/flexmock-2.3.6-ruby30-{1,2,3}.patch )
diff --git a/dev-ruby/flexmock/flexmock-3.0.2.ebuild b/dev-ruby/flexmock/flexmock-3.0.2.ebuild
index b1a4ff1f16ca..dcbe1ba1126d 100644
--- a/dev-ruby/flexmock/flexmock-3.0.2.ebuild
+++ b/dev-ruby/flexmock/flexmock-3.0.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="flexmock"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/forwardable/forwardable-1.3.3.ebuild b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
index ff60a4edbdf5..5bfe35644934 100644
--- a/dev-ruby/forwardable/forwardable-1.3.3.ebuild
+++ b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/forwardable/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/forwardable/forwardable-1.4.0.ebuild b/dev-ruby/forwardable/forwardable-1.4.0.ebuild
index 2dcec402620d..d456d61a5347 100644
--- a/dev-ruby/forwardable/forwardable-1.4.0.ebuild
+++ b/dev-ruby/forwardable/forwardable-1.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/forwardable/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/fuubar/fuubar-2.5.1-r1.ebuild b/dev-ruby/fuubar/fuubar-2.5.1-r1.ebuild
index bdc487129c9a..69a9928ddcc0 100644
--- a/dev-ruby/fuubar/fuubar-2.5.1-r1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.5.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
 RUBY_S="${PN}-releases-v${PV}"
 
 ruby_add_rdepend "dev-ruby/rspec:3 >=dev-ruby/ruby-progressbar-1.4:0"
diff --git a/dev-ruby/getoptlong/getoptlong-0.2.1.ebuild b/dev-ruby/getoptlong/getoptlong-0.2.1.ebuild
index 6d84b3db2167..42ff780d3eaf 100644
--- a/dev-ruby/getoptlong/getoptlong-0.2.1.ebuild
+++ b/dev-ruby/getoptlong/getoptlong-0.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/getoptlong/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__FILE__/"getoptlong.gemspec"/' \
diff --git a/dev-ruby/globalid/globalid-1.2.1-r1.ebuild b/dev-ruby/globalid/globalid-1.2.1-r1.ebuild
index 90501661759b..34aec584d1ea 100644
--- a/dev-ruby/globalid/globalid-1.2.1-r1.ebuild
+++ b/dev-ruby/globalid/globalid-1.2.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}/${P}-ruby34.patch" )
diff --git a/dev-ruby/globalid/globalid-1.2.1.ebuild b/dev-ruby/globalid/globalid-1.2.1.ebuild
index 82d8c93d3fb0..6d425d0050e4 100644
--- a/dev-ruby/globalid/globalid-1.2.1.ebuild
+++ b/dev-ruby/globalid/globalid-1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/globalid/globalid-1.3.0.ebuild b/dev-ruby/globalid/globalid-1.3.0.ebuild
index 9327e0342aec..6cacf7956aed 100644
--- a/dev-ruby/globalid/globalid-1.3.0.ebuild
+++ b/dev-ruby/globalid/globalid-1.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/haml/haml-6.3.0-r1.ebuild b/dev-ruby/haml/haml-6.3.0-r1.ebuild
index bb8f02c02a65..b10528b0dfcc 100644
--- a/dev-ruby/haml/haml-6.3.0-r1.ebuild
+++ b/dev-ruby/haml/haml-6.3.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/haml/haml-6.3.0.ebuild b/dev-ruby/haml/haml-6.3.0.ebuild
index 8eceed0bd518..8992ee6905b3 100644
--- a/dev-ruby/haml/haml-6.3.0.ebuild
+++ b/dev-ruby/haml/haml-6.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/haml/haml-6.4.0.ebuild b/dev-ruby/haml/haml-6.4.0.ebuild
index c9071f61bfe9..88bffc25aab2 100644
--- a/dev-ruby/haml/haml-6.4.0.ebuild
+++ b/dev-ruby/haml/haml-6.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/haml/haml-7.0.2.ebuild b/dev-ruby/haml/haml-7.0.2.ebuild
index f366363cbf50..5eb2bf0ad461 100644
--- a/dev-ruby/haml/haml-7.0.2.ebuild
+++ b/dev-ruby/haml/haml-7.0.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/haml/haml/archive/refs/tags/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/haml/haml-7.1.0.ebuild b/dev-ruby/haml/haml-7.1.0.ebuild
index f366363cbf50..5eb2bf0ad461 100644
--- a/dev-ruby/haml/haml-7.1.0.ebuild
+++ b/dev-ruby/haml/haml-7.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/haml/haml/archive/refs/tags/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/hashdiff/hashdiff-1.1.2.ebuild b/dev-ruby/hashdiff/hashdiff-1.1.2.ebuild
index 0496d55bfcde..2fbeb9cc3607 100644
--- a/dev-ruby/hashdiff/hashdiff-1.1.2.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/liufengyun/hashdiff/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/hashdiff/hashdiff-1.2.0.ebuild b/dev-ruby/hashdiff/hashdiff-1.2.0.ebuild
index e10f26b4ab65..78694926afd6 100644
--- a/dev-ruby/hashdiff/hashdiff-1.2.0.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/liufengyun/hashdiff/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/hashdiff/hashdiff-1.2.1.ebuild b/dev-ruby/hashdiff/hashdiff-1.2.1.ebuild
index e10f26b4ab65..78694926afd6 100644
--- a/dev-ruby/hashdiff/hashdiff-1.2.1.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/liufengyun/hashdiff/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/hashie/hashie-5.0.0.ebuild b/dev-ruby/hashie/hashie-5.0.0.ebuild
index 216f85861790..fc31e213970d 100644
--- a/dev-ruby/hashie/hashie-5.0.0.ebuild
+++ b/dev-ruby/hashie/hashie-5.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/hashie/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}/${P}-ruby32-tests.patch" )
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r2.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r2.ebuild
index bfd2ec2baaf6..56d1c7cf3780 100644
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r2.ebuild
+++ b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/adrianomitre/heredoc_unindent"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
diff --git a/dev-ruby/hoe/hoe-4.2.2.ebuild b/dev-ruby/hoe/hoe-4.2.2.ebuild
index 4cf6b22b7acb..29887e5f60d4 100644
--- a/dev-ruby/hoe/hoe-4.2.2.ebuild
+++ b/dev-ruby/hoe/hoe-4.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-4.2.3.ebuild b/dev-ruby/hoe/hoe-4.2.3.ebuild
index 4cf6b22b7acb..29887e5f60d4 100644
--- a/dev-ruby/hoe/hoe-4.2.3.ebuild
+++ b/dev-ruby/hoe/hoe-4.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hoe/hoe-4.3.0.ebuild b/dev-ruby/hoe/hoe-4.3.0.ebuild
index 6d53fadeacb0..939c2d3cced2 100644
--- a/dev-ruby/hoe/hoe-4.3.0.ebuild
+++ b/dev-ruby/hoe/hoe-4.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/httpclient/httpclient-2.8.3-r3.ebuild b/dev-ruby/httpclient/httpclient-2.8.3-r3.ebuild
index fa7b8bcab632..cae642ca5a77 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3-r3.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3-r3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
 LICENSE="|| ( Ruby Ruby-BSD BSD-2 )"
 SLOT="0"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/httpclient/httpclient-2.9.0.ebuild b/dev-ruby/httpclient/httpclient-2.9.0.ebuild
index 3433ea450a1f..5dbc2d9ee3e9 100644
--- a/dev-ruby/httpclient/httpclient-2.9.0.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.9.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
 LICENSE="|| ( Ruby Ruby-BSD BSD-2 )"
 SLOT="0"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/mutex_m virtual/ruby-ssl"
diff --git a/dev-ruby/i18n/i18n-1.14.7.ebuild b/dev-ruby/i18n/i18n-1.14.7.ebuild
index 50244443a683..c5fa99c1fde4 100644
--- a/dev-ruby/i18n/i18n-1.14.7.ebuild
+++ b/dev-ruby/i18n/i18n-1.14.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/concurrent-ruby:1
diff --git a/dev-ruby/io-console/io-console-0.8.0.ebuild b/dev-ruby/io-console/io-console-0.8.0.ebuild
index db46d7127234..c179ebbac5a9 100644
--- a/dev-ruby/io-console/io-console-0.8.0.ebuild
+++ b/dev-ruby/io-console/io-console-0.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/io-console/io-console-0.8.1.ebuild b/dev-ruby/io-console/io-console-0.8.1.ebuild
index 39dcebe10b9f..0d3f51c90054 100644
--- a/dev-ruby/io-console/io-console-0.8.1.ebuild
+++ b/dev-ruby/io-console/io-console-0.8.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/io-console/io-console-0.8.2.ebuild b/dev-ruby/io-console/io-console-0.8.2.ebuild
index ffc9f2696576..9578aaf475c7 100644
--- a/dev-ruby/io-console/io-console-0.8.2.ebuild
+++ b/dev-ruby/io-console/io-console-0.8.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/io-wait/io-wait-0.3.1.ebuild b/dev-ruby/io-wait/io-wait-0.3.1.ebuild
index 52e36bcff8d3..244249d15388 100644
--- a/dev-ruby/io-wait/io-wait-0.3.1.ebuild
+++ b/dev-ruby/io-wait/io-wait-0.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/io-wait/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
 
diff --git a/dev-ruby/io-wait/io-wait-0.3.2.ebuild b/dev-ruby/io-wait/io-wait-0.3.2.ebuild
index 0d2088d062c6..3089ab202f1c 100644
--- a/dev-ruby/io-wait/io-wait-0.3.2.ebuild
+++ b/dev-ruby/io-wait/io-wait-0.3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/io-wait/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
 
diff --git a/dev-ruby/io-wait/io-wait-0.3.6.ebuild b/dev-ruby/io-wait/io-wait-0.3.6.ebuild
index 5cc464e17fd0..e480fb2942a3 100644
--- a/dev-ruby/io-wait/io-wait-0.3.6.ebuild
+++ b/dev-ruby/io-wait/io-wait-0.3.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/io-wait/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
 
diff --git a/dev-ruby/io-wait/io-wait-0.4.0.ebuild b/dev-ruby/io-wait/io-wait-0.4.0.ebuild
index 5cc464e17fd0..e480fb2942a3 100644
--- a/dev-ruby/io-wait/io-wait-0.4.0.ebuild
+++ b/dev-ruby/io-wait/io-wait-0.4.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/io-wait/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
 
diff --git a/dev-ruby/ipaddr/ipaddr-1.2.7.ebuild b/dev-ruby/ipaddr/ipaddr-1.2.7.ebuild
index e41f6e6930b9..08d8948590a1 100644
--- a/dev-ruby/ipaddr/ipaddr-1.2.7.ebuild
+++ b/dev-ruby/ipaddr/ipaddr-1.2.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/ipaddr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/ipaddr/ipaddr-1.2.8.ebuild b/dev-ruby/ipaddr/ipaddr-1.2.8.ebuild
index 8cb61855a130..96af3a5880a3 100644
--- a/dev-ruby/ipaddr/ipaddr-1.2.8.ebuild
+++ b/dev-ruby/ipaddr/ipaddr-1.2.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/ipaddr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/irb/irb-1.15.2.ebuild b/dev-ruby/irb/irb-1.15.2.ebuild
index 28f5251cc79f..5076fc2f9cc9 100644
--- a/dev-ruby/irb/irb-1.15.2.ebuild
+++ b/dev-ruby/irb/irb-1.15.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Ensure a new enough eselect-ruby is present to avoid clobbering the
diff --git a/dev-ruby/irb/irb-1.15.3.ebuild b/dev-ruby/irb/irb-1.15.3.ebuild
index 6af5283fe3cb..46989e65689f 100644
--- a/dev-ruby/irb/irb-1.15.3.ebuild
+++ b/dev-ruby/irb/irb-1.15.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Ensure a new enough eselect-ruby is present to avoid clobbering the
diff --git a/dev-ruby/irb/irb-1.16.0.ebuild b/dev-ruby/irb/irb-1.16.0.ebuild
index 6af5283fe3cb..46989e65689f 100644
--- a/dev-ruby/irb/irb-1.16.0.ebuild
+++ b/dev-ruby/irb/irb-1.16.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Ensure a new enough eselect-ruby is present to avoid clobbering the
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.6.0.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.6.0.ebuild
index 9c667352e764..6c93dfb4c755 100644
--- a/dev-ruby/jquery-rails/jquery-rails-4.6.0.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.6.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/rails/jquery-rails"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/railties-4.2.0:*
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.6.1.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.6.1.ebuild
index 9c667352e764..6c93dfb4c755 100644
--- a/dev-ruby/jquery-rails/jquery-rails-4.6.1.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.6.1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/rails/jquery-rails"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/railties-4.2.0:*
diff --git a/dev-ruby/json/json-2.10.2.ebuild b/dev-ruby/json/json-2.10.2.ebuild
index cf73d19c649f..3eec1f2c6bfd 100644
--- a/dev-ruby/json/json-2.10.2.ebuild
+++ b/dev-ruby/json/json-2.10.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/json/json-2.12.2.ebuild b/dev-ruby/json/json-2.12.2.ebuild
index c4784f19d485..189e4455ef94 100644
--- a/dev-ruby/json/json-2.12.2.ebuild
+++ b/dev-ruby/json/json-2.12.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/json/json-2.13.2.ebuild b/dev-ruby/json/json-2.13.2.ebuild
index d437fa7325d3..6dda0c42df77 100644
--- a/dev-ruby/json/json-2.13.2.ebuild
+++ b/dev-ruby/json/json-2.13.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/json/json-2.14.1.ebuild b/dev-ruby/json/json-2.14.1.ebuild
index d437fa7325d3..6dda0c42df77 100644
--- a/dev-ruby/json/json-2.14.1.ebuild
+++ b/dev-ruby/json/json-2.14.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/json/json-2.15.2.ebuild b/dev-ruby/json/json-2.15.2.ebuild
index b82f5bec358a..d157c1943819 100644
--- a/dev-ruby/json/json-2.15.2.ebuild
+++ b/dev-ruby/json/json-2.15.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/json/json-2.16.0.ebuild b/dev-ruby/json/json-2.16.0.ebuild
index b82f5bec358a..d157c1943819 100644
--- a/dev-ruby/json/json-2.16.0.ebuild
+++ b/dev-ruby/json/json-2.16.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/json/json-2.17.1.ebuild b/dev-ruby/json/json-2.17.1.ebuild
index b82f5bec358a..d157c1943819 100644
--- a/dev-ruby/json/json-2.17.1.ebuild
+++ b/dev-ruby/json/json-2.17.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/json/json-2.18.0.ebuild b/dev-ruby/json/json-2.18.0.ebuild
index b82f5bec358a..d157c1943819 100644
--- a/dev-ruby/json/json-2.18.0.ebuild
+++ b/dev-ruby/json/json-2.18.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/kpeg/kpeg-1.3.3.ebuild b/dev-ruby/kpeg/kpeg-1.3.3.ebuild
index ff4716dcd009..2e728cf40824 100644
--- a/dev-ruby/kpeg/kpeg-1.3.3.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.3.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/logger/logger-1.6.6.ebuild b/dev-ruby/logger/logger-1.6.6.ebuild
index 4ec67ce201ab..c0d6c75e1836 100644
--- a/dev-ruby/logger/logger-1.6.6.ebuild
+++ b/dev-ruby/logger/logger-1.6.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/logger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/logger/logger-1.7.0.ebuild b/dev-ruby/logger/logger-1.7.0.ebuild
index a29b0fb8ba17..e12ce67e731d 100644
--- a/dev-ruby/logger/logger-1.7.0.ebuild
+++ b/dev-ruby/logger/logger-1.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/logger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/loofah/loofah-2.24.0.ebuild b/dev-ruby/loofah/loofah-2.24.0.ebuild
index 77cd1194e6a4..7bb1fdc75b40 100644
--- a/dev-ruby/loofah/loofah-2.24.0.ebuild
+++ b/dev-ruby/loofah/loofah-2.24.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.12.0"
diff --git a/dev-ruby/loofah/loofah-2.24.1.ebuild b/dev-ruby/loofah/loofah-2.24.1.ebuild
index cfea62486e8e..94f2080d2f47 100644
--- a/dev-ruby/loofah/loofah-2.24.1.ebuild
+++ b/dev-ruby/loofah/loofah-2.24.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.12.0"
diff --git a/dev-ruby/loofah/loofah-2.25.0.ebuild b/dev-ruby/loofah/loofah-2.25.0.ebuild
index cfea62486e8e..94f2080d2f47 100644
--- a/dev-ruby/loofah/loofah-2.25.0.ebuild
+++ b/dev-ruby/loofah/loofah-2.25.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.12.0"
diff --git a/dev-ruby/mab/mab-0.0.3-r2.ebuild b/dev-ruby/mab/mab-0.0.3-r2.ebuild
index 6b39d5266098..2ec072135166 100644
--- a/dev-ruby/mab/mab-0.0.3-r2.ebuild
+++ b/dev-ruby/mab/mab-0.0.3-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/camping/mab"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
 
diff --git a/dev-ruby/mail/mail-2.8.1.ebuild b/dev-ruby/mail/mail-2.8.1.ebuild
index 94e31aade070..6a1600d50ab5 100644
--- a/dev-ruby/mail/mail-2.8.1.ebuild
+++ b/dev-ruby/mail/mail-2.8.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/mini_mime-0.1.1
diff --git a/dev-ruby/mail/mail-2.9.0.ebuild b/dev-ruby/mail/mail-2.9.0.ebuild
index 26e403032ba5..585ee8450841 100644
--- a/dev-ruby/mail/mail-2.9.0.ebuild
+++ b/dev-ruby/mail/mail-2.9.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/logger
diff --git a/dev-ruby/maruku/maruku-0.7.3-r1.ebuild b/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
index dcd3f1bd2dd8..61d6c2906798 100644
--- a/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/bhollis/maruku"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 IUSE="highlight test"
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff dev-ruby/syntax )"
diff --git a/dev-ruby/matrix/matrix-0.4.2.ebuild b/dev-ruby/matrix/matrix-0.4.2.ebuild
index d68ca5a7f8f1..91e02dd60eb8 100644
--- a/dev-ruby/matrix/matrix-0.4.2.ebuild
+++ b/dev-ruby/matrix/matrix-0.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/matrix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 SLOT="$(ver_cut 1)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/matrix/matrix-0.4.3.ebuild b/dev-ruby/matrix/matrix-0.4.3.ebuild
index da093e387913..c2c44bf92894 100644
--- a/dev-ruby/matrix/matrix-0.4.3.ebuild
+++ b/dev-ruby/matrix/matrix-0.4.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/matrix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
diff --git a/dev-ruby/maxitest/maxitest-5.5.0.ebuild b/dev-ruby/maxitest/maxitest-5.5.0.ebuild
index 07457ba4fa1c..6efbd1d83741 100644
--- a/dev-ruby/maxitest/maxitest-5.5.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-5.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/minitest-5.14.0:* <dev-ruby/minitest-5.24.0:*"
diff --git a/dev-ruby/maxitest/maxitest-5.8.0.ebuild b/dev-ruby/maxitest/maxitest-5.8.0.ebuild
index de50143f73d1..977e6aaa7852 100644
--- a/dev-ruby/maxitest/maxitest-5.8.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-5.8.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/minitest-5.14.0:* <dev-ruby/minitest-5.26.0:*"
diff --git a/dev-ruby/maxitest/maxitest-6.0.1.ebuild b/dev-ruby/maxitest/maxitest-6.0.1.ebuild
index ba0235d43297..947204efd1c4 100644
--- a/dev-ruby/maxitest/maxitest-6.0.1.ebuild
+++ b/dev-ruby/maxitest/maxitest-6.0.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/minitest-5.20.0:* <dev-ruby/minitest-5.26.0:*"
diff --git a/dev-ruby/maxitest/maxitest-6.1.0.ebuild b/dev-ruby/maxitest/maxitest-6.1.0.ebuild
index ccc56c25b16a..1e927a31aa8b 100644
--- a/dev-ruby/maxitest/maxitest-6.1.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-6.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/minitest-5.20.0:* <dev-ruby/minitest-5.28.0:*"
diff --git a/dev-ruby/mechanize/mechanize-2.12.0.ebuild b/dev-ruby/mechanize/mechanize-2.12.0.ebuild
index f0334a5a784a..825f6853716e 100644
--- a/dev-ruby/mechanize/mechanize-2.12.0.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.12.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/sparklemotion/mechanize"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64"
 IUSE="brotli test"
 
 ruby_add_bdepend ">=dev-ruby/hoe-3.7
diff --git a/dev-ruby/mechanize/mechanize-2.14.0.ebuild b/dev-ruby/mechanize/mechanize-2.14.0.ebuild
index ade3819297d0..81fab8310293 100644
--- a/dev-ruby/mechanize/mechanize-2.14.0.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.14.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/sparklemotion/mechanize"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64"
 IUSE="brotli test zstd"
 
 ruby_add_bdepend ">=dev-ruby/hoe-3.7
diff --git a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
index 9fa450ca6851..5d55d7964604 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/floehopper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2025.0402.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2025.0402.ebuild
index cf477d35fb73..9e49992915b2 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2025.0402.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2025.0402.ebuild
@@ -18,4 +18,4 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2025.0729.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2025.0729.ebuild
index 9adc42b597d2..ea600e3f0f7b 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2025.0729.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2025.0729.ebuild
@@ -18,4 +18,4 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2025.0924.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2025.0924.ebuild
index 9914e0a44eb9..36eb5c9ff34f 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2025.0924.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2025.0924.ebuild
@@ -18,4 +18,4 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.5.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.5.ebuild
index 7947bbcf41f5..fbf4aed52796 100644
--- a/dev-ruby/mini_mime/mini_mime-1.1.5.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitar/minitar-0.12.1.ebuild b/dev-ruby/minitar/minitar-0.12.1.ebuild
index c85926f9e59d..e175b41d6777 100644
--- a/dev-ruby/minitar/minitar-0.12.1.ebuild
+++ b/dev-ruby/minitar/minitar-0.12.1.ebuild
@@ -20,7 +20,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/minitar/minitar-1.0.2.ebuild b/dev-ruby/minitar/minitar-1.0.2.ebuild
index bf4673117f28..025cddaf6828 100644
--- a/dev-ruby/minitar/minitar-1.0.2.ebuild
+++ b/dev-ruby/minitar/minitar-1.0.2.ebuild
@@ -20,7 +20,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/minitar/minitar-1.1.0.ebuild b/dev-ruby/minitar/minitar-1.1.0.ebuild
index 8298f1cd86e7..40aede38fe21 100644
--- a/dev-ruby/minitar/minitar-1.1.0.ebuild
+++ b/dev-ruby/minitar/minitar-1.1.0.ebuild
@@ -21,7 +21,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r2.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r2.ebuild
index 9bf08284e96d..0877d5cfe988 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r2.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r2.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r2.ebuild
index d4a0ddc9a825..1669ee0afaec 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r2.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 each_ruby_test() {
 	${RUBY} -Ilib:. -e 'require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
diff --git a/dev-ruby/minitest/minitest-5.15.0-r1.ebuild b/dev-ruby/minitest/minitest-5.15.0-r1.ebuild
index 3bf58306cae0..173dad9d9d0b 100644
--- a/dev-ruby/minitest/minitest-5.15.0-r1.ebuild
+++ b/dev-ruby/minitest/minitest-5.15.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5.15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="!~dev-ruby/minitest-5.15.0:5"
diff --git a/dev-ruby/minitest/minitest-5.22.3.ebuild b/dev-ruby/minitest/minitest-5.22.3.ebuild
index f4575ee3681d..acf5a1e6bdad 100644
--- a/dev-ruby/minitest/minitest-5.22.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.22.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.23.1.ebuild b/dev-ruby/minitest/minitest-5.23.1.ebuild
index 16171d828948..cdc231876e61 100644
--- a/dev-ruby/minitest/minitest-5.23.1.ebuild
+++ b/dev-ruby/minitest/minitest-5.23.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.24.1.ebuild b/dev-ruby/minitest/minitest-5.24.1.ebuild
index 16171d828948..cdc231876e61 100644
--- a/dev-ruby/minitest/minitest-5.24.1.ebuild
+++ b/dev-ruby/minitest/minitest-5.24.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.25.1.ebuild b/dev-ruby/minitest/minitest-5.25.1.ebuild
index f4575ee3681d..acf5a1e6bdad 100644
--- a/dev-ruby/minitest/minitest-5.25.1.ebuild
+++ b/dev-ruby/minitest/minitest-5.25.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.25.5.ebuild b/dev-ruby/minitest/minitest-5.25.5.ebuild
index 67637fa49116..eab2866a75b5 100644
--- a/dev-ruby/minitest/minitest-5.25.5.ebuild
+++ b/dev-ruby/minitest/minitest-5.25.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.26.0.ebuild b/dev-ruby/minitest/minitest-5.26.0.ebuild
index 5be9eab07145..478a4818f192 100644
--- a/dev-ruby/minitest/minitest-5.26.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.26.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.26.1.ebuild b/dev-ruby/minitest/minitest-5.26.1.ebuild
index 5be9eab07145..478a4818f192 100644
--- a/dev-ruby/minitest/minitest-5.26.1.ebuild
+++ b/dev-ruby/minitest/minitest-5.26.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.26.2.ebuild b/dev-ruby/minitest/minitest-5.26.2.ebuild
index 5be9eab07145..478a4818f192 100644
--- a/dev-ruby/minitest/minitest-5.26.2.ebuild
+++ b/dev-ruby/minitest/minitest-5.26.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.27.0.ebuild b/dev-ruby/minitest/minitest-5.27.0.ebuild
index 5be9eab07145..478a4818f192 100644
--- a/dev-ruby/minitest/minitest-5.27.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.27.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild b/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild
index 558567a17944..51f9453ac42b 100644
--- a/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
diff --git a/dev-ruby/multi_json/multi_json-1.17.0.ebuild b/dev-ruby/multi_json/multi_json-1.17.0.ebuild
index b713319c5d8d..4b09e66a19f6 100644
--- a/dev-ruby/multi_json/multi_json-1.17.0.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.17.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/sferik/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
diff --git a/dev-ruby/multi_json/multi_json-1.18.0.ebuild b/dev-ruby/multi_json/multi_json-1.18.0.ebuild
index b713319c5d8d..4b09e66a19f6 100644
--- a/dev-ruby/multi_json/multi_json-1.18.0.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.18.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/sferik/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
diff --git a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
index f16fc86547cd..65782c07c3e6 100644
--- a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.io/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 PATCHES=( "${FILESDIR}/${P}-test-ordering.patch" )
 
diff --git a/dev-ruby/mustache/mustache-1.1.1-r2.ebuild b/dev-ruby/mustache/mustache-1.1.1-r2.ebuild
index 3d54127cc69e..09b421d820ae 100644
--- a/dev-ruby/mustache/mustache-1.1.1-r2.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.io/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 PATCHES=( "${FILESDIR}/${P}-test-ordering.patch" )
 
diff --git a/dev-ruby/mutex_m/mutex_m-0.2.0.ebuild b/dev-ruby/mutex_m/mutex_m-0.2.0.ebuild
index f5e646108f5a..577f9b97ad55 100644
--- a/dev-ruby/mutex_m/mutex_m-0.2.0.ebuild
+++ b/dev-ruby/mutex_m/mutex_m-0.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/mutex_m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's:_relative ": "./:' \
diff --git a/dev-ruby/mutex_m/mutex_m-0.3.0.ebuild b/dev-ruby/mutex_m/mutex_m-0.3.0.ebuild
index 31e878324a94..00fa2f1b7dfe 100644
--- a/dev-ruby/mutex_m/mutex_m-0.3.0.ebuild
+++ b/dev-ruby/mutex_m/mutex_m-0.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/mutex_m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's:_relative ": "./:' \
diff --git a/dev-ruby/net-ftp/net-ftp-0.3.8.ebuild b/dev-ruby/net-ftp/net-ftp-0.3.8.ebuild
index 417018302894..6c129981a0b5 100644
--- a/dev-ruby/net-ftp/net-ftp-0.3.8.ebuild
+++ b/dev-ruby/net-ftp/net-ftp-0.3.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/net-protocol
diff --git a/dev-ruby/net-ftp/net-ftp-0.3.9.ebuild b/dev-ruby/net-ftp/net-ftp-0.3.9.ebuild
index fe366e224e0c..724757100345 100644
--- a/dev-ruby/net-ftp/net-ftp-0.3.9.ebuild
+++ b/dev-ruby/net-ftp/net-ftp-0.3.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/net-protocol
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild
index f5f9c2e87211..36aba974ded4 100644
--- a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.5.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.5.ebuild
index 91f8bd7f7afd..669317f5743b 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-4.0.5.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-4.0.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/drbrain/net-http-persistent/archive/refs/tags/v${PV}
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.6.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.6.ebuild
index 137a9046b55b..91c749148ddd 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-4.0.6.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-4.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/drbrain/net-http-persistent/archive/refs/tags/v${PV}
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/connection_pool-2.2.4:0"
diff --git a/dev-ruby/net-http/net-http-0.6.0.ebuild b/dev-ruby/net-http/net-http-0.6.0.ebuild
index bf8b6883638a..085bafa09895 100644
--- a/dev-ruby/net-http/net-http-0.6.0.ebuild
+++ b/dev-ruby/net-http/net-http-0.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-http/net-http-0.7.0.ebuild b/dev-ruby/net-http/net-http-0.7.0.ebuild
index da5780be9923..3112ebd3b2ad 100644
--- a/dev-ruby/net-http/net-http-0.7.0.ebuild
+++ b/dev-ruby/net-http/net-http-0.7.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/net-http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-http/net-http-0.8.0.ebuild b/dev-ruby/net-http/net-http-0.8.0.ebuild
index b5a0ab1e8629..98dcf432a390 100644
--- a/dev-ruby/net-http/net-http-0.8.0.ebuild
+++ b/dev-ruby/net-http/net-http-0.8.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/net-http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-http/net-http-0.9.1.ebuild b/dev-ruby/net-http/net-http-0.9.1.ebuild
index b5a0ab1e8629..98dcf432a390 100644
--- a/dev-ruby/net-http/net-http-0.9.1.ebuild
+++ b/dev-ruby/net-http/net-http-0.9.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/net-http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-imap/net-imap-0.4.22.ebuild b/dev-ruby/net-imap/net-imap-0.4.22.ebuild
index d7ff78bcad4f..458658e10226 100644
--- a/dev-ruby/net-imap/net-imap-0.4.22.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.4.22.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-imap/net-imap-0.5.12.ebuild b/dev-ruby/net-imap/net-imap-0.5.12.ebuild
index 8e905b37533e..f6f5b728e012 100644
--- a/dev-ruby/net-imap/net-imap-0.5.12.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.5.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-imap/net-imap-0.6.0.ebuild b/dev-ruby/net-imap/net-imap-0.6.0.ebuild
index 394c3fd5fb87..553c03836f7e 100644
--- a/dev-ruby/net-imap/net-imap-0.6.0.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-imap/net-imap-0.6.2.ebuild b/dev-ruby/net-imap/net-imap-0.6.2.ebuild
index 394c3fd5fb87..553c03836f7e 100644
--- a/dev-ruby/net-imap/net-imap-0.6.2.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-pop/net-pop-0.1.2.ebuild b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
index fdb319d31ebc..d88d372bd166 100644
--- a/dev-ruby/net-pop/net-pop-0.1.2.ebuild
+++ b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-pop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 ruby_add_rdepend "
 	dev-ruby/net-protocol
 "
diff --git a/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild b/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild
index 4aff1b07ce6c..a90714783c3b 100644
--- a/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild
+++ b/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-scp/net-scp-4.1.0.ebuild b/dev-ruby/net-scp/net-scp-4.1.0.ebuild
index e7bd8a567937..51bd7f0dd8db 100644
--- a/dev-ruby/net-scp/net-scp-4.1.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-4.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/net-sftp/net-sftp-4.0.0.ebuild b/dev-ruby/net-sftp/net-sftp-4.0.0.ebuild
index 75622990e7b9..5c33aa3b52da 100644
--- a/dev-ruby/net-sftp/net-sftp-4.0.0.ebuild
+++ b/dev-ruby/net-sftp/net-sftp-4.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/net-ssh/net-sftp/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/net-ssh:7"
diff --git a/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild b/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild
index 280aec3bc5a2..bdfde61a1145 100644
--- a/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild
+++ b/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/net-protocol
diff --git a/dev-ruby/net-smtp/net-smtp-0.5.1.ebuild b/dev-ruby/net-smtp/net-smtp-0.5.1.ebuild
index 633c34f8b4fa..bc388bb3a021 100644
--- a/dev-ruby/net-smtp/net-smtp-0.5.1.ebuild
+++ b/dev-ruby/net-smtp/net-smtp-0.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/net-protocol
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
index 8bbbe635e506..8fa5eac564dc 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/nkf/nkf-0.2.0.ebuild b/dev-ruby/nkf/nkf-0.2.0.ebuild
index 7292864e879a..9d4ec19632cf 100644
--- a/dev-ruby/nkf/nkf-0.2.0.ebuild
+++ b/dev-ruby/nkf/nkf-0.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/nkf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.3.0.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.3.0.ebuild
index 16585ddffd16..13a4e6bc506d 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.3.0.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.3.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.5 >=dev-ruby/tdiff-0.4.0:0"
 
diff --git a/dev-ruby/observer/observer-0.1.2.ebuild b/dev-ruby/observer/observer-0.1.2.ebuild
index 4fa1c1343aa8..39e0ec362fde 100644
--- a/dev-ruby/observer/observer-0.1.2.ebuild
+++ b/dev-ruby/observer/observer-0.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/observer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/ostruct/ostruct-0.6.1.ebuild b/dev-ruby/ostruct/ostruct-0.6.1.ebuild
index 987b6e1ddaba..7ee336563b0a 100644
--- a/dev-ruby/ostruct/ostruct-0.6.1.ebuild
+++ b/dev-ruby/ostruct/ostruct-0.6.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/ostruct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_depend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/ostruct/ostruct-0.6.2.ebuild b/dev-ruby/ostruct/ostruct-0.6.2.ebuild
index 984d12c4ee65..2ed729fa8f47 100644
--- a/dev-ruby/ostruct/ostruct-0.6.2.ebuild
+++ b/dev-ruby/ostruct/ostruct-0.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/ostruct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_depend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/ostruct/ostruct-0.6.3.ebuild b/dev-ruby/ostruct/ostruct-0.6.3.ebuild
index 984d12c4ee65..2ed729fa8f47 100644
--- a/dev-ruby/ostruct/ostruct-0.6.3.ebuild
+++ b/dev-ruby/ostruct/ostruct-0.6.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/ostruct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_depend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/pg/pg-1.5.8.ebuild b/dev-ruby/pg/pg-1.5.8.ebuild
index 183158a55a79..ba9dfe6c4375 100644
--- a/dev-ruby/pg/pg-1.5.8.ebuild
+++ b/dev-ruby/pg/pg-1.5.8.ebuild
@@ -20,7 +20,7 @@ RUBY_S="ruby-${P}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND="dev-db/postgresql:*"
diff --git a/dev-ruby/pg/pg-1.5.9.ebuild b/dev-ruby/pg/pg-1.5.9.ebuild
index 85602607018e..db9d36e176f1 100644
--- a/dev-ruby/pg/pg-1.5.9.ebuild
+++ b/dev-ruby/pg/pg-1.5.9.ebuild
@@ -20,7 +20,7 @@ RUBY_S="ruby-${P}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND="dev-db/postgresql:*"
diff --git a/dev-ruby/pg/pg-1.6.0.ebuild b/dev-ruby/pg/pg-1.6.0.ebuild
index ca48af196c00..32f7def0070d 100644
--- a/dev-ruby/pg/pg-1.6.0.ebuild
+++ b/dev-ruby/pg/pg-1.6.0.ebuild
@@ -21,7 +21,7 @@ RUBY_S="ruby-${P}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-db/postgresql-10:*"
diff --git a/dev-ruby/pg/pg-1.6.1.ebuild b/dev-ruby/pg/pg-1.6.1.ebuild
index ca48af196c00..32f7def0070d 100644
--- a/dev-ruby/pg/pg-1.6.1.ebuild
+++ b/dev-ruby/pg/pg-1.6.1.ebuild
@@ -21,7 +21,7 @@ RUBY_S="ruby-${P}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-db/postgresql-10:*"
diff --git a/dev-ruby/pg/pg-1.6.2.ebuild b/dev-ruby/pg/pg-1.6.2.ebuild
index ca48af196c00..32f7def0070d 100644
--- a/dev-ruby/pg/pg-1.6.2.ebuild
+++ b/dev-ruby/pg/pg-1.6.2.ebuild
@@ -21,7 +21,7 @@ RUBY_S="ruby-${P}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-db/postgresql-10:*"
diff --git a/dev-ruby/plist/plist-3.7.2.ebuild b/dev-ruby/plist/plist-3.7.2.ebuild
index 7bf7a2407f0d..2aa15b733f3d 100644
--- a/dev-ruby/plist/plist-3.7.2.ebuild
+++ b/dev-ruby/plist/plist-3.7.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/patsplat/plist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 ruby_add_rdepend "test? ( dev-ruby/base64 )"
diff --git a/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild b/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
index 77421b7efd35..4dd84c02da8e 100644
--- a/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
+++ b/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
@@ -16,4 +16,4 @@ HOMEPAGE="https://github.com/cjheath/polyglot"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/power_assert/power_assert-2.0.5.ebuild b/dev-ruby/power_assert/power_assert-2.0.5.ebuild
index e23287491e42..a1d04d3d0fd9 100644
--- a/dev-ruby/power_assert/power_assert-2.0.5.ebuild
+++ b/dev-ruby/power_assert/power_assert-2.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby BSD-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/power_assert/power_assert-3.0.0.ebuild b/dev-ruby/power_assert/power_assert-3.0.0.ebuild
index 857daef31c85..40c990080cac 100644
--- a/dev-ruby/power_assert/power_assert-3.0.0.ebuild
+++ b/dev-ruby/power_assert/power_assert-3.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby BSD-2 )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/power_assert/power_assert-3.0.1.ebuild b/dev-ruby/power_assert/power_assert-3.0.1.ebuild
index 857daef31c85..40c990080cac 100644
--- a/dev-ruby/power_assert/power_assert-3.0.1.ebuild
+++ b/dev-ruby/power_assert/power_assert-3.0.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby BSD-2 )"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/pp/pp-0.6.2.ebuild b/dev-ruby/pp/pp-0.6.2.ebuild
index 63463b2fe147..0da805ea0398 100644
--- a/dev-ruby/pp/pp-0.6.2.ebuild
+++ b/dev-ruby/pp/pp-0.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/pp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/pp/pp-0.6.3.ebuild b/dev-ruby/pp/pp-0.6.3.ebuild
index 14a059b31c85..bc5654800126 100644
--- a/dev-ruby/pp/pp-0.6.3.ebuild
+++ b/dev-ruby/pp/pp-0.6.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/pp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/prettyprint/prettyprint-0.2.0.ebuild b/dev-ruby/prettyprint/prettyprint-0.2.0.ebuild
index b18b04a6b71f..c9db939f6f2a 100644
--- a/dev-ruby/prettyprint/prettyprint-0.2.0.ebuild
+++ b/dev-ruby/prettyprint/prettyprint-0.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/prettyprint/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/prime/prime-0.1.2-r1.ebuild b/dev-ruby/prime/prime-0.1.2-r1.ebuild
index f593e28f335c..ca025b32627c 100644
--- a/dev-ruby/prime/prime-0.1.2-r1.ebuild
+++ b/dev-ruby/prime/prime-0.1.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/prime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/prime/prime-0.1.3.ebuild b/dev-ruby/prime/prime-0.1.3.ebuild
index 6ecea8894098..71fe6defec04 100644
--- a/dev-ruby/prime/prime-0.1.3.ebuild
+++ b/dev-ruby/prime/prime-0.1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/prime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/prime/prime-0.1.4.ebuild b/dev-ruby/prime/prime-0.1.4.ebuild
index 9aac7428e9ee..5fd83dee5607 100644
--- a/dev-ruby/prime/prime-0.1.4.ebuild
+++ b/dev-ruby/prime/prime-0.1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/prime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/prism/prism-1.4.0.ebuild b/dev-ruby/prism/prism-1.4.0.ebuild
index 99d0b6a4207b..01889a36ba9d 100644
--- a/dev-ruby/prism/prism-1.4.0.ebuild
+++ b/dev-ruby/prism/prism-1.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/prism/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "dev-ruby/bundler"
 
diff --git a/dev-ruby/prism/prism-1.5.2.ebuild b/dev-ruby/prism/prism-1.5.2.ebuild
index 44f4b4a3a89f..d6f081205cb2 100644
--- a/dev-ruby/prism/prism-1.5.2.ebuild
+++ b/dev-ruby/prism/prism-1.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/prism/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "dev-ruby/bundler"
 
diff --git a/dev-ruby/prism/prism-1.6.0.ebuild b/dev-ruby/prism/prism-1.6.0.ebuild
index 44f4b4a3a89f..d6f081205cb2 100644
--- a/dev-ruby/prism/prism-1.6.0.ebuild
+++ b/dev-ruby/prism/prism-1.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/prism/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "dev-ruby/bundler"
 
diff --git a/dev-ruby/prism/prism-1.7.0.ebuild b/dev-ruby/prism/prism-1.7.0.ebuild
index 44f4b4a3a89f..d6f081205cb2 100644
--- a/dev-ruby/prism/prism-1.7.0.ebuild
+++ b/dev-ruby/prism/prism-1.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/prism/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "dev-ruby/bundler"
 
diff --git a/dev-ruby/psych/psych-5.2.3.ebuild b/dev-ruby/psych/psych-5.2.3.ebuild
index 4ba78f2ef1cb..52e29782a752 100644
--- a/dev-ruby/psych/psych-5.2.3.ebuild
+++ b/dev-ruby/psych/psych-5.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/libyaml-0.2.5"
diff --git a/dev-ruby/psych/psych-5.2.4.ebuild b/dev-ruby/psych/psych-5.2.4.ebuild
index 5afbaeaa942d..2d2596309f75 100644
--- a/dev-ruby/psych/psych-5.2.4.ebuild
+++ b/dev-ruby/psych/psych-5.2.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/libyaml-0.2.5"
diff --git a/dev-ruby/psych/psych-5.2.5.ebuild b/dev-ruby/psych/psych-5.2.5.ebuild
index 5afbaeaa942d..2d2596309f75 100644
--- a/dev-ruby/psych/psych-5.2.5.ebuild
+++ b/dev-ruby/psych/psych-5.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/libyaml-0.2.5"
diff --git a/dev-ruby/psych/psych-5.2.6.ebuild b/dev-ruby/psych/psych-5.2.6.ebuild
index 3db76b439c63..0c91b4fd0dbe 100644
--- a/dev-ruby/psych/psych-5.2.6.ebuild
+++ b/dev-ruby/psych/psych-5.2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/libyaml-0.2.5"
diff --git a/dev-ruby/psych/psych-5.3.0.ebuild b/dev-ruby/psych/psych-5.3.0.ebuild
index 5afbaeaa942d..2d2596309f75 100644
--- a/dev-ruby/psych/psych-5.3.0.ebuild
+++ b/dev-ruby/psych/psych-5.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/libyaml-0.2.5"
diff --git a/dev-ruby/psych/psych-5.3.1.ebuild b/dev-ruby/psych/psych-5.3.1.ebuild
index 5afbaeaa942d..2d2596309f75 100644
--- a/dev-ruby/psych/psych-5.3.1.ebuild
+++ b/dev-ruby/psych/psych-5.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/libyaml-0.2.5"
diff --git a/dev-ruby/public_suffix/public_suffix-6.0.1.ebuild b/dev-ruby/public_suffix/public_suffix-6.0.1.ebuild
index 182c0f53328e..1dc114b86c9a 100644
--- a/dev-ruby/public_suffix/public_suffix-6.0.1.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-6.0.1.ebuild
@@ -18,7 +18,7 @@ RUBY_S="publicsuffix-ruby-${PV}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha:2 )"
 
diff --git a/dev-ruby/public_suffix/public_suffix-6.0.2.ebuild b/dev-ruby/public_suffix/public_suffix-6.0.2.ebuild
index 4e331036e96a..2de24773cc0a 100644
--- a/dev-ruby/public_suffix/public_suffix-6.0.2.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-6.0.2.ebuild
@@ -18,7 +18,7 @@ RUBY_S="publicsuffix-ruby-${PV}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha:2 )"
 
diff --git a/dev-ruby/public_suffix/public_suffix-7.0.0.ebuild b/dev-ruby/public_suffix/public_suffix-7.0.0.ebuild
index 31dec497d46a..110298781de9 100644
--- a/dev-ruby/public_suffix/public_suffix-7.0.0.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-7.0.0.ebuild
@@ -18,7 +18,7 @@ RUBY_S="publicsuffix-ruby-${PV}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha:2 )"
 
diff --git a/dev-ruby/racc/racc-1.8.1.ebuild b/dev-ruby/racc/racc-1.8.1.ebuild
index 48a93751e1ab..082bc0ceba33 100644
--- a/dev-ruby/racc/racc-1.8.1.ebuild
+++ b/dev-ruby/racc/racc-1.8.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack-cache/rack-cache-1.17.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.17.0.ebuild
index bc22c9ec71db..924eb301b17f 100644
--- a/dev-ruby/rack-cache/rack-cache-1.17.0.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.17.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rack/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack-protection/rack-protection-3.2.0.ebuild b/dev-ruby/rack-protection/rack-protection-3.2.0.ebuild
index 971d331a40dd..f113fb923cdd 100644
--- a/dev-ruby/rack-protection/rack-protection-3.2.0.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-3.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://sinatrarb.com/protection/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack-protection/rack-protection-4.1.1.ebuild b/dev-ruby/rack-protection/rack-protection-4.1.1.ebuild
index 88ae930ba26e..16d31772a26b 100644
--- a/dev-ruby/rack-protection/rack-protection-4.1.1.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-4.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://sinatrarb.com/protection/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/base64-0.1.0
diff --git a/dev-ruby/rack-protection/rack-protection-4.2.0.ebuild b/dev-ruby/rack-protection/rack-protection-4.2.0.ebuild
index 9205a0cda8db..abc82f9a4558 100644
--- a/dev-ruby/rack-protection/rack-protection-4.2.0.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-4.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://sinatrarb.com/protection/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/base64-0.1.0
diff --git a/dev-ruby/rack-protection/rack-protection-4.2.1.ebuild b/dev-ruby/rack-protection/rack-protection-4.2.1.ebuild
index 9205a0cda8db..abc82f9a4558 100644
--- a/dev-ruby/rack-protection/rack-protection-4.2.1.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-4.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://sinatrarb.com/protection/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/base64-0.1.0
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.2.0.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.2.0.ebuild
index 4f3f02957050..1d905ef390a1 100644
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.2.0.ebuild
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.2.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/activesupport-5.0.0:*
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.3.0.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.3.0.ebuild
index 7daa774aa481..5ec58fa08937 100644
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.3.0.ebuild
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.3.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/activesupport-5.0.0:*
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.2.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.2.ebuild
index d2ee32206e8c..4c245132f941 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.2.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rails/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/loofah-2.21:0 >=dev-ruby/nokogiri-1.16.8:0"
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.3.0.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.3.0.ebuild
index e10c57b33a2a..dc1df2c525c0 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.3.0.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rake-compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/rake"
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.3.1.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.3.1.ebuild
index 0985f44f3fa5..b49301995fd2 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.3.1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rake-compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/rake"
diff --git a/dev-ruby/rake/rake-13.2.1.ebuild b/dev-ruby/rake/rake-13.2.1.ebuild
index 6f3bba54d670..b6fe45a229d2 100644
--- a/dev-ruby/rake/rake-13.2.1.ebuild
+++ b/dev-ruby/rake/rake-13.2.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 BDEPEND+=" app-alternatives/gzip"
diff --git a/dev-ruby/rake/rake-13.3.0.ebuild b/dev-ruby/rake/rake-13.3.0.ebuild
index 433bc0694294..e91a594d365e 100644
--- a/dev-ruby/rake/rake-13.3.0.ebuild
+++ b/dev-ruby/rake/rake-13.3.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="app-alternatives/gzip"
diff --git a/dev-ruby/rake/rake-13.3.1.ebuild b/dev-ruby/rake/rake-13.3.1.ebuild
index f1099d737e2e..43e09c448866 100644
--- a/dev-ruby/rake/rake-13.3.1.ebuild
+++ b/dev-ruby/rake/rake-13.3.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="app-alternatives/gzip"
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.11.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.11.1.ebuild
index b417e590ee28..a8a26b36aa24 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.11.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.11.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/guard/rb-inotify/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/ffi:0"
diff --git a/dev-ruby/rbs/rbs-3.6.1.ebuild b/dev-ruby/rbs/rbs-3.6.1.ebuild
index 73f905969090..8b24157f8b8e 100644
--- a/dev-ruby/rbs/rbs-3.6.1.ebuild
+++ b/dev-ruby/rbs/rbs-3.6.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/logger"
diff --git a/dev-ruby/rbs/rbs-3.8.1.ebuild b/dev-ruby/rbs/rbs-3.8.1.ebuild
index b70f831dae4b..c59b45efd332 100644
--- a/dev-ruby/rbs/rbs-3.8.1.ebuild
+++ b/dev-ruby/rbs/rbs-3.8.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/logger"
diff --git a/dev-ruby/rbs/rbs-3.9.4.ebuild b/dev-ruby/rbs/rbs-3.9.4.ebuild
index 16d8dc7afdb0..61689e1e5fed 100644
--- a/dev-ruby/rbs/rbs-3.9.4.ebuild
+++ b/dev-ruby/rbs/rbs-3.9.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/logger"
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.7.3.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.7.3.ebuild
index 3cb9968d971b..a727cf6b7e16 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.7.3.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.7.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/davidfstr/rdiscount"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	# Hanna is broken for us and therefore we don't have it in portage.
diff --git a/dev-ruby/rdoc/rdoc-6.11.0.ebuild b/dev-ruby/rdoc/rdoc-6.11.0.ebuild
index d58352d3755f..c36225e32fe1 100644
--- a/dev-ruby/rdoc/rdoc-6.11.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.11.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.13.1.ebuild b/dev-ruby/rdoc/rdoc-6.13.1.ebuild
index af8c03729bdc..1b1f2cfd3ccf 100644
--- a/dev-ruby/rdoc/rdoc-6.13.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.13.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.14.0.ebuild b/dev-ruby/rdoc/rdoc-6.14.0.ebuild
index c31cbe69d264..cc69d71816d2 100644
--- a/dev-ruby/rdoc/rdoc-6.14.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.14.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.14.1-r1.ebuild b/dev-ruby/rdoc/rdoc-6.14.1-r1.ebuild
index e091099e9c11..ee24ea6fac71 100644
--- a/dev-ruby/rdoc/rdoc-6.14.1-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.14.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.14.1.ebuild b/dev-ruby/rdoc/rdoc-6.14.1.ebuild
index 2f49d100ad9d..5b8479425142 100644
--- a/dev-ruby/rdoc/rdoc-6.14.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.14.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.14.2-r1.ebuild b/dev-ruby/rdoc/rdoc-6.14.2-r1.ebuild
index 89a7d5ae4a98..6f80e9f3ca60 100644
--- a/dev-ruby/rdoc/rdoc-6.14.2-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.14.2-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.15.0.ebuild b/dev-ruby/rdoc/rdoc-6.15.0.ebuild
index f6094fbcc73c..41c6dfd549b9 100644
--- a/dev-ruby/rdoc/rdoc-6.15.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.15.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.15.1.ebuild b/dev-ruby/rdoc/rdoc-6.15.1.ebuild
index 1469c8a41d4d..87e4f841de99 100644
--- a/dev-ruby/rdoc/rdoc-6.15.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.15.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.16.1.ebuild b/dev-ruby/rdoc/rdoc-6.16.1.ebuild
index 1469c8a41d4d..87e4f841de99 100644
--- a/dev-ruby/rdoc/rdoc-6.16.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.16.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/rdoc/rdoc-6.8.1.ebuild b/dev-ruby/rdoc/rdoc-6.8.1.ebuild
index a3b89496f7ae..c681051c6ab7 100644
--- a/dev-ruby/rdoc/rdoc-6.8.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.8.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=app-eselect/eselect-ruby-20181225"
diff --git a/dev-ruby/redcloth/redcloth-4.3.4.ebuild b/dev-ruby/redcloth/redcloth-4.3.4.ebuild
index 360f8015412a..33004c204c0b 100644
--- a/dev-ruby/redcloth/redcloth-4.3.4.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.4.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/jgarber/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAK
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/reline/reline-0.6.1.ebuild b/dev-ruby/reline/reline-0.6.1.ebuild
index f1021e5d2fc0..7930f789f5c7 100644
--- a/dev-ruby/reline/reline-0.6.1.ebuild
+++ b/dev-ruby/reline/reline-0.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
 
diff --git a/dev-ruby/reline/reline-0.6.2.ebuild b/dev-ruby/reline/reline-0.6.2.ebuild
index 22a659d97e22..704107e9ea82 100644
--- a/dev-ruby/reline/reline-0.6.2.ebuild
+++ b/dev-ruby/reline/reline-0.6.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
 
diff --git a/dev-ruby/reline/reline-0.6.3.ebuild b/dev-ruby/reline/reline-0.6.3.ebuild
index 1bc6876f1564..e71f02abbdba 100644
--- a/dev-ruby/reline/reline-0.6.3.ebuild
+++ b/dev-ruby/reline/reline-0.6.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
 
diff --git a/dev-ruby/repl_type_completor/repl_type_completor-0.1.11.ebuild b/dev-ruby/repl_type_completor/repl_type_completor-0.1.11.ebuild
index 704f889ea41c..126a0dd12b1b 100644
--- a/dev-ruby/repl_type_completor/repl_type_completor-0.1.11.ebuild
+++ b/dev-ruby/repl_type_completor/repl_type_completor-0.1.11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/repl_type_completor/archive/v${PV}.tar.gz -> ${
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/repl_type_completor/repl_type_completor-0.1.12.ebuild b/dev-ruby/repl_type_completor/repl_type_completor-0.1.12.ebuild
index 687b49a806f0..c6fcd36ea5f5 100644
--- a/dev-ruby/repl_type_completor/repl_type_completor-0.1.12.ebuild
+++ b/dev-ruby/repl_type_completor/repl_type_completor-0.1.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/repl_type_completor/archive/v${PV}.tar.gz -> ${
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/resolv-replace/resolv-replace-0.1.1.ebuild b/dev-ruby/resolv-replace/resolv-replace-0.1.1.ebuild
index b6aac50f6f70..88b7cb7b62f4 100644
--- a/dev-ruby/resolv-replace/resolv-replace-0.1.1.ebuild
+++ b/dev-ruby/resolv-replace/resolv-replace-0.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/resolv-replace/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "dev-ruby/resolv"
 
diff --git a/dev-ruby/resolv/resolv-0.6.2.ebuild b/dev-ruby/resolv/resolv-0.6.2.ebuild
index 61605bf5d891..4a8d2d4f6abb 100644
--- a/dev-ruby/resolv/resolv-0.6.2.ebuild
+++ b/dev-ruby/resolv/resolv-0.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/resolv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/resolv/resolv-0.6.3.ebuild b/dev-ruby/resolv/resolv-0.6.3.ebuild
index 61605bf5d891..4a8d2d4f6abb 100644
--- a/dev-ruby/resolv/resolv-0.6.3.ebuild
+++ b/dev-ruby/resolv/resolv-0.6.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/resolv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/resolv/resolv-0.7.0.ebuild b/dev-ruby/resolv/resolv-0.7.0.ebuild
index 61605bf5d891..4a8d2d4f6abb 100644
--- a/dev-ruby/resolv/resolv-0.7.0.ebuild
+++ b/dev-ruby/resolv/resolv-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/resolv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/rexical/rexical-1.0.8.ebuild b/dev-ruby/rexical/rexical-1.0.8.ebuild
index 6712ec434f6f..af98fdea84de 100644
--- a/dev-ruby/rexical/rexical-1.0.8.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.8.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/sparklemotion/rexical/tree/master"
 LICENSE="LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # File collision, bug 459116
diff --git a/dev-ruby/rexml/rexml-3.4.2.ebuild b/dev-ruby/rexml/rexml-3.4.2.ebuild
index 305120444c7f..7ee747d9b606 100644
--- a/dev-ruby/rexml/rexml-3.4.2.ebuild
+++ b/dev-ruby/rexml/rexml-3.4.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "dev-ruby/strscan"
 
diff --git a/dev-ruby/rexml/rexml-3.4.3.ebuild b/dev-ruby/rexml/rexml-3.4.3.ebuild
index a2d33edc4dbe..acc425cbf91e 100644
--- a/dev-ruby/rexml/rexml-3.4.3.ebuild
+++ b/dev-ruby/rexml/rexml-3.4.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "dev-ruby/strscan"
 
diff --git a/dev-ruby/rexml/rexml-3.4.4.ebuild b/dev-ruby/rexml/rexml-3.4.4.ebuild
index a2d33edc4dbe..acc425cbf91e 100644
--- a/dev-ruby/rexml/rexml-3.4.4.ebuild
+++ b/dev-ruby/rexml/rexml-3.4.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "dev-ruby/strscan"
 
diff --git a/dev-ruby/rinda/rinda-0.2.0.ebuild b/dev-ruby/rinda/rinda-0.2.0.ebuild
index 98b13c61f90a..e4fdfa4e48b6 100644
--- a/dev-ruby/rinda/rinda-0.2.0.ebuild
+++ b/dev-ruby/rinda/rinda-0.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/rinda/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/rr/rr-3.1.1.ebuild b/dev-ruby/rr/rr-3.1.1.ebuild
index d34357e674c5..71c9eb2650c4 100644
--- a/dev-ruby/rr/rr-3.1.1.ebuild
+++ b/dev-ruby/rr/rr-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rr/rr-3.1.2.ebuild b/dev-ruby/rr/rr-3.1.2.ebuild
index 2cc3907558d0..b681a677f95f 100644
--- a/dev-ruby/rr/rr-3.1.2.ebuild
+++ b/dev-ruby/rr/rr-3.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.9.0-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.9.0-r1.ebuild
index 0c4b1a744674..91f8d90701b9 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.9.0-r1.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.9.0-r1.ebuild
@@ -18,7 +18,7 @@ RUBY_S="${MY_P}/bindings/ruby"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/rspec-core/rspec-core-3.13.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.13.3.ebuild
index ea35d5441bb1..22dab15292cc 100644
--- a/dev-ruby/rspec-core/rspec-core-3.13.3.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.13.3.ebuild
@@ -22,7 +22,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="highlight test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-core/rspec-core-3.13.4.ebuild b/dev-ruby/rspec-core/rspec-core-3.13.4.ebuild
index 37ef32b95920..6edb46e4cacf 100644
--- a/dev-ruby/rspec-core/rspec-core-3.13.4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.13.4.ebuild
@@ -23,7 +23,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="highlight test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-core/rspec-core-3.13.5.ebuild b/dev-ruby/rspec-core/rspec-core-3.13.5.ebuild
index 37ef32b95920..6edb46e4cacf 100644
--- a/dev-ruby/rspec-core/rspec-core-3.13.5.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.13.5.ebuild
@@ -23,7 +23,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="highlight test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-core/rspec-core-3.13.6.ebuild b/dev-ruby/rspec-core/rspec-core-3.13.6.ebuild
index 37ef32b95920..6edb46e4cacf 100644
--- a/dev-ruby/rspec-core/rspec-core-3.13.6.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.13.6.ebuild
@@ -23,7 +23,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="highlight test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.13.3.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.13.3.ebuild
index c67076825817..f4dcce7da66a 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.13.3.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.13.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.13.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.13.4.ebuild
index b14e7a286759..266c2628ad53 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.13.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.13.4.ebuild
@@ -20,7 +20,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.13.5.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.13.5.ebuild
index 73997144bf93..78f7b9c7c3f5 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.13.5.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.13.5.ebuild
@@ -21,7 +21,7 @@ RUBY_S="rspec-rspec-expecations-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.13.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.13.2.ebuild
index d5c0f2a06f5d..5927280e242a 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.13.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.13.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.13.4.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.13.4.ebuild
index 0d3179c5fc62..5edb11b3e98b 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.13.4.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.13.4.ebuild
@@ -20,7 +20,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.13.5.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.13.5.ebuild
index 8b3ced8a9ae9..3a262deb20a4 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.13.5.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.13.5.ebuild
@@ -20,7 +20,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.13.6.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.13.6.ebuild
index 8b3ced8a9ae9..3a262deb20a4 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.13.6.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.13.6.ebuild
@@ -20,7 +20,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.13.7.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.13.7.ebuild
index 8b3ced8a9ae9..3a262deb20a4 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.13.7.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.13.7.ebuild
@@ -20,7 +20,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/rspec-support-3.13.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.13.2.ebuild
index 685929788771..185c3727a6c7 100644
--- a/dev-ruby/rspec-support/rspec-support-3.13.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.13.2.ebuild
@@ -19,7 +19,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.13.4.ebuild b/dev-ruby/rspec-support/rspec-support-3.13.4.ebuild
index ba8c30c8c436..c8e333ce4974 100644
--- a/dev-ruby/rspec-support/rspec-support-3.13.4.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.13.4.ebuild
@@ -20,7 +20,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.13.5.ebuild b/dev-ruby/rspec-support/rspec-support-3.13.5.ebuild
index ba8c30c8c436..c8e333ce4974 100644
--- a/dev-ruby/rspec-support/rspec-support-3.13.5.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.13.5.ebuild
@@ -20,7 +20,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.13.6.ebuild b/dev-ruby/rspec-support/rspec-support-3.13.6.ebuild
index 4b56b93284e7..095c6e9f3f88 100644
--- a/dev-ruby/rspec-support/rspec-support-3.13.6.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.13.6.ebuild
@@ -20,7 +20,7 @@ RUBY_S="rspec-${PN}-v${PV}/${PN}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rss/rss-0.3.1.ebuild b/dev-ruby/rss/rss-0.3.1.ebuild
index b0310f187f5e..f997680f8a5b 100644
--- a/dev-ruby/rss/rss-0.3.1.ebuild
+++ b/dev-ruby/rss/rss-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ruby/rss/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/rexml"
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild
index 9bba0bc1f4ad..99f221907774 100644
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild
+++ b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
 
 LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="test"
 
 DEPEND="${DEPEND} sys-apps/file test? ( >=sys-apps/file-5.30 )"
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0-r1.ebuild
index 3125aee70dd4..654140eae873 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0-r1.ebuild
@@ -18,7 +18,7 @@ RUBY_S="ruby-progressbar-releases-v${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_bdepend "test? ( dev-ruby/timecop )"
 
diff --git a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
index b13f8ce06f8e..757e570452b7 100644
--- a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
+++ b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://0xcc.net/ruby-romkan/${P}.tar.gz"
 
 LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
 
 DOCS="ChangeLog *.rd"
 
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.5.2.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.5.2.ebuild
index 68e45f6ff16e..00c0073fe6fe 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.5.2.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.5.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.21.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.21.1.ebuild
index 4a2aa1b7ed1f..c08841d4f0b3 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.21.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.21.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/racc-1.5:0 >=dev-ruby/sexp_processor-4.16.0:4"
diff --git a/dev-ruby/rubygems/rubygems-3.4.22.ebuild b/dev-ruby/rubygems/rubygems-3.4.22.ebuild
index 636d132787ed..68baf0615200 100644
--- a/dev-ruby/rubygems/rubygems-3.4.22.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.4.22.ebuild
@@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.5.23.ebuild b/dev-ruby/rubygems/rubygems-3.5.23.ebuild
index 3746616b062a..d15b676fa4a0 100644
--- a/dev-ruby/rubygems/rubygems-3.5.23.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.5.23.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby MIT )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="server test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/rubygems/rubygems-3.6.7.ebuild b/dev-ruby/rubygems/rubygems-3.6.7.ebuild
index 1b4608ee6061..73efeecd411a 100644
--- a/dev-ruby/rubygems/rubygems-3.6.7.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.6.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby MIT )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="server test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/rubygems/rubygems-3.6.8.ebuild b/dev-ruby/rubygems/rubygems-3.6.8.ebuild
index 1b4608ee6061..73efeecd411a 100644
--- a/dev-ruby/rubygems/rubygems-3.6.8.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.6.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby MIT )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="server test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/rubygems/rubygems-3.6.9.ebuild b/dev-ruby/rubygems/rubygems-3.6.9.ebuild
index b68fb1377f7d..6991db4371bc 100644
--- a/dev-ruby/rubygems/rubygems-3.6.9.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.6.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby MIT )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="server test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/rubygems/rubygems-3.7.0.ebuild b/dev-ruby/rubygems/rubygems-3.7.0.ebuild
index bcb72012a455..1bdac76449c9 100644
--- a/dev-ruby/rubygems/rubygems-3.7.0.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby MIT )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="server test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/rubygems/rubygems-3.7.1.ebuild b/dev-ruby/rubygems/rubygems-3.7.1.ebuild
index bcb72012a455..1bdac76449c9 100644
--- a/dev-ruby/rubygems/rubygems-3.7.1.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby MIT )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="server test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/rubygems/rubygems-3.7.2.ebuild b/dev-ruby/rubygems/rubygems-3.7.2.ebuild
index bcb72012a455..1bdac76449c9 100644
--- a/dev-ruby/rubygems/rubygems-3.7.2.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( Ruby MIT )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="server test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild b/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
index 913b9ef17e3e..0f0f7aee81bb 100644
--- a/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="test"
 
diff --git a/dev-ruby/sass/sass-3.7.4-r2.ebuild b/dev-ruby/sass/sass-3.7.4-r2.ebuild
index eab3c4c6f1e4..6c5cc9265a52 100644
--- a/dev-ruby/sass/sass-3.7.4-r2.ebuild
+++ b/dev-ruby/sass/sass-3.7.4-r2.ebuild
@@ -20,7 +20,7 @@ RUBY_S="ruby-sass-${PV}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/sass/sass-3.7.4-r3.ebuild b/dev-ruby/sass/sass-3.7.4-r3.ebuild
index 9017135b93a2..88811008713a 100644
--- a/dev-ruby/sass/sass-3.7.4-r3.ebuild
+++ b/dev-ruby/sass/sass-3.7.4-r3.ebuild
@@ -22,7 +22,7 @@ RUBY_S="ruby-sass-${PV}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/securerandom/securerandom-0.4.1.ebuild b/dev-ruby/securerandom/securerandom-0.4.1.ebuild
index 3c3a76e328ab..c2516e8513d9 100644
--- a/dev-ruby/securerandom/securerandom-0.4.1.ebuild
+++ b/dev-ruby/securerandom/securerandom-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/securerandom/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.17.3.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.17.3.ebuild
index 80df75770449..a9d1ee658c06 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.17.3.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.17.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.17.4.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.17.4.ebuild
index 54f9cabad1c3..92671780d0b9 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.17.4.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.17.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/singleton/singleton-0.2.0.ebuild b/dev-ruby/singleton/singleton-0.2.0.ebuild
index 1de8ff491b32..e34c10bedada 100644
--- a/dev-ruby/singleton/singleton-0.2.0.ebuild
+++ b/dev-ruby/singleton/singleton-0.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/singleton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/singleton/singleton-0.3.0.ebuild b/dev-ruby/singleton/singleton-0.3.0.ebuild
index c613bda2716c..f62dc9a36b86 100644
--- a/dev-ruby/singleton/singleton-0.3.0.ebuild
+++ b/dev-ruby/singleton/singleton-0.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/singleton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	sed -e 's/__dir__/"."/' \
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.5.2.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.5.2.ebuild
index f0cbdd945693..fad74a0be374 100644
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.5.2.ebuild
+++ b/dev-ruby/sprockets-rails/sprockets-rails-3.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="test"
 
diff --git a/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild
index 50cd5b66b84e..d1c235e81790 100644
--- a/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild
+++ b/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}/${P}-erb-deprecation.patch"
diff --git a/dev-ruby/sprockets/sprockets-4.2.2.ebuild b/dev-ruby/sprockets/sprockets-4.2.2.ebuild
index 262c4c24e5e5..a074e9e2a427 100644
--- a/dev-ruby/sprockets/sprockets-4.2.2.ebuild
+++ b/dev-ruby/sprockets/sprockets-4.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild b/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
index 1d8ade469d87..051662a50035 100644
--- a/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 # We track the bundled sqlite version here
diff --git a/dev-ruby/sqlite3/sqlite3-2.7.3.ebuild b/dev-ruby/sqlite3/sqlite3-2.7.3.ebuild
index e76b754079de..dbdd77ec1c93 100644
--- a/dev-ruby/sqlite3/sqlite3-2.7.3.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-2.7.3.ebuild
@@ -23,7 +23,7 @@ RUBY_S="sqlite3-ruby-${PV}"
 LICENSE="BSD"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 # We track the bundled sqlite version here
diff --git a/dev-ruby/sqlite3/sqlite3-2.7.4.ebuild b/dev-ruby/sqlite3/sqlite3-2.7.4.ebuild
index 74ee104b129f..f7185bcefcf6 100644
--- a/dev-ruby/sqlite3/sqlite3-2.7.4.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-2.7.4.ebuild
@@ -23,7 +23,7 @@ RUBY_S="sqlite3-ruby-${PV}"
 LICENSE="BSD"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 # We track the bundled sqlite version here
diff --git a/dev-ruby/sqlite3/sqlite3-2.8.0.ebuild b/dev-ruby/sqlite3/sqlite3-2.8.0.ebuild
index 3ed28dfae3f0..48968e582d0d 100644
--- a/dev-ruby/sqlite3/sqlite3-2.8.0.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-2.8.0.ebuild
@@ -23,7 +23,7 @@ RUBY_S="sqlite3-ruby-${PV}"
 LICENSE="BSD"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 # We track the bundled sqlite version here
diff --git a/dev-ruby/sqlite3/sqlite3-2.8.1.ebuild b/dev-ruby/sqlite3/sqlite3-2.8.1.ebuild
index 4aea315f1eb5..c5a4d6999344 100644
--- a/dev-ruby/sqlite3/sqlite3-2.8.1.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-2.8.1.ebuild
@@ -23,7 +23,7 @@ RUBY_S="sqlite3-ruby-${PV}"
 LICENSE="BSD"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 # We track the bundled sqlite version here
diff --git a/dev-ruby/stringio/stringio-3.1.6.ebuild b/dev-ruby/stringio/stringio-3.1.6.ebuild
index 46f3bf39fbac..858e771bc226 100644
--- a/dev-ruby/stringio/stringio-3.1.6.ebuild
+++ b/dev-ruby/stringio/stringio-3.1.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/stringio/stringio-3.1.7.ebuild b/dev-ruby/stringio/stringio-3.1.7.ebuild
index e9e7cc1f1d05..78909379a291 100644
--- a/dev-ruby/stringio/stringio-3.1.7.ebuild
+++ b/dev-ruby/stringio/stringio-3.1.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/stringio/stringio-3.1.8.ebuild b/dev-ruby/stringio/stringio-3.1.8.ebuild
index 3ad7966a2560..401f69e58497 100644
--- a/dev-ruby/stringio/stringio-3.1.8.ebuild
+++ b/dev-ruby/stringio/stringio-3.1.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/stringio/stringio-3.1.9.ebuild b/dev-ruby/stringio/stringio-3.1.9.ebuild
index 3ad7966a2560..401f69e58497 100644
--- a/dev-ruby/stringio/stringio-3.1.9.ebuild
+++ b/dev-ruby/stringio/stringio-3.1.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/stringio/stringio-3.2.0.ebuild b/dev-ruby/stringio/stringio-3.2.0.ebuild
index 3ad7966a2560..401f69e58497 100644
--- a/dev-ruby/stringio/stringio-3.2.0.ebuild
+++ b/dev-ruby/stringio/stringio-3.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/strscan/strscan-3.1.2.ebuild b/dev-ruby/strscan/strscan-3.1.2.ebuild
index 6a0e068b24b9..7782b9a7fb35 100644
--- a/dev-ruby/strscan/strscan-3.1.2.ebuild
+++ b/dev-ruby/strscan/strscan-3.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/strscan/strscan-3.1.5.ebuild b/dev-ruby/strscan/strscan-3.1.5.ebuild
index 84a51e1cfd42..c64110e507b1 100644
--- a/dev-ruby/strscan/strscan-3.1.5.ebuild
+++ b/dev-ruby/strscan/strscan-3.1.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/strscan/strscan-3.1.6.ebuild b/dev-ruby/strscan/strscan-3.1.6.ebuild
index 039067f65778..0e1abeb9b383 100644
--- a/dev-ruby/strscan/strscan-3.1.6.ebuild
+++ b/dev-ruby/strscan/strscan-3.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 1fe55070e01d..c594ee7a0ac4 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/syslog/syslog-0.2.0.ebuild b/dev-ruby/syslog/syslog-0.2.0.ebuild
index 6557ac29cbee..18ce1e210e38 100644
--- a/dev-ruby/syslog/syslog-0.2.0.ebuild
+++ b/dev-ruby/syslog/syslog-0.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/syslog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/syslog/syslog-0.3.0.ebuild b/dev-ruby/syslog/syslog-0.3.0.ebuild
index 15fec1234f5d..5b8567f68d96 100644
--- a/dev-ruby/syslog/syslog-0.3.0.ebuild
+++ b/dev-ruby/syslog/syslog-0.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/syslog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/tdiff/tdiff-0.4.0.ebuild b/dev-ruby/tdiff/tdiff-0.4.0.ebuild
index 6dc7ff205e5c..5a5768800892 100644
--- a/dev-ruby/tdiff/tdiff-0.4.0.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.4.0.ebuild
@@ -15,5 +15,5 @@ DESCRIPTION="Calculates the differences between two tree-like structures"
 HOMEPAGE="https://github.com/postmodern/tdiff"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x64-macos ~x64-solaris"
 SLOT="0"
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.11.2.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.11.2.ebuild
index 909920c368fa..704e10d407ac 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.11.2.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.11.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/flori/term-ansicolor"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend ">=dev-ruby/tins-1.0"
 
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.11.3.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.11.3.ebuild
index b2171451e914..32f6ae167c94 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.11.3.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.11.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/flori/term-ansicolor"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend ">=dev-ruby/tins-1.0"
 
diff --git a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.10.ebuild b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.10.ebuild
index b1deb5f51e39..0ae30b5c4473 100644
--- a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.10.ebuild
+++ b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.10.ebuild
@@ -14,6 +14,6 @@ HOMEPAGE="https://github.com/ruby/test-unit-ruby-core"
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "dev-ruby/test-unit"
diff --git a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.13.ebuild b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.13.ebuild
index 1c334e742ac4..36a6db02ec8c 100644
--- a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.13.ebuild
+++ b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.13.ebuild
@@ -14,6 +14,6 @@ HOMEPAGE="https://github.com/ruby/test-unit-ruby-core"
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "dev-ruby/test-unit"
diff --git a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.14.ebuild b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.14.ebuild
index 1c334e742ac4..36a6db02ec8c 100644
--- a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.14.ebuild
+++ b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.14.ebuild
@@ -14,6 +14,6 @@ HOMEPAGE="https://github.com/ruby/test-unit-ruby-core"
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "dev-ruby/test-unit"
diff --git a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.6.ebuild b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.6.ebuild
index 7d3936dc80b5..69712ac024b7 100644
--- a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.6.ebuild
+++ b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.6.ebuild
@@ -13,4 +13,4 @@ HOMEPAGE="https://github.com/ruby/test-unit-ruby-core"
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/test-unit/test-unit-3.6.7.ebuild b/dev-ruby/test-unit/test-unit-3.6.7.ebuild
index d2eaf068bc6f..16a39f256a74 100644
--- a/dev-ruby/test-unit/test-unit-3.6.7.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.6.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.6.8.ebuild b/dev-ruby/test-unit/test-unit-3.6.8.ebuild
index d46ee8fae925..ab16d92598a7 100644
--- a/dev-ruby/test-unit/test-unit-3.6.8.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.6.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.6.9.ebuild b/dev-ruby/test-unit/test-unit-3.6.9.ebuild
index 154ad15479ed..90baad0c368f 100644
--- a/dev-ruby/test-unit/test-unit-3.6.9.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.6.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.7.0.ebuild b/dev-ruby/test-unit/test-unit-3.7.0.ebuild
index 154ad15479ed..90baad0c368f 100644
--- a/dev-ruby/test-unit/test-unit-3.7.0.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.7.1.ebuild b/dev-ruby/test-unit/test-unit-3.7.1.ebuild
index 154ad15479ed..90baad0c368f 100644
--- a/dev-ruby/test-unit/test-unit-3.7.1.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.7.3.ebuild b/dev-ruby/test-unit/test-unit-3.7.3.ebuild
index 154ad15479ed..90baad0c368f 100644
--- a/dev-ruby/test-unit/test-unit-3.7.3.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.7.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.5.0.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.5.0.ebuild
index a57eafbffa39..f8479419f63d 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.5.0.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.5.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/text-hyphen"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/thor/thor-1.3.2.ebuild b/dev-ruby/thor/thor-1.3.2.ebuild
index 282004d3e198..38f5cfe92795 100644
--- a/dev-ruby/thor/thor-1.3.2.ebuild
+++ b/dev-ruby/thor/thor-1.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc"
 
 # For initial target porting (new rubies), we can make these test deps
diff --git a/dev-ruby/thor/thor-1.4.0.ebuild b/dev-ruby/thor/thor-1.4.0.ebuild
index afab77eb22d9..382823c3bd3c 100644
--- a/dev-ruby/thor/thor-1.4.0.ebuild
+++ b/dev-ruby/thor/thor-1.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc"
 
 # For initial target porting (new rubies), we can make these test deps
diff --git a/dev-ruby/thread_order/thread_order-1.1.1.ebuild b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
index d2bf52e504cf..c83ecb727e07 100644
--- a/dev-ruby/thread_order/thread_order-1.1.1.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JoshCheek/thread_order"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
 	# Avoid failing spec that already has exceptions for some ruby
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6-r3.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6-r3.ebuild
index d9e1d3e6bc0f..7d0c24f6f31b 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6-r3.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 each_ruby_prepare() {
diff --git a/dev-ruby/tilt/tilt-2.6.0.ebuild b/dev-ruby/tilt/tilt-2.6.0.ebuild
index 601f38471c99..fd2385729d09 100644
--- a/dev-ruby/tilt/tilt-2.6.0.ebuild
+++ b/dev-ruby/tilt/tilt-2.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jeremyevans/tilt/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Block on some of the potential test dependencies. These dependencies
 # are optional for the test suite, and we don't want to depend on all of
diff --git a/dev-ruby/tilt/tilt-2.6.1.ebuild b/dev-ruby/tilt/tilt-2.6.1.ebuild
index 66e008dac612..f16a5d0b6de9 100644
--- a/dev-ruby/tilt/tilt-2.6.1.ebuild
+++ b/dev-ruby/tilt/tilt-2.6.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jeremyevans/tilt/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 # Block on some of the potential test dependencies. These dependencies
 # are optional for the test suite, and we don't want to depend on all of
diff --git a/dev-ruby/time/time-0.4.1.ebuild b/dev-ruby/time/time-0.4.1.ebuild
index dea437f59fb0..e83d236a1971 100644
--- a/dev-ruby/time/time-0.4.1.ebuild
+++ b/dev-ruby/time/time-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/date"
diff --git a/dev-ruby/time/time-0.4.2.ebuild b/dev-ruby/time/time-0.4.2.ebuild
index a3b0b0e26e6e..d595e74724fe 100644
--- a/dev-ruby/time/time-0.4.2.ebuild
+++ b/dev-ruby/time/time-0.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/date"
diff --git a/dev-ruby/timeout/timeout-0.4.3.ebuild b/dev-ruby/timeout/timeout-0.4.3.ebuild
index e03e53510ed5..ec15d7d9e5be 100644
--- a/dev-ruby/timeout/timeout-0.4.3.ebuild
+++ b/dev-ruby/timeout/timeout-0.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/timeout/timeout-0.4.4.ebuild b/dev-ruby/timeout/timeout-0.4.4.ebuild
index 5d889aad5435..6a919495273d 100644
--- a/dev-ruby/timeout/timeout-0.4.4.ebuild
+++ b/dev-ruby/timeout/timeout-0.4.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/timeout/timeout-0.5.0.ebuild b/dev-ruby/timeout/timeout-0.5.0.ebuild
index 5d889aad5435..6a919495273d 100644
--- a/dev-ruby/timeout/timeout-0.5.0.ebuild
+++ b/dev-ruby/timeout/timeout-0.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/timeout/timeout-0.6.0.ebuild b/dev-ruby/timeout/timeout-0.6.0.ebuild
index 5d889aad5435..6a919495273d 100644
--- a/dev-ruby/timeout/timeout-0.6.0.ebuild
+++ b/dev-ruby/timeout/timeout-0.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/treetop/treetop-1.6.14.ebuild b/dev-ruby/treetop/treetop-1.6.14.ebuild
index a27e73e48ab4..961cba55977e 100644
--- a/dev-ruby/treetop/treetop-1.6.14.ebuild
+++ b/dev-ruby/treetop/treetop-1.6.14.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/cjheath/treetop/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
diff --git a/dev-ruby/tsort/tsort-0.2.0-r1.ebuild b/dev-ruby/tsort/tsort-0.2.0-r1.ebuild
index cae2ed19f007..d03f8693e908 100644
--- a/dev-ruby/tsort/tsort-0.2.0-r1.ebuild
+++ b/dev-ruby/tsort/tsort-0.2.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/tsort/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_depend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
diff --git a/dev-ruby/typeprof/typeprof-0.30.1-r1.ebuild b/dev-ruby/typeprof/typeprof-0.30.1-r1.ebuild
index ea92bde28f2d..91c52348a16f 100644
--- a/dev-ruby/typeprof/typeprof-0.30.1-r1.ebuild
+++ b/dev-ruby/typeprof/typeprof-0.30.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	dev-ruby/prism
diff --git a/dev-ruby/typeprof/typeprof-0.31.0.ebuild b/dev-ruby/typeprof/typeprof-0.31.0.ebuild
index 9d576a8b3f9d..5baffd83ee23 100644
--- a/dev-ruby/typeprof/typeprof-0.31.0.ebuild
+++ b/dev-ruby/typeprof/typeprof-0.31.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend "
 	>=dev-ruby/prism-1.4.0
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild
index dc01401ffe82..fd03a7ff957d 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/uglifier/uglifier-4.2.1.ebuild b/dev-ruby/uglifier/uglifier-4.2.1.ebuild
index 7674161eb0f0..289dc9371d00 100644
--- a/dev-ruby/uglifier/uglifier-4.2.1.ebuild
+++ b/dev-ruby/uglifier/uglifier-4.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="test"
 
diff --git a/dev-ruby/unf/unf-0.1.4-r1.ebuild b/dev-ruby/unf/unf-0.1.4-r1.ebuild
index 841a06e96130..9634e15329a9 100644
--- a/dev-ruby/unf/unf-0.1.4-r1.ebuild
+++ b/dev-ruby/unf/unf-0.1.4-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf/unf-0.2.0-r1.ebuild b/dev-ruby/unf/unf-0.2.0-r1.ebuild
index 8cf07f044916..3457c56ecf27 100644
--- a/dev-ruby/unf/unf-0.2.0-r1.ebuild
+++ b/dev-ruby/unf/unf-0.2.0-r1.ebuild
@@ -20,7 +20,7 @@ RUBY_S="ruby-${P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.9.1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.9.1.ebuild
index 525cc12e7c3a..fd2dffc3f3ec 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.9.1.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.9.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf_ext"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/uri/uri-1.0.4.ebuild b/dev-ruby/uri/uri-1.0.4.ebuild
index 05af898bbc62..6b53ab56aefe 100644
--- a/dev-ruby/uri/uri-1.0.4.ebuild
+++ b/dev-ruby/uri/uri-1.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/uri/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/uri/uri-1.1.0.ebuild b/dev-ruby/uri/uri-1.1.0.ebuild
index 05af898bbc62..6b53ab56aefe 100644
--- a/dev-ruby/uri/uri-1.1.0.ebuild
+++ b/dev-ruby/uri/uri-1.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/uri/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/uri/uri-1.1.1.ebuild b/dev-ruby/uri/uri-1.1.1.ebuild
index 89542ccd2282..14daf6778c04 100644
--- a/dev-ruby/uri/uri-1.1.1.ebuild
+++ b/dev-ruby/uri/uri-1.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/uri/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/webrick/webrick-1.7.0-r1.ebuild b/dev-ruby/webrick/webrick-1.7.0-r1.ebuild
index bbd8d899dc11..6938eaa14e77 100644
--- a/dev-ruby/webrick/webrick-1.7.0-r1.ebuild
+++ b/dev-ruby/webrick/webrick-1.7.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/webrick"
 SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/webrick/webrick-1.9.1.ebuild b/dev-ruby/webrick/webrick-1.9.1.ebuild
index 9f1710044563..981e4a6891af 100644
--- a/dev-ruby/webrick/webrick-1.9.1.ebuild
+++ b/dev-ruby/webrick/webrick-1.9.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_depend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/webrick/webrick-1.9.2.ebuild b/dev-ruby/webrick/webrick-1.9.2.ebuild
index b8f16736eaa2..1aed1ac325ea 100644
--- a/dev-ruby/webrick/webrick-1.9.2.ebuild
+++ b/dev-ruby/webrick/webrick-1.9.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_depend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r3.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r3.ebuild
index a1b0c7ce2462..155b8089453e 100644
--- a/dev-ruby/webrobots/webrobots-0.1.2-r3.ebuild
+++ b/dev-ruby/webrobots/webrobots-0.1.2-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/knu/webrobots"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild
index 1dd98c8151b0..fabfb8abeaf6 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/webrick"
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
index e8541aa8cae1..0d436225303d 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
 DEPEND="${DEPEND} dev-libs/yajl"
diff --git a/dev-ruby/yard/yard-0.9.37.ebuild b/dev-ruby/yard/yard-0.9.37.ebuild
index 8cbf7321bf78..fb6693e2e4bb 100644
--- a/dev-ruby/yard/yard-0.9.37.ebuild
+++ b/dev-ruby/yard/yard-0.9.37.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 PATCHES=(
diff --git a/dev-ruby/yard/yard-0.9.38.ebuild b/dev-ruby/yard/yard-0.9.38.ebuild
index 581ae652c222..42616bd5f096 100644
--- a/dev-ruby/yard/yard-0.9.38.ebuild
+++ b/dev-ruby/yard/yard-0.9.38.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
diff --git a/dev-ruby/zentest/zentest-4.12.2.ebuild b/dev-ruby/zentest/zentest-4.12.2.ebuild
index a3bf359c75fd..0fbb03763497 100644
--- a/dev-ruby/zentest/zentest-4.12.2.ebuild
+++ b/dev-ruby/zentest/zentest-4.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/zlib/zlib-3.2.1.ebuild b/dev-ruby/zlib/zlib-3.2.1.ebuild
index e169be7cf4ce..771c812a5f78 100644
--- a/dev-ruby/zlib/zlib-3.2.1.ebuild
+++ b/dev-ruby/zlib/zlib-3.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/zlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-ruby/zlib/zlib-3.2.2.ebuild b/dev-ruby/zlib/zlib-3.2.2.ebuild
index e169be7cf4ce..771c812a5f78 100644
--- a/dev-ruby/zlib/zlib-3.2.2.ebuild
+++ b/dev-ruby/zlib/zlib-3.2.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/zlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-scheme/gambit/gambit-4.9.5.ebuild b/dev-scheme/gambit/gambit-4.9.5.ebuild
index 05454c9d2d51..9a858a49afc6 100644
--- a/dev-scheme/gambit/gambit-4.9.5.ebuild
+++ b/dev-scheme/gambit/gambit-4.9.5.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}-1.tar.gz"
 
-	KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
diff --git a/dev-scheme/gauche/gauche-0.9.15-r1.ebuild b/dev-scheme/gauche/gauche-0.9.15-r1.ebuild
index 95768382c202..5c855708c89d 100644
--- a/dev-scheme/gauche/gauche-0.9.15-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.15-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)8"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-scheme/guile/guile-1.8.8-r103.ebuild b/dev-scheme/guile/guile-1.8.8-r103.ebuild
index de6d886283d4..a80d5cfacd6c 100644
--- a/dev-scheme/guile/guile-1.8.8-r103.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r103.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
 RESTRICT="!regex? ( test )"
 
diff --git a/dev-scheme/guile/guile-2.2.7-r103.ebuild b/dev-scheme/guile/guile-2.2.7-r103.ebuild
index fb35d7489a5f..b31baf77370d 100644
--- a/dev-scheme/guile/guile-2.2.7-r103.ebuild
+++ b/dev-scheme/guile/guile-2.2.7-r103.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="$(ver_cut 1-2)"  # See (guile)Parallel Installations.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
diff --git a/dev-scheme/guile/guile-3.0.10-r103.ebuild b/dev-scheme/guile/guile-3.0.10-r103.ebuild
index 3eed9c535509..60118d036259 100644
--- a/dev-scheme/guile/guile-3.0.10-r103.ebuild
+++ b/dev-scheme/guile/guile-3.0.10-r103.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="$(ver_cut 1-2)"  # See (guile)Parallel Installations.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 IUSE="debug debug-malloc +deprecated +jit +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug #596322
diff --git a/dev-scheme/scm/scm-5.5.6-r4.ebuild b/dev-scheme/scm/scm-5.5.6-r4.ebuild
index 0cbd50d876b1..9f7449e28565 100644
--- a/dev-scheme/scm/scm-5.5.6-r4.ebuild
+++ b/dev-scheme/scm/scm-5.5.6-r4.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}
 
 SLOT="0"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86"
 IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-scheme/slib/slib-3.3.1-r100.ebuild b/dev-scheme/slib/slib-3.3.1-r100.ebuild
index f948a37465bf..16095c427b1a 100644
--- a/dev-scheme/slib/slib-3.3.1-r100.ebuild
+++ b/dev-scheme/slib/slib-3.3.1-r100.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="public-domain BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="gambit scm"
 RESTRICT="mirror"
 REQUIRED_USE="${GUILE_REQUIRED_USE}"
diff --git a/dev-tcltk/blt/blt-2.5.3-r3.ebuild b/dev-tcltk/blt/blt-2.5.3-r3.ebuild
index 631de6c37ec9..3da073e7bd72 100644
--- a/dev-tcltk/blt/blt-2.5.3-r3.ebuild
+++ b/dev-tcltk/blt/blt-2.5.3-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/wize/${PN}-src-${PV}.zip
 IUSE="jpeg static-libs"
 SLOT="0/${SHVER}"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="
 	dev-lang/tk:0=
diff --git a/dev-tcltk/expect/expect-5.45.4-r5.ebuild b/dev-tcltk/expect/expect-5.45.4-r5.ebuild
index 2b182754f592..82c5864ac7bc 100644
--- a/dev-tcltk/expect/expect-5.45.4-r5.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4-r5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug doc test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/itcl/itcl-4.2.2.ebuild b/dev-tcltk/itcl/itcl-4.2.2.ebuild
index 1f57109bcd62..ba6c1f3a7c6d 100644
--- a/dev-tcltk/itcl/itcl-4.2.2.ebuild
+++ b/dev-tcltk/itcl/itcl-4.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tcltk/${PN}/archive/refs/tags/${MYP}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ppc ~riscv ~sparc x86"
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-tcltk/itcl/itcl-4.2.4-r1.ebuild b/dev-tcltk/itcl/itcl-4.2.4-r1.ebuild
index e7a24a6c0a95..48b55c22f660 100644
--- a/dev-tcltk/itcl/itcl-4.2.4-r1.ebuild
+++ b/dev-tcltk/itcl/itcl-4.2.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tcltk/${PN}/archive/refs/tags/${MYP}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86"
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-tcltk/itcl/itcl-4.3.1.ebuild b/dev-tcltk/itcl/itcl-4.3.1.ebuild
index 9f23659c8587..8490a74fa51f 100644
--- a/dev-tcltk/itcl/itcl-4.3.1.ebuild
+++ b/dev-tcltk/itcl/itcl-4.3.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MYP}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv ~sparc x86"
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-tcltk/itk/itk-4.1.0-r1.ebuild b/dev-tcltk/itk/itk-4.1.0-r1.ebuild
index 3d671d85be96..17076290f433 100644
--- a/dev-tcltk/itk/itk-4.1.0-r1.ebuild
+++ b/dev-tcltk/itk/itk-4.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~riscv ~sparc x86"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/itk/itk-4.1.0.ebuild b/dev-tcltk/itk/itk-4.1.0.ebuild
index ac44f4d1092d..313b81d79fa0 100644
--- a/dev-tcltk/itk/itk-4.1.0.ebuild
+++ b/dev-tcltk/itk/itk-4.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~riscv ~sparc x86"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/itk/itk-4.2.3-r2.ebuild b/dev-tcltk/itk/itk-4.2.3-r2.ebuild
index 31623e6248ea..9ff220014e46 100644
--- a/dev-tcltk/itk/itk-4.2.3-r2.ebuild
+++ b/dev-tcltk/itk/itk-4.2.3-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~riscv ~sparc x86"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild
index 4b9174b83464..e3698bcf3e2c 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="HPND Old-MIT tcltk"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1-r3.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1-r3.ebuild
index 6802bd053985..dde59ea0e1db 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.1.1-r3.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/incrtcl/%5BIncr%20Widgets%5D/${PV}/${
 
 LICENSE="HPND Old-MIT tcltk"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/snack/snack-2.2.10-r13.ebuild b/dev-tcltk/snack/snack-2.2.10-r13.ebuild
index 5692e253cb4c..175be0c2c3ab 100644
--- a/dev-tcltk/snack/snack-2.2.10-r13.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r13.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}${PV}/unix"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~sparc x86"
 IUSE="alsa examples python vorbis"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-tcltk/tablelist/tablelist-6.15.1.ebuild b/dev-tcltk/tablelist/tablelist-6.15.1.ebuild
index 238621e5bb3b..fd76e641722f 100644
--- a/dev-tcltk/tablelist/tablelist-6.15.1.ebuild
+++ b/dev-tcltk/tablelist/tablelist-6.15.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="tablelist"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="examples doc"
 
 RDEPEND="dev-lang/tcl:0"
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index ea05504268dd..10f9d47bebf5 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-tcltk/tcllib/tcllib-1.21.ebuild b/dev-tcltk/tcllib/tcllib-1.21.ebuild
index 7a6252526960..5df2e01906ce 100644
--- a/dev-tcltk/tcllib/tcllib-1.21.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-tcltk/tcllib/tcllib-2.0.ebuild b/dev-tcltk/tcllib/tcllib-2.0.ebuild
index 6d27dc299cc4..0831ad893d1f 100644
--- a/dev-tcltk/tcllib/tcllib-2.0.ebuild
+++ b/dev-tcltk/tcllib/tcllib-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
index f7c37a189fd5..29d7b1807313 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-tcltk/tclreadline/tclreadline-2.3.8-r2.ebuild b/dev-tcltk/tclreadline/tclreadline-2.3.8-r2.ebuild
index f19d330e2688..d5efdd8e6900 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.3.8-r2.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.3.8-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/flightaware/tclreadline/archive/v${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="tk"
 
 DEPEND="
diff --git a/dev-tcltk/tclreadline/tclreadline-2.4.0.ebuild b/dev-tcltk/tclreadline/tclreadline-2.4.0.ebuild
index 33a2e0b9e1da..8448aebc488d 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.4.0.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/flightaware/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="tk"
 
 DEPEND="
diff --git a/dev-tcltk/tclx/tclx-8.6.1.ebuild b/dev-tcltk/tclx/tclx-8.6.1.ebuild
index 673c27dadcb1..b382165e3eca 100644
--- a/dev-tcltk/tclx/tclx-8.6.1.ebuild
+++ b/dev-tcltk/tclx/tclx-8.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="threads"
 
 DEPEND="dev-lang/tcl:0="
diff --git a/dev-tcltk/tclx/tclx-8.6.3.ebuild b/dev-tcltk/tclx/tclx-8.6.3.ebuild
index 07f5353e5bc7..52beb037babb 100644
--- a/dev-tcltk/tclx/tclx-8.6.3.ebuild
+++ b/dev-tcltk/tclx/tclx-8.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="threads"
 
 DEPEND="dev-lang/tcl:0="
diff --git a/dev-tcltk/tdom/tdom-0.9.3.ebuild b/dev-tcltk/tdom/tdom-0.9.3.ebuild
index 76d54632a1d7..4f9ed0904a75 100644
--- a/dev-tcltk/tdom/tdom-0.9.3.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tdom.org/downloads/${P}-src.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="threads"
 
 DEPEND="
diff --git a/dev-tcltk/tdom/tdom-0.9.5.ebuild b/dev-tcltk/tdom/tdom-0.9.5.ebuild
index 02be0be0b6db..c49a420a1ae8 100644
--- a/dev-tcltk/tdom/tdom-0.9.5.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-src
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="threads"
 
 DEPEND="
diff --git a/dev-tcltk/tix/tix-8.4.3-r4.ebuild b/dev-tcltk/tix/tix-8.4.3-r4.ebuild
index 1e4a2f9015dd..1bad0a5d12f3 100644
--- a/dev-tcltk/tix/tix-8.4.3-r4.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/tix/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 RESTRICT="test"
 
 DEPEND="
diff --git a/dev-tcltk/tkdnd/tkdnd-2.9.2-r1.ebuild b/dev-tcltk/tkdnd/tkdnd-2.9.2-r1.ebuild
index e3ccfb133723..ef2eb20711c8 100644
--- a/dev-tcltk/tkdnd/tkdnd-2.9.2-r1.ebuild
+++ b/dev-tcltk/tkdnd/tkdnd-2.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/petasis/tkdnd/archive/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="debug threads X"
 
 DEPEND="dev-lang/tk:="
diff --git a/dev-tcltk/tkdnd/tkdnd-2.9.4-r1.ebuild b/dev-tcltk/tkdnd/tkdnd-2.9.4-r1.ebuild
index c27a433b6fc4..7b0794d3b702 100644
--- a/dev-tcltk/tkdnd/tkdnd-2.9.4-r1.ebuild
+++ b/dev-tcltk/tkdnd/tkdnd-2.9.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/petasis/tkdnd/archive/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="debug threads X"
 
 DEPEND="
diff --git a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
index 582812c290fe..d8fed3f42bf8 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc x86"
 IUSE="doc test static-libs"
 
 RDEPEND="
diff --git a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
index c5e95ba5864d..b0b771a5fede 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc x86"
 IUSE="doc test static-libs"
 
 RDEPEND="
diff --git a/dev-tcltk/tktreectrl/tktreectrl-2.4.1-r1.ebuild b/dev-tcltk/tktreectrl/tktreectrl-2.4.1-r1.ebuild
index 373885f86a36..301808526e4e 100644
--- a/dev-tcltk/tktreectrl/tktreectrl-2.4.1-r1.ebuild
+++ b/dev-tcltk/tktreectrl/tktreectrl-2.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug shellicon threads"
 
 RDEPEND=">=dev-lang/tk-8.4:0="
diff --git a/dev-tcltk/tls/tls-1.7.22-r1.ebuild b/dev-tcltk/tls/tls-1.7.22-r1.ebuild
index 3667b79abf9d..1622421154b1 100644
--- a/dev-tcltk/tls/tls-1.7.22-r1.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://core.tcl.tk/tcltls/uv/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="tk"
 
 DEPEND="
diff --git a/dev-tcltk/togl/togl-2.0-r5.ebuild b/dev-tcltk/togl/togl-2.0-r5.ebuild
index ec8755c95a25..9cfe20121356 100644
--- a/dev-tcltk/togl/togl-2.0-r5.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug +threads"
 
 RDEPEND="
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
index 6837d0634c34..8bcaac8807e9 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/texlive-${PV#*_p}-source.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc source"
 
 RDEPEND=">=dev-libs/kpathsea-6.2.1:=
diff --git a/dev-tex/bibtexu/bibtexu-3.72_p20230311.ebuild b/dev-tex/bibtexu/bibtexu-3.72_p20230311.ebuild
index 6ad05258c55a..cb88dc3fdc50 100644
--- a/dev-tex/bibtexu/bibtexu-3.72_p20230311.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.72_p20230311.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/texlive-${PV#*_p}-source/texk/bibtex-x
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="doc source"
 
diff --git a/dev-tex/bibtexu/bibtexu-3.72_p20240311.ebuild b/dev-tex/bibtexu/bibtexu-3.72_p20240311.ebuild
index 1a335aed22da..5e655ee429ea 100644
--- a/dev-tex/bibtexu/bibtexu-3.72_p20240311.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.72_p20240311.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/texlive-${PV#*_p}-source/texk/bibtex-x
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="doc source"
 
diff --git a/dev-tex/dot2tex/dot2tex-2.11.3-r1.ebuild b/dev-tex/dot2tex/dot2tex-2.11.3-r1.ebuild
index c7368b3d1e8c..9d8d1ed372fd 100644
--- a/dev-tex/dot2tex/dot2tex-2.11.3-r1.ebuild
+++ b/dev-tex/dot2tex/dot2tex-2.11.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xyz2tex/dot2tex/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="doc examples"
 
 DEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
diff --git a/dev-tex/glossaries/glossaries-4.53.ebuild b/dev-tex/glossaries/glossaries-4.53.ebuild
index fb4d29c1a96d..bcb0b4ed348a 100644
--- a/dev-tex/glossaries/glossaries-4.53.ebuild
+++ b/dev-tex/glossaries/glossaries-4.53.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~flow/distfiles/glossaries/${P}.zip"
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-tex/glossaries/glossaries-4.55.ebuild b/dev-tex/glossaries/glossaries-4.55.ebuild
index 646f076835f9..abd8b6d9de65 100644
--- a/dev-tex/glossaries/glossaries-4.55.ebuild
+++ b/dev-tex/glossaries/glossaries-4.55.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${PN}
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 IUSE="doc examples"
 
diff --git a/dev-tex/latex-beamer/latex-beamer-3.76.ebuild b/dev-tex/latex-beamer/latex-beamer-3.76.ebuild
index aed878c24333..c598f626e166 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.76.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.76.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/beamer-${PV}"
 
 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-tex/latex2html/latex2html-2021.2-r2.ebuild b/dev-tex/latex2html/latex2html-2021.2-r2.ebuild
index 66dcc08410b3..2cab5efe72d0 100644
--- a/dev-tex/latex2html/latex2html-2021.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2021.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/latex2html/latex2html/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gif png"
 
 DEPEND="
diff --git a/dev-tex/latex2html/latex2html-2022.ebuild b/dev-tex/latex2html/latex2html-2022.ebuild
index 735054989d97..e8508d616317 100644
--- a/dev-tex/latex2html/latex2html-2022.ebuild
+++ b/dev-tex/latex2html/latex2html-2022.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/latex2html/latex2html/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gif png svg"
 
 DEPEND="
diff --git a/dev-tex/latexdiff/latexdiff-1.3.3.ebuild b/dev-tex/latexdiff/latexdiff-1.3.3.ebuild
index 69f4ff46103d..5359056513d8 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.3.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
 else
 	SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/dev-tex/latexdiff/latexdiff-1.3.4.ebuild b/dev-tex/latexdiff/latexdiff-1.3.4.ebuild
index 9762a94ae20e..c8e69ec921e4 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.4.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
 else
 	SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 SRC_URI+="
diff --git a/dev-tex/latexdiff/latexdiff-9999.ebuild b/dev-tex/latexdiff/latexdiff-9999.ebuild
index b25f02fc7ac7..65298911e30b 100644
--- a/dev-tex/latexdiff/latexdiff-9999.ebuild
+++ b/dev-tex/latexdiff/latexdiff-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
 else
 	SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 SRC_URI+="
diff --git a/dev-tex/latexmk/latexmk-4.83.ebuild b/dev-tex/latexmk/latexmk-4.83.ebuild
index d057621f9408..427d818ae1b4 100644
--- a/dev-tex/latexmk/latexmk-4.83.ebuild
+++ b/dev-tex/latexmk/latexmk-4.83.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cantab.net/users/johncollins/${PN}/${P/./}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-tex/latexmk/latexmk-4.85.ebuild b/dev-tex/latexmk/latexmk-4.85.ebuild
index d8c31059a4f9..320a59d26202 100644
--- a/dev-tex/latexmk/latexmk-4.85.ebuild
+++ b/dev-tex/latexmk/latexmk-4.85.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-tex/pgf/pgf-3.1.10-r1.ebuild b/dev-tex/pgf/pgf-3.1.10-r1.ebuild
index 8dae9cb049f3..c48cf49124f5 100644
--- a/dev-tex/pgf/pgf-3.1.10-r1.ebuild
+++ b/dev-tex/pgf/pgf-3.1.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc source"
 
 RDEPEND="dev-texlive/texlive-latexrecommended"
diff --git a/dev-tex/tex4ht/tex4ht-20230311_p69739.ebuild b/dev-tex/tex4ht/tex4ht-20230311_p69739.ebuild
index 4946d9e8c50d..96fbf4817b99 100644
--- a/dev-tex/tex4ht/tex4ht-20230311_p69739.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20230311_p69739.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}"
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc java source"
 
 COMMON_DEPEND="
diff --git a/dev-tex/tex4ht/tex4ht-20240311_p72882-r2.ebuild b/dev-tex/tex4ht/tex4ht-20240311_p72882-r2.ebuild
index c828a895ac0b..efe46941a3c0 100644
--- a/dev-tex/tex4ht/tex4ht-20240311_p72882-r2.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20240311_p72882-r2.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}"
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc java source"
 
 COMMON_DEPEND="
diff --git a/dev-tex/tex4ht/tex4ht-20240311_p72882-r3.ebuild b/dev-tex/tex4ht/tex4ht-20240311_p72882-r3.ebuild
index 30bdc13d68ff..157bc3650a3c 100644
--- a/dev-tex/tex4ht/tex4ht-20240311_p72882-r3.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20240311_p72882-r3.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}"
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc java source"
 
 COMMON_DEPEND="
diff --git a/dev-util/amtterm/amtterm-1.6-r1.ebuild b/dev-util/amtterm/amtterm-1.6-r1.ebuild
index d9a6a8dc663e..0dd24c1e01e1 100644
--- a/dev-util/amtterm/amtterm-1.6-r1.ebuild
+++ b/dev-util/amtterm/amtterm-1.6-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kraxel.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/dev-util/argouml/argouml-0.34-r1.ebuild b/dev-util/argouml/argouml-0.34-r1.ebuild
index 2de376ba000e..456989fe0b83 100644
--- a/dev-util/argouml/argouml-0.34-r1.ebuild
+++ b/dev-util/argouml/argouml-0.34-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index 20452fd0cfac..e7917df0329d 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/3.1"
-KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
 IUSE="examples java static-libs"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/astyle/astyle-3.4.9-r1.ebuild b/dev-util/astyle/astyle-3.4.9-r1.ebuild
index 31c16e1b7be2..ab40f45815ee 100644
--- a/dev-util/astyle/astyle-3.4.9-r1.ebuild
+++ b/dev-util/astyle/astyle-3.4.9-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/3.2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="examples java static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-util/astyle/astyle-3.4.9.ebuild b/dev-util/astyle/astyle-3.4.9.ebuild
index a0afc8f224c9..a760dd933b33 100644
--- a/dev-util/astyle/astyle-3.4.9.ebuild
+++ b/dev-util/astyle/astyle-3.4.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/3.2"
-KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
 IUSE="examples java static-libs"
 
 DEPEND="
diff --git a/dev-util/astyle/astyle-3.6.1.ebuild b/dev-util/astyle/astyle-3.6.1.ebuild
index 97fb57112ed8..9dad524193ab 100644
--- a/dev-util/astyle/astyle-3.6.1.ebuild
+++ b/dev-util/astyle/astyle-3.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/3.2"
-KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
 IUSE="examples java static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-util/astyle/astyle-3.6.7.ebuild b/dev-util/astyle/astyle-3.6.7.ebuild
index 1fc07a628b62..a97b8f2119e1 100644
--- a/dev-util/astyle/astyle-3.6.7.ebuild
+++ b/dev-util/astyle/astyle-3.6.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/3.2"
-KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
 IUSE="java static-libs"
 
 DOCS=( README.md  examples/ )
diff --git a/dev-util/autoproject/autoproject-0.20_p15.ebuild b/dev-util/autoproject/autoproject-0.20_p15.ebuild
index 74ca90942d20..0c44f66cb9b5 100644
--- a/dev-util/autoproject/autoproject-0.20_p15.ebuild
+++ b/dev-util/autoproject/autoproject-0.20_p15.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/bbe/bbe-0.2.2-r1.ebuild b/dev-util/bbe/bbe-0.2.2-r1.ebuild
index be8a84cbefca..e51a640f4e35 100644
--- a/dev-util/bbe/bbe-0.2.2-r1.ebuild
+++ b/dev-util/bbe/bbe-0.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/bbe-/bbe/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86"
 
 PATCHES=(
 	"${FILESDIR}"/bbe-0.2.2-inline.patch
diff --git a/dev-util/bcpp/bcpp-20240917.ebuild b/dev-util/bcpp/bcpp-20240917.ebuild
index d5c06819b920..32ffa3e00d32 100644
--- a/dev-util/bcpp/bcpp-20240917.ebuild
+++ b/dev-util/bcpp/bcpp-20240917.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
 
diff --git a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
index 88d9366e4cae..d2b5f8f0292d 100644
--- a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
+++ b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jjwhitney/BDelta/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-soname.patch
diff --git a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
index 87eddcf4e5f1..dc17878e0df7 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.daemonology.net/bsdiff/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~sparc x86"
 
 RDEPEND="app-arch/bzip2"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/btyacc/btyacc-3.0-r4.ebuild b/dev-util/btyacc/btyacc-3.0-r4.ebuild
index ff6e30d984ca..289a13528216 100644
--- a/dev-util/btyacc/btyacc-3.0-r4.ebuild
+++ b/dev-util/btyacc/btyacc-3.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.siber.com/btyacc/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 S="${WORKDIR}"
 
diff --git a/dev-util/btyacc/btyacc-3.0-r5.ebuild b/dev-util/btyacc/btyacc-3.0-r5.ebuild
index 6392b81af5c3..379837fe52c8 100644
--- a/dev-util/btyacc/btyacc-3.0-r5.ebuild
+++ b/dev-util/btyacc/btyacc-3.0-r5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-includes.patch"
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.11.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.11.0.ebuild
index fb38ff38115d..5abb1a2fc212 100644
--- a/dev-util/buildbot-badges/buildbot-badges-3.11.0.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.11.1.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.11.1.ebuild
index aa43647ca08d..9a599d161876 100644
--- a/dev-util/buildbot-badges/buildbot-badges-3.11.1.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.11.9.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.11.9.ebuild
index 9e60c6e21177..abd555c5d208 100644
--- a/dev-util/buildbot-badges/buildbot-badges-3.11.9.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-badges/buildbot-badges-4.1.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-4.1.0.ebuild
index f0a91868cf68..df84c1f35110 100644
--- a/dev-util/buildbot-badges/buildbot-badges-4.1.0.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-4.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.11.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.11.0.ebuild
index 95af709e5135..25499ff66fdd 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.11.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.11.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.11.1.ebuild
index 2f95bb493e37..e1b21395ebc2 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.11.1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.11.9.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.11.9.ebuild
index cae816e72ac4..40475235b7f3 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.11.9.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-4.1.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-4.1.0.ebuild
index cae816e72ac4..40475235b7f3 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-4.1.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-4.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.0.ebuild
index 59046c675141..ed80b5b44570 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.1.ebuild
index 38231284f1ef..4f4b8de69ea4 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.9.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.9.ebuild
index df7326fbe6f5..520450cbd54f 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.9.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-4.1.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-4.1.0.ebuild
index df7326fbe6f5..520450cbd54f 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-4.1.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-4.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.11.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.11.0.ebuild
index 28c0f198089a..74f6a05c5e33 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.11.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 # No real integration tests for this pkg.
 # all tests are related to making releases and final checks for distribution
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.11.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.11.1.ebuild
index 51c490a36e4c..11e81a71d33a 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.11.1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 # No real integration tests for this pkg.
 # all tests are related to making releases and final checks for distribution
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.11.9.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.11.9.ebuild
index c3c75811757c..cbfe9345f05e 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.11.9.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 # No real integration tests for this pkg.
 # all tests are related to making releases and final checks for distribution
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
index 552d4880c8f3..426b7bb2e0df 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 # No real integration tests for this pkg.
 # all tests are related to making releases and final checks for distribution
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild
index 552d4880c8f3..426b7bb2e0df 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 # No real integration tests for this pkg.
 # all tests are related to making releases and final checks for distribution
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-4.1.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-4.1.0.ebuild
index c3c75811757c..cbfe9345f05e 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-4.1.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-4.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 # No real integration tests for this pkg.
 # all tests are related to making releases and final checks for distribution
diff --git a/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.0.ebuild b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.0.ebuild
index 7be81a8f30c4..6860cedd9d34 100644
--- a/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.0.ebuild
+++ b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.1.ebuild b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.1.ebuild
index 296e841c7b1d..4987b5b0a688 100644
--- a/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.1.ebuild
+++ b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.9.ebuild b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.9.ebuild
index aa6fa2557fd7..85079b06bedc 100644
--- a/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.9.ebuild
+++ b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.0.ebuild b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.0.ebuild
index 7de8bc5e3cd9..c2ebd744d054 100644
--- a/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.0.ebuild
+++ b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.1.ebuild b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.1.ebuild
index fe6c21c1004d..6f66186e00fe 100644
--- a/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.1.ebuild
+++ b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.9.ebuild b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.9.ebuild
index bc676abad8d8..bfe932fbe314 100644
--- a/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.9.ebuild
+++ b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.0.ebuild b/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.0.ebuild
index a3fb0a32bd39..6af4a0a0d421 100644
--- a/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.0.ebuild
+++ b/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.1.ebuild b/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.1.ebuild
index e1e152f16a7f..ebdb4e284134 100644
--- a/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.1.ebuild
+++ b/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.9.ebuild b/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.9.ebuild
index d8f6bb0afeb7..b2e312486d13 100644
--- a/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.9.ebuild
+++ b/dev-util/buildbot-react-wsgi-dashboards/buildbot-react-wsgi-dashboards-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.0.ebuild
index 3e0a90234ad7..93f51511721f 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.1.ebuild
index 7bc9bcc649b6..4414885e0cc8 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.9.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.9.ebuild
index 8bdcec20dda0..d84043e1dfc5 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.9.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-4.1.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-4.1.0.ebuild
index 8bdcec20dda0..d84043e1dfc5 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-4.1.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-4.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.11.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.11.0.ebuild
index 740a114b2aec..82705d39fc8c 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.11.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.11.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~sparc ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild
index 7a28acf7e7e5..f48881a64667 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~sparc ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.11.9.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.11.9.ebuild
index 03eb8534eff1..14440f962a2a 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.11.9.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.11.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~sparc ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-4.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-4.1.0.ebuild
index b710bc00ca82..e8b4cc02b177 100644
--- a/dev-util/buildbot-worker/buildbot-worker-4.1.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-4.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~sparc ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.0.ebuild
index 046d64a9e087..d1c9ec0229fd 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.1.ebuild
index 44e0daaae97f..20be7a407d8e 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.1.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.9.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.9.ebuild
index 1f54aceacaee..3e676869ab3c 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.9.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-4.1.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-4.1.0.ebuild
index 1f54aceacaee..3e676869ab3c 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-4.1.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-4.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-www-react/buildbot-www-react-3.11.0.ebuild b/dev-util/buildbot-www-react/buildbot-www-react-3.11.0.ebuild
index ab95f20e85b1..7b51c2a69d78 100644
--- a/dev-util/buildbot-www-react/buildbot-www-react-3.11.0.ebuild
+++ b/dev-util/buildbot-www-react/buildbot-www-react-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www-react/buildbot-www-react-3.11.1.ebuild b/dev-util/buildbot-www-react/buildbot-www-react-3.11.1.ebuild
index affd36d1e648..27a9e894d085 100644
--- a/dev-util/buildbot-www-react/buildbot-www-react-3.11.1.ebuild
+++ b/dev-util/buildbot-www-react/buildbot-www-react-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www-react/buildbot-www-react-3.11.9.ebuild b/dev-util/buildbot-www-react/buildbot-www-react-3.11.9.ebuild
index 221e783eb351..30241bc16a83 100644
--- a/dev-util/buildbot-www-react/buildbot-www-react-3.11.9.ebuild
+++ b/dev-util/buildbot-www-react/buildbot-www-react-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild b/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild
index 086a404d6277..680e3d76eeab 100644
--- a/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild
+++ b/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.11.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.11.0.ebuild
index dcd68de06faa..1649f28b8a5e 100644
--- a/dev-util/buildbot-www/buildbot-www-3.11.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.11.1.ebuild b/dev-util/buildbot-www/buildbot-www-3.11.1.ebuild
index b8b9cb412a3e..4567c75e1b78 100644
--- a/dev-util/buildbot-www/buildbot-www-3.11.1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.11.9.ebuild b/dev-util/buildbot-www/buildbot-www-3.11.9.ebuild
index d616f2e44595..f9ad09e35a20 100644
--- a/dev-util/buildbot-www/buildbot-www-3.11.9.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.11.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
index 4d6c55e0d5ca..bec355d81759 100644
--- a/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild
index 4d6c55e0d5ca..bec355d81759 100644
--- a/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www/buildbot-www-4.1.0.ebuild b/dev-util/buildbot-www/buildbot-www-4.1.0.ebuild
index d616f2e44595..f9ad09e35a20 100644
--- a/dev-util/buildbot-www/buildbot-www-4.1.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-4.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot/buildbot-3.11.0.ebuild b/dev-util/buildbot/buildbot-3.11.0.ebuild
index e5f85a52c06b..2d121bf0799b 100644
--- a/dev-util/buildbot/buildbot-3.11.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.11.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 
 IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/buildbot/buildbot-3.11.1.ebuild b/dev-util/buildbot/buildbot-3.11.1.ebuild
index 85d7a3ece758..87bbc2de72f4 100644
--- a/dev-util/buildbot/buildbot-3.11.1.ebuild
+++ b/dev-util/buildbot/buildbot-3.11.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/buildbot/buildbot-3.11.9.ebuild b/dev-util/buildbot/buildbot-3.11.9.ebuild
index 502ddecd1bbd..9dd7ab530f49 100644
--- a/dev-util/buildbot/buildbot-3.11.9.ebuild
+++ b/dev-util/buildbot/buildbot-3.11.9.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/buildbot/buildbot-4.1.0.ebuild b/dev-util/buildbot/buildbot-4.1.0.ebuild
index 3d4c82f12998..be232970bcc9 100644
--- a/dev-util/buildbot/buildbot-4.1.0.ebuild
+++ b/dev-util/buildbot/buildbot-4.1.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://buildbot.net/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/byacc/byacc-20241231.ebuild b/dev-util/byacc/byacc-20241231.ebuild
index e0c8c43094a3..cfce0cfd206a 100644
--- a/dev-util/byacc/byacc-20241231.ebuild
+++ b/dev-util/byacc/byacc-20241231.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
 
diff --git a/dev-util/cccc/cccc-3.1.6-r1.ebuild b/dev-util/cccc/cccc-3.1.6-r1.ebuild
index a1042cee07ad..4325d4f8c858 100644
--- a/dev-util/cccc/cccc-3.1.6-r1.ebuild
+++ b/dev-util/cccc/cccc-3.1.6-r1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="apidoc debug doc mfc"
 
 BDEPEND="apidoc? ( app-text/doxygen[dot] )"
diff --git a/dev-util/cmocka/cmocka-1.1.5-r1.ebuild b/dev-util/cmocka/cmocka-1.1.5-r1.ebuild
index 4d2cfe691df4..5c3b62cd5e9c 100644
--- a/dev-util/cmocka/cmocka-1.1.5-r1.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmocka/cmocka-1.1.7.ebuild b/dev-util/cmocka/cmocka-1.1.7.ebuild
index 1f9d7844a3e5..31c1d1308b74 100644
--- a/dev-util/cmocka/cmocka-1.1.7.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmocka/cmocka-1.1.8.ebuild b/dev-util/cmocka/cmocka-1.1.8.ebuild
index df5696218b82..69a3e1236da8 100644
--- a/dev-util/cmocka/cmocka-1.1.8.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/colm/colm-0.13.0.7.ebuild b/dev-util/colm/colm-0.13.0.7.ebuild
index f6c92f61cc06..1141e156403f 100644
--- a/dev-util/colm/colm-0.13.0.7.ebuild
+++ b/dev-util/colm/colm-0.13.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="app-text/asciidoc"
 
diff --git a/dev-util/colm/colm-0.14.7-r4.ebuild b/dev-util/colm/colm-0.14.7-r4.ebuild
index 55ee5d9186e1..0dc192e1bbf4 100644
--- a/dev-util/colm/colm-0.14.7-r4.ebuild
+++ b/dev-util/colm/colm-0.14.7-r4.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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
index 4da0e35d91ae..716e1805ca02 100644
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~x64-macos"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/conan/conan-2.14.0-r1.ebuild b/dev-util/conan/conan-2.14.0-r1.ebuild
index 47ae53d5c316..2facddf8d144 100644
--- a/dev-util/conan/conan-2.14.0-r1.ebuild
+++ b/dev-util/conan/conan-2.14.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
diff --git a/dev-util/conan/conan-2.17.0.ebuild b/dev-util/conan/conan-2.17.0.ebuild
index 47ae53d5c316..2facddf8d144 100644
--- a/dev-util/conan/conan-2.17.0.ebuild
+++ b/dev-util/conan/conan-2.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
diff --git a/dev-util/conan/conan-2.20.1.ebuild b/dev-util/conan/conan-2.20.1.ebuild
index 47ae53d5c316..2facddf8d144 100644
--- a/dev-util/conan/conan-2.20.1.ebuild
+++ b/dev-util/conan/conan-2.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
diff --git a/dev-util/conan/conan-2.22.1.ebuild b/dev-util/conan/conan-2.22.1.ebuild
index 42bc1eb38789..5ece9813ca6d 100644
--- a/dev-util/conan/conan-2.22.1.ebuild
+++ b/dev-util/conan/conan-2.22.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
diff --git a/dev-util/cppunit/cppunit-1.15.1-r3.ebuild b/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
index 20f12d3cfc14..b375280cc304 100644
--- a/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
 
 SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 LICENSE="LGPL-2.1"
 SLOT="0/1.15"
diff --git a/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild b/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild
index 6d544bc0bd53..34cad6ebff03 100644
--- a/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild
@@ -18,7 +18,7 @@ else
 	"
 	S="${WORKDIR}"/${P%%_p*}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-util/cppunit/cppunit-9999-r1.ebuild b/dev-util/cppunit/cppunit-9999-r1.ebuild
index c6731616a500..bc96687dfc2a 100644
--- a/dev-util/cppunit/cppunit-9999-r1.ebuild
+++ b/dev-util/cppunit/cppunit-9999-r1.ebuild
@@ -18,7 +18,7 @@ else
 	"
 	S="${WORKDIR}"/${P%%_p*}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-util/cproto/cproto-4.7x.ebuild b/dev-util/cproto/cproto-4.7x.ebuild
index 92d87de05034..ffeea50f3da2 100644
--- a/dev-util/cproto/cproto-4.7x.ebuild
+++ b/dev-util/cproto/cproto-4.7x.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 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 
 DEPEND="app-alternatives/lex"
 BDEPEND="
diff --git a/dev-util/cproto/cproto-4.7y.ebuild b/dev-util/cproto/cproto-4.7y.ebuild
index 92d87de05034..ffeea50f3da2 100644
--- a/dev-util/cproto/cproto-4.7y.ebuild
+++ b/dev-util/cproto/cproto-4.7y.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 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 
 DEPEND="app-alternatives/lex"
 BDEPEND="
diff --git a/dev-util/cscope/cscope-15.9-r1.ebuild b/dev-util/cscope/cscope-15.9-r1.ebuild
index 327d2ad3cdbc..1b3ed1849502 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="https://downloads.sourceforge.net/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 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 29f71bb82881..d4a4e7b86fb3 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/ctags/ctags-6.0_p20230423_p0-r2.ebuild b/dev-util/ctags/ctags-6.0_p20230423_p0-r2.ebuild
index 0d607e25587d..cfd9fa27b5e2 100644
--- a/dev-util/ctags/ctags-6.0_p20230423_p0-r2.ebuild
+++ b/dev-util/ctags/ctags-6.0_p20230423_p0-r2.ebuild
@@ -31,7 +31,7 @@ else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/ctags/ctags-6.1_p20240609_p0-r1.ebuild b/dev-util/ctags/ctags-6.1_p20240609_p0-r1.ebuild
index 2f19c8b5b2dc..4d35708d5fa5 100644
--- a/dev-util/ctags/ctags-6.1_p20240609_p0-r1.ebuild
+++ b/dev-util/ctags/ctags-6.1_p20240609_p0-r1.ebuild
@@ -31,7 +31,7 @@ else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/ctags/ctags-6.2.0-r1.ebuild b/dev-util/ctags/ctags-6.2.0-r1.ebuild
index bfcbba7486c2..a0314e79fe64 100644
--- a/dev-util/ctags/ctags-6.2.0-r1.ebuild
+++ b/dev-util/ctags/ctags-6.2.0-r1.ebuild
@@ -39,7 +39,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="json pcre seccomp test xml yaml"
 if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/ctags/ctags-6.2.1.ebuild b/dev-util/ctags/ctags-6.2.1.ebuild
index d623eb7580f0..a9ba60c7b4a0 100644
--- a/dev-util/ctags/ctags-6.2.1.ebuild
+++ b/dev-util/ctags/ctags-6.2.1.ebuild
@@ -39,7 +39,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="json pcre seccomp test xml yaml"
 if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/ctags/ctags-9999.ebuild b/dev-util/ctags/ctags-9999.ebuild
index d623eb7580f0..a9ba60c7b4a0 100644
--- a/dev-util/ctags/ctags-9999.ebuild
+++ b/dev-util/ctags/ctags-9999.ebuild
@@ -39,7 +39,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="json pcre seccomp test xml yaml"
 if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cunit/cunit-2.1_p3-r1.ebuild b/dev-util/cunit/cunit-2.1_p3-r1.ebuild
index e70815c4d9be..5de526080755 100644
--- a/dev-util/cunit/cunit-2.1_p3-r1.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/cunit/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="ncurses static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cutils/cutils-1.6-r5.ebuild b/dev-util/cutils/cutils-1.6-r5.ebuild
index d1f315722f46..bdf94754b0ba 100644
--- a/dev-util/cutils/cutils-1.6-r5.ebuild
+++ b/dev-util/cutils/cutils-1.6-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.sigala.it/sandro/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 BDEPEND="
 	app-alternatives/lex
diff --git a/dev-util/cwdiff/cwdiff-0.4.0.ebuild b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
index 8ccdb27aa51b..134c1ca27200 100644
--- a/dev-util/cwdiff/cwdiff-0.4.0.ebuild
+++ b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
@@ -8,7 +8,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
diff --git a/dev-util/cwdiff/cwdiff-9999.ebuild b/dev-util/cwdiff/cwdiff-9999.ebuild
index 8ccdb27aa51b..134c1ca27200 100644
--- a/dev-util/cwdiff/cwdiff-9999.ebuild
+++ b/dev-util/cwdiff/cwdiff-9999.ebuild
@@ -8,7 +8,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
diff --git a/dev-util/debhelper/debhelper-13.2.1.ebuild b/dev-util/debhelper/debhelper-13.2.1.ebuild
index ae8e09b889e8..bcce993e5af8 100644
--- a/dev-util/debhelper/debhelper-13.2.1.ebuild
+++ b/dev-util/debhelper/debhelper-13.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
diff --git a/dev-util/debootstrap/debootstrap-1.0.128_p2.ebuild b/dev-util/debootstrap/debootstrap-1.0.128_p2.ebuild
index 6be4eef0fc14..9e5dd0f96185 100644
--- a/dev-util/debootstrap/debootstrap-1.0.128_p2.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.128_p2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://salsa.debian.org/installer-team/${PN}/-/archive/${MY_PV}/${PN}-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.134.ebuild b/dev-util/debootstrap/debootstrap-1.0.134.ebuild
index 5f4bff82853c..2bdda3d57cf7 100644
--- a/dev-util/debootstrap/debootstrap-1.0.134.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.134.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://salsa.debian.org/installer-team/${PN}/-/archive/${MY_PV}/${PN}-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/debugedit/debugedit-5.1-r3.ebuild b/dev-util/debugedit/debugedit-5.1-r3.ebuild
index 7da8f07772cf..814f454cb23e 100644
--- a/dev-util/debugedit/debugedit-5.1-r3.ebuild
+++ b/dev-util/debugedit/debugedit-5.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-3+ GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 #KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
diff --git a/dev-util/debugedit/debugedit-5.2-r1.ebuild b/dev-util/debugedit/debugedit-5.2-r1.ebuild
index 975df1a21a87..4cb68dccae9f 100644
--- a/dev-util/debugedit/debugedit-5.2-r1.ebuild
+++ b/dev-util/debugedit/debugedit-5.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-3+ GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/debugedit/debugedit-5.2.ebuild b/dev-util/debugedit/debugedit-5.2.ebuild
index ac676034e264..8afaf15c626f 100644
--- a/dev-util/debugedit/debugedit-5.2.ebuild
+++ b/dev-util/debugedit/debugedit-5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-3+ GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
index c23aaede9d4d..e4a63dbbbdc3 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
index 9df9d42e9c88..f32f8e33d987 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.27.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.27.ebuild
index 23603827f229..8f97f03c2ae2 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.27.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.28.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.28.ebuild
index a66cda84c6cc..fb953c80a8c2 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.28.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/glib-2.26:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/diffball/diffball-1.0.1-r2.ebuild b/dev-util/diffball/diffball-1.0.1-r2.ebuild
index 6654bb19be7a..f7db6dbeae5d 100644
--- a/dev-util/diffball/diffball-1.0.1-r2.ebuild
+++ b/dev-util/diffball/diffball-1.0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zmedico/diffball/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/dev-util/diffstat/diffstat-1.67.ebuild b/dev-util/diffstat/diffstat-1.67.ebuild
index 9e697ba3484d..ddb47b541fb0 100644
--- a/dev-util/diffstat/diffstat-1.67.ebuild
+++ b/dev-util/diffstat/diffstat-1.67.ebuild
@@ -13,6 +13,6 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
diff --git a/dev-util/diffstat/diffstat-1.68.ebuild b/dev-util/diffstat/diffstat-1.68.ebuild
index 9e697ba3484d..ddb47b541fb0 100644
--- a/dev-util/diffstat/diffstat-1.68.ebuild
+++ b/dev-util/diffstat/diffstat-1.68.ebuild
@@ -13,6 +13,6 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
diff --git a/dev-util/flawfinder/flawfinder-2.0.19-r2.ebuild b/dev-util/flawfinder/flawfinder-2.0.19-r2.ebuild
index 2cc44a08f9e6..7833548b8152 100644
--- a/dev-util/flawfinder/flawfinder-2.0.19-r2.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.19-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~mips ppc ~sparc x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.0.18-setup.patch )
 
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild
index 2628244c7986..e3bb1764ac0a 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
 
 LICENSE="perforce GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="app-alternatives/yacc"
 
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.82.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.82.5.ebuild
index 08ee78459a9b..a310edf11fcb 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.82.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.82.5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.84.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.84.4.ebuild
index 9a22a556116d..1d5e73342e6f 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.84.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.84.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.86.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.86.1.ebuild
index bb3d561f1bd1..38ec5af58a1d 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.86.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.86.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/geany/geany-2.1.ebuild b/dev-util/geany/geany-2.1.ebuild
index 3a71ff619084..4ce9a654aa2d 100644
--- a/dev-util/geany/geany-2.1.ebuild
+++ b/dev-util/geany/geany-2.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" = 9999* ]] ; then
 else
 	[[ "${PV}" == *_pre* ]] && inherit autotools
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="GPL-2+ HPND LGPL-2+ LGPL-2.1+"
 SLOT="0"
diff --git a/dev-util/gengetopt/gengetopt-2.23-r1.ebuild b/dev-util/gengetopt/gengetopt-2.23-r1.ebuild
index 9a543b95df05..f33c58b0eca5 100644
--- a/dev-util/gengetopt/gengetopt-2.23-r1.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+ public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/dev-util/gertty/gertty-1.6.0-r3.ebuild b/dev-util/gertty/gertty-1.6.0-r3.ebuild
index 380ba9819c42..a30fe4061717 100644
--- a/dev-util/gertty/gertty-1.6.0-r3.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	inherit pypi
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 380ba9819c42..a30fe4061717 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	inherit pypi
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/glib-utils/glib-utils-2.82.5.ebuild b/dev-util/glib-utils/glib-utils-2.82.5.ebuild
index f1930fb2af81..ccc9f22d40d9 100644
--- a/dev-util/glib-utils/glib-utils-2.82.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.82.5.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/glib-utils-2.84.4.ebuild b/dev-util/glib-utils/glib-utils-2.84.4.ebuild
index 6c647458c1e4..06529574b40e 100644
--- a/dev-util/glib-utils/glib-utils-2.84.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.84.4.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/glib-utils-2.86.1.ebuild b/dev-util/glib-utils/glib-utils-2.86.1.ebuild
index 79b9177d8243..7a6cede63315 100644
--- a/dev-util/glib-utils/glib-utils-2.86.1.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.86.1.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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gob/gob-2.0.20-r1.ebuild b/dev-util/gob/gob-2.0.20-r1.ebuild
index c18fc1fb94bc..2a450a12c081 100644
--- a/dev-util/gob/gob-2.0.20-r1.ebuild
+++ b/dev-util/gob/gob-2.0.20-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.jirka.org/gob.html"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND=">=dev-libs/glib-2.4:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/google-perftools/google-perftools-2.15.ebuild b/dev-util/google-perftools/google-perftools-2.15.ebuild
index 73227b0b523b..b3b840593a08 100644
--- a/dev-util/google-perftools/google-perftools-2.15.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.15.ebuild
@@ -17,7 +17,7 @@ SLOT="0/4"
 # linux amd64/arm/arm64/ppc/ppc64/riscv/x86
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 IUSE="pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k +debug llvm-libunwind minimal optimisememory test static-libs"
 REQUIRED_USE="?? ( pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k )"
diff --git a/dev-util/google-perftools/google-perftools-2.16.ebuild b/dev-util/google-perftools/google-perftools-2.16.ebuild
index 50df3cdf46c9..18bab73b381a 100644
--- a/dev-util/google-perftools/google-perftools-2.16.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.16.ebuild
@@ -18,7 +18,7 @@ SLOT="0/4"
 # linux amd64/arm/arm64/ppc/ppc64/riscv/x86
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k +debug llvm-libunwind minimal optimisememory test static-libs"
 REQUIRED_USE="?? ( pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k )"
diff --git a/dev-util/google-perftools/google-perftools-2.17.2.ebuild b/dev-util/google-perftools/google-perftools-2.17.2.ebuild
index c66325f73bdc..bd65a18e4052 100644
--- a/dev-util/google-perftools/google-perftools-2.17.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.17.2.ebuild
@@ -18,7 +18,7 @@ SLOT="0/4"
 # linux amd64/arm/arm64/ppc/ppc64/riscv/x86
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k +debug llvm-libunwind minimal optimisememory test static-libs"
 REQUIRED_USE="?? ( pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k )"
diff --git a/dev-util/gperf/gperf-3.1-r2.ebuild b/dev-util/gperf/gperf-3.1-r2.ebuild
index e87f99a1effc..42dff8487006 100644
--- a/dev-util/gperf/gperf-3.1-r2.ebuild
+++ b/dev-util/gperf/gperf-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-strncmp-decl-mismatch.patch
diff --git a/dev-util/gperf/gperf-3.2.1.ebuild b/dev-util/gperf/gperf-3.2.1.ebuild
index 6d1cd8464c33..06c4011b277e 100644
--- a/dev-util/gperf/gperf-3.2.1.ebuild
+++ b/dev-util/gperf/gperf-3.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/gperf/gperf-3.3.ebuild b/dev-util/gperf/gperf-3.3.ebuild
index 4618799a182e..77473f8bf5e2 100644
--- a/dev-util/gperf/gperf-3.3.ebuild
+++ b/dev-util/gperf/gperf-3.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_prepare() {
 	default
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 8e047c0ff398..2c50fdefacb4 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 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gtk-doc/gtk-doc-1.34.0-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.34.0-r2.ebuild
index d2a3bac7c4f1..1e50368578e9 100644
--- a/dev-util/gtk-doc/gtk-doc-1.34.0-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.34.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gtk-doc"
 
 LICENSE="GPL-2+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 IUSE="emacs test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.40.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.40.ebuild
index 47cad5f26050..25a2c91d86c8 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.40.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.40.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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.42.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.42.ebuild
index 47cad5f26050..25a2c91d86c8 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.42.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.42.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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/huc/huc-0.1-r2.ebuild b/dev-util/huc/huc-0.1-r2.ebuild
index 91e4e59d1258..1bcd3395b448 100644
--- a/dev-util/huc/huc-0.1-r2.ebuild
+++ b/dev-util/huc/huc-0.1-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.int21.de/huc"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 src_compile() {
 	$(tc-getCXX) \
diff --git a/dev-util/indent/indent-2.2.13.ebuild b/dev-util/indent/indent-2.2.13.ebuild
index 79607f93d990..9b6f82149d58 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 ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 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 be0ae87f29d4..6aae74496347 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-util/itstool/itstool-2.0.7-r2.ebuild b/dev-util/itstool/itstool-2.0.7-r2.ebuild
index 22a2b31174d6..f81309bccf1f 100644
--- a/dev-util/itstool/itstool-2.0.7-r2.ebuild
+++ b/dev-util/itstool/itstool-2.0.7-r2.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/itstool/itstool-2.0.7_p20250326.ebuild b/dev-util/itstool/itstool-2.0.7_p20250326.ebuild
index 03a1f6239c54..0588c900e5ff 100644
--- a/dev-util/itstool/itstool-2.0.7_p20250326.ebuild
+++ b/dev-util/itstool/itstool-2.0.7_p20250326.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.516.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.516.3.ebuild
index a8bddb0148ca..0615e4a75b74 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.516.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.516.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="MIT"
 SLOT="lts"
 
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="acct-group/jenkins
 	acct-user/jenkins"
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.528.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.528.1.ebuild
index a8bddb0148ca..0615e4a75b74 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.528.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.528.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="MIT"
 SLOT="lts"
 
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="acct-group/jenkins
 	acct-user/jenkins"
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.528.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.528.2.ebuild
index 30365fc44ded..f2defe9cb07b 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.528.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.528.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="MIT"
 SLOT="lts"
 
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="acct-group/jenkins
 	acct-user/jenkins"
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.528.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.528.3.ebuild
index 30365fc44ded..f2defe9cb07b 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.528.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.528.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="MIT"
 SLOT="lts"
 
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="acct-group/jenkins
 	acct-user/jenkins"
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.528.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.528.ebuild
index 19fd7692b164..39a1abb653dc 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.528.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.528.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="acct-group/jenkins
 	acct-user/jenkins"
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.541.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.541.ebuild
index 19fd7692b164..39a1abb653dc 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.541.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.541.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="acct-group/jenkins
 	acct-user/jenkins"
diff --git a/dev-util/lcov/lcov-2.0-r3.ebuild b/dev-util/lcov/lcov-2.0-r3.ebuild
index 062fdee07a09..64bdc549d0b4 100644
--- a/dev-util/lcov/lcov-2.0-r3.ebuild
+++ b/dev-util/lcov/lcov-2.0-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/linklint/linklint-2.3.5.ebuild b/dev-util/linklint/linklint-2.3.5.ebuild
index 41a5bcf0ec7b..dda3443f2987 100644
--- a/dev-util/linklint/linklint-2.3.5.ebuild
+++ b/dev-util/linklint/linklint-2.3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.linklint.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/dev-util/makepp/makepp-2.0.99.2.ebuild b/dev-util/makepp/makepp-2.0.99.2.ebuild
index 4d12ea413d60..4405a994fe86 100644
--- a/dev-util/makepp/makepp-2.0.99.2.ebuild
+++ b/dev-util/makepp/makepp-2.0.99.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/2.1/${MY_P}.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl:="
diff --git a/dev-util/mdds/mdds-2.1.1-r1.ebuild b/dev-util/mdds/mdds-2.1.1-r1.ebuild
index 373c333fe1b4..187e54a92450 100644
--- a/dev-util/mdds/mdds-2.1.1-r1.ebuild
+++ b/dev-util/mdds/mdds-2.1.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 inherit autotools toolchain-funcs
 
diff --git a/dev-util/mdds/mdds-3.0.0.ebuild b/dev-util/mdds/mdds-3.0.0.ebuild
index 4bb9c8b2b25e..18a3b79c0077 100644
--- a/dev-util/mdds/mdds-3.0.0.ebuild
+++ b/dev-util/mdds/mdds-3.0.0.ebuild
@@ -10,7 +10,7 @@ else
 	# For 3.0.0, it mysteriously redirects to 2.0.0
 	#SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
 	SRC_URI="https://gitlab.com/api/v4/projects/mdds%2Fmdds/packages/generic/source/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 inherit autotools toolchain-funcs
 
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index f4fcc56bded0..3a39cabf933a 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -10,7 +10,7 @@ else
 	# For 3.0.0, it mysteriously redirects to 2.0.0
 	#SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
 	SRC_URI="https://gitlab.com/api/v4/projects/mdds%2Fmdds/packages/generic/source/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 inherit autotools toolchain-funcs
 
diff --git a/dev-util/meld/meld-3.22.2-r1.ebuild b/dev-util/meld/meld-3.22.2-r1.ebuild
index 5009f201ad98..7c4061c97c8d 100644
--- a/dev-util/meld/meld-3.22.2-r1.ebuild
+++ b/dev-util/meld/meld-3.22.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
index aa3a6ceb486c..136a9466efac 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-CUDA"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
+KEYWORDS="-* ~amd64"
 IUSE="debugger nsight profiler vis-profiler sanitizer"
 RESTRICT="bindist mirror"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.2.ebuild
index df76063c697f..3b928f95fae1 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-CUDA"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
+KEYWORDS="-* ~amd64"
 IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
 RESTRICT="bindist mirror"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.1.ebuild
index 33888a385411..dc6d630525e0 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-CUDA"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
+KEYWORDS="-* ~amd64"
 IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
 RESTRICT="bindist mirror"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.1.ebuild
index 6502fd2710ab..fd50f5c51abc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-CUDA"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
+KEYWORDS="-* ~amd64"
 IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
 RESTRICT="bindist mirror"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild
index f5af7fd92888..9c87ce86f6f7 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild
@@ -30,7 +30,7 @@ LICENSE="NVIDIA-CUDA"
 SLOT="0/${PV}" # UNSLOTTED
 # SLOT="${PV}" # SLOTTED
 
-KEYWORDS="-* ~amd64 ~arm64 ~amd64-linux ~arm64-linux"
+KEYWORDS="-* ~amd64 ~arm64"
 IUSE="clang debugger examples nsight profiler rdma sanitizer"
 RESTRICT="bindist mirror strip test"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild
index 32eff5bf1170..f1110168416e 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild
@@ -30,7 +30,7 @@ LICENSE="NVIDIA-CUDA"
 SLOT="0/${PV}" # UNSLOTTED
 # SLOT="${PV}" # SLOTTED
 
-KEYWORDS="-* ~amd64 ~arm64 ~amd64-linux ~arm64-linux"
+KEYWORDS="-* ~amd64 ~arm64"
 IUSE="clang debugger examples nsight profiler rdma sanitizer"
 RESTRICT="bindist mirror strip test"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.9.1-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.9.1-r1.ebuild
index 3817fd1fba81..727d5cc44bbc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.9.1-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.9.1-r1.ebuild
@@ -30,7 +30,7 @@ LICENSE="NVIDIA-CUDA"
 SLOT="0/${PV}" # UNSLOTTED
 # SLOT="${PV}" # SLOTTED
 
-KEYWORDS="-* ~amd64 ~arm64 ~amd64-linux ~arm64-linux"
+KEYWORDS="-* ~amd64 ~arm64"
 IUSE="clang debugger examples nsight profiler rdma sanitizer"
 RESTRICT="bindist mirror strip test"
 
diff --git a/dev-util/patchelf/patchelf-0.17.2-r1.ebuild b/dev-util/patchelf/patchelf-0.17.2-r1.ebuild
index 7546cd9a18bb..f1ad5ac40bd0 100644
--- a/dev-util/patchelf/patchelf-0.17.2-r1.ebuild
+++ b/dev-util/patchelf/patchelf-0.17.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 LICENSE="GPL-3"
 
 PATCHES=("${FILESDIR}"/${PN}-0.17.2-dt-mips-xhash.patch)
diff --git a/dev-util/patchelf/patchelf-0.18.0.ebuild b/dev-util/patchelf/patchelf-0.18.0.ebuild
index ca450e02b9d1..133bcd4d819a 100644
--- a/dev-util/patchelf/patchelf-0.18.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.18.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 LICENSE="GPL-3"
 
 PATCHES=(
diff --git a/dev-util/patchutils/patchutils-0.4.2.ebuild b/dev-util/patchutils/patchutils-0.4.2.ebuild
index a579238e2586..2d2344b85469 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="pcre"
 
 RDEPEND="pcre? ( dev-libs/libpcre2:= )"
diff --git a/dev-util/patchutils/patchutils-0.4.4-r1.ebuild b/dev-util/patchutils/patchutils-0.4.4-r1.ebuild
index 3a5127660577..1a64938a3778 100644
--- a/dev-util/patchutils/patchutils-0.4.4-r1.ebuild
+++ b/dev-util/patchutils/patchutils-0.4.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twaugh/patchutils/releases/download/${PV}/${P}.tar.x
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pcre"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/perf/perf-6.14.ebuild b/dev-util/perf/perf-6.14.ebuild
index c1cd4a582d18..f6bccde71da7 100644
--- a/dev-util/perf/perf-6.14.ebuild
+++ b/dev-util/perf/perf-6.14.ebuild
@@ -34,7 +34,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl +python +slang systemtap tcmalloc unwind"
 
 REQUIRED_USE="
diff --git a/dev-util/perf/perf-6.16-r1.ebuild b/dev-util/perf/perf-6.16-r1.ebuild
index 06b673983a05..90ff2a61d5fe 100644
--- a/dev-util/perf/perf-6.16-r1.ebuild
+++ b/dev-util/perf/perf-6.16-r1.ebuild
@@ -34,7 +34,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 babeltrace capstone big-endian bpf caps crypt debug gtk java libpfm +libtraceevent +libtracefs lzma numa perl +python +slang systemtap tcmalloc unwind"
 
 REQUIRED_USE="
diff --git a/dev-util/perf/perf-6.16.ebuild b/dev-util/perf/perf-6.16.ebuild
index 29add77228e0..8a4584cea412 100644
--- a/dev-util/perf/perf-6.16.ebuild
+++ b/dev-util/perf/perf-6.16.ebuild
@@ -34,7 +34,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl +python +slang systemtap tcmalloc unwind"
 
 REQUIRED_USE="
diff --git a/dev-util/perf/perf-6.17.ebuild b/dev-util/perf/perf-6.17.ebuild
index 06b673983a05..90ff2a61d5fe 100644
--- a/dev-util/perf/perf-6.17.ebuild
+++ b/dev-util/perf/perf-6.17.ebuild
@@ -34,7 +34,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 babeltrace capstone big-endian bpf caps crypt debug gtk java libpfm +libtraceevent +libtracefs lzma numa perl +python +slang systemtap tcmalloc unwind"
 
 REQUIRED_USE="
diff --git a/dev-util/perf/perf-6.18-r1.ebuild b/dev-util/perf/perf-6.18-r1.ebuild
index eef384583894..40f86d17e90c 100644
--- a/dev-util/perf/perf-6.18-r1.ebuild
+++ b/dev-util/perf/perf-6.18-r1.ebuild
@@ -34,7 +34,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 babeltrace capstone big-endian bpf caps crypt debug gtk java libpfm +libtraceevent +libtracefs lzma numa perl +python +slang systemtap tcmalloc unwind"
 
 REQUIRED_USE="
diff --git a/dev-util/pkgconf/pkgconf-2.3.0.ebuild b/dev-util/pkgconf/pkgconf-2.3.0.ebuild
index 17de31c7758b..32e316f91a1d 100644
--- a/dev-util/pkgconf/pkgconf-2.3.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-2.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/pkgconf/pkgconf-2.4.3.ebuild b/dev-util/pkgconf/pkgconf-2.4.3.ebuild
index 3549a7e86b0c..4987c5b4ccd1 100644
--- a/dev-util/pkgconf/pkgconf-2.4.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-2.4.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgconf/pkgconf"
 else
 	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/pkgconf/pkgconf-2.5.1.ebuild b/dev-util/pkgconf/pkgconf-2.5.1.ebuild
index fc0c3c0a0370..44a9563f5de3 100644
--- a/dev-util/pkgconf/pkgconf-2.5.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-2.5.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgconf/pkgconf"
 else
 	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index e13481bab305..0892c9966d00 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgconf/pkgconf"
 else
 	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
index 9a68db761212..bd370dd70055 100644
--- a/dev-util/pscan/pscan-20000721-r1.ebuild
+++ b/dev-util/pscan/pscan-20000721-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 # Does NOT contain a testsuite, but does contain a test.c that confuses src_test
 RESTRICT="test"
diff --git a/dev-util/quilt/quilt-0.69.ebuild b/dev-util/quilt/quilt-0.69.ebuild
index d3c847798bc2..85760fd0623d 100644
--- a/dev-util/quilt/quilt-0.69.ebuild
+++ b/dev-util/quilt/quilt-0.69.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-1+"  # any GPL version for quilt.el
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="emacs graphviz"
 # unresolved test failures
 RESTRICT="test"
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index 3ba8165cfe00..fcee32c488a1 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
 LICENSE="GPL-2 GPL-1+"  # any GPL version for quilt.el
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-solaris"
 IUSE="emacs graphviz"
 
 RDEPEND="dev-util/diffstat
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 5a3ee774573d..5c9bfae2569e 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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~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.0.12.ebuild b/dev-util/ragel/ragel-7.0.0.12.ebuild
index 9127450acf2c..f6d540e6329c 100644
--- a/dev-util/ragel/ragel-7.0.0.12.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.12.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 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.7"
diff --git a/dev-util/ragel/ragel-7.0.4-r3.ebuild b/dev-util/ragel/ragel-7.0.4-r3.ebuild
index 4473f60d8ec5..47d65c49964e 100644
--- a/dev-util/ragel/ragel-7.0.4-r3.ebuild
+++ b/dev-util/ragel/ragel-7.0.4-r3.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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 # Notes from bug #766090
diff --git a/dev-util/rats/rats-2.4-r2.ebuild b/dev-util/rats/rats-2.4-r2.ebuild
index c44b9bf99750..fb5519de506b 100644
--- a/dev-util/rats/rats-2.4-r2.ebuild
+++ b/dev-util/rats/rats-2.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="dev-libs/expat:="
 DEPEND="${RDEPEND}"
diff --git a/dev-util/re2c/re2c-3.1.ebuild b/dev-util/re2c/re2c-3.1.ebuild
index 16b1b4ed1943..113a8ed292b1 100644
--- a/dev-util/re2c/re2c-3.1.ebuild
+++ b/dev-util/re2c/re2c-3.1.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="debug test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-util/rej/rej-0.16-r1.ebuild b/dev-util/rej/rej-0.16-r1.ebuild
index b580fa95369d..242f087749ea 100644
--- a/dev-util/rej/rej-0.16-r1.ebuild
+++ b/dev-util/rej/rej-0.16-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.suse.com/pub/people/mason/rej/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.6.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.6.ebuild
index 7e82e7d543a6..c5949c48d031 100644
--- a/dev-util/rpmdevtools/rpmdevtools-9.6.ebuild
+++ b/dev-util/rpmdevtools/rpmdevtools-9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/source-highlight/source-highlight-3.1.9-r2.ebuild b/dev-util/source-highlight/source-highlight-3.1.9-r2.ebuild
index 8de83207b830..a4ad32dd26a3 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9-r2.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/tkdiff/tkdiff-5.6.ebuild b/dev-util/tkdiff/tkdiff-5.6.ebuild
index 8d0912875157..f2a8d7ca6718 100644
--- a/dev-util/tkdiff/tkdiff-5.6.ebuild
+++ b/dev-util/tkdiff/tkdiff-5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${MYP}.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="dev-lang/tk"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/tkdiff/tkdiff-5.7.ebuild b/dev-util/tkdiff/tkdiff-5.7.ebuild
index 4917d30b19cf..625974b72095 100644
--- a/dev-util/tkdiff/tkdiff-5.7.ebuild
+++ b/dev-util/tkdiff/tkdiff-5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="dev-lang/tk"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/tmake/tmake-2.12-r2.ebuild b/dev-util/tmake/tmake-2.12-r2.ebuild
index 132817149f6d..354f5e3faf8a 100644
--- a/dev-util/tmake/tmake-2.12-r2.ebuild
+++ b/dev-util/tmake/tmake-2.12-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/tmake/${P}.tar.bz2"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND=">=dev-lang/perl-5"
 
diff --git a/dev-util/treecc/treecc-0.3.10-r2.ebuild b/dev-util/treecc/treecc-0.3.10-r2.ebuild
index 81a96eb261b7..c4c98f5e612a 100644
--- a/dev-util/treecc/treecc-0.3.10-r2.ebuild
+++ b/dev-util/treecc/treecc-0.3.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="doc examples"
 
 DEPEND="doc? ( app-text/texi2html )"
diff --git a/dev-util/treecc/treecc-0.3.10-r3.ebuild b/dev-util/treecc/treecc-0.3.10-r3.ebuild
index ed1b0c92f7db..a9253752cfa1 100644
--- a/dev-util/treecc/treecc-0.3.10-r3.ebuild
+++ b/dev-util/treecc/treecc-0.3.10-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="doc examples"
 
 DEPEND="doc? ( app-text/texi2html )"
diff --git a/dev-util/uncrustify/uncrustify-0.76.0.ebuild b/dev-util/uncrustify/uncrustify-0.76.0.ebuild
index f087f716be50..c361c59fbe6b 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 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 x86 ~arm64-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-0.81.0.ebuild b/dev-util/uncrustify/uncrustify-0.81.0.ebuild
index 91e8e518c2d6..058edced33b1 100644
--- a/dev-util/uncrustify/uncrustify-0.81.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.81.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 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 x86 ~arm64-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 6618335a2de2..f5c721051c9a 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 ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 ~x86 ~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/unifdef/unifdef-2.12-r2.ebuild b/dev-util/unifdef/unifdef-2.12-r2.ebuild
index 332d4dad10aa..10c85bacb00e 100644
--- a/dev-util/unifdef/unifdef-2.12-r2.ebuild
+++ b/dev-util/unifdef/unifdef-2.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-tests.patch
diff --git a/dev-util/visual-regexp/visual-regexp-3.1.ebuild b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
index 835dd195fbad..d19489f5934a 100644
--- a/dev-util/visual-regexp/visual-regexp-3.1.ebuild
+++ b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND=">=dev-lang/tk-8.5"
 
diff --git a/dev-util/vmtouch/vmtouch-1.3.1.ebuild b/dev-util/vmtouch/vmtouch-1.3.1.ebuild
index c01b2005e2fe..a57b67fe00cd 100644
--- a/dev-util/vmtouch/vmtouch-1.3.1.ebuild
+++ b/dev-util/vmtouch/vmtouch-1.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hoytech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 0f3c7e80a92b..7d12ecd4828b 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/wiggle/wiggle-1.2.ebuild b/dev-util/wiggle/wiggle-1.2.ebuild
index 900ebe3deb12..e94b05d6b58e 100644
--- a/dev-util/wiggle/wiggle-1.2.ebuild
+++ b/dev-util/wiggle/wiggle-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/xxd/xxd-2025.08.24-r1.ebuild b/dev-util/xxd/xxd-2025.08.24-r1.ebuild
index f9d8a0e2c509..0a4e82944857 100644
--- a/dev-util/xxd/xxd-2025.08.24-r1.ebuild
+++ b/dev-util/xxd/xxd-2025.08.24-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/vim-${VIM_VERSION}/src/xxd"
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<app-editors/vim-core-9.1.1652-r1"
 
diff --git a/dev-util/ydiff/ydiff-1.3.ebuild b/dev-util/ydiff/ydiff-1.3.ebuild
index c74fbe07d12c..711aaf442f08 100644
--- a/dev-util/ydiff/ydiff-1.3.ebuild
+++ b/dev-util/ydiff/ydiff-1.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ymattw/ydiff"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-apps/less"
 
diff --git a/dev-util/ydiff/ydiff-1.4.1.ebuild b/dev-util/ydiff/ydiff-1.4.1.ebuild
index 35d1eecb3016..58e11f5a1c9e 100644
--- a/dev-util/ydiff/ydiff-1.4.1.ebuild
+++ b/dev-util/ydiff/ydiff-1.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ymattw/ydiff/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-apps/less"
 
diff --git a/dev-util/ydiff/ydiff-1.4.2.ebuild b/dev-util/ydiff/ydiff-1.4.2.ebuild
index 24ad1e31d1fc..03ed1e5a5c94 100644
--- a/dev-util/ydiff/ydiff-1.4.2.ebuild
+++ b/dev-util/ydiff/ydiff-1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ymattw/ydiff/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-apps/less"
 
diff --git a/dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild b/dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild
index 7e77c7a1d5d4..b433e374878a 100644
--- a/dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild
+++ b/dev-vcs/colorcvs/colorcvs-1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-vcs/cssc/cssc-1.4.1.ebuild b/dev-vcs/cssc/cssc-1.4.1.ebuild
index 55a14fff1e6f..1813935dbde6 100644
--- a/dev-vcs/cssc/cssc-1.4.1.ebuild
+++ b/dev-vcs/cssc/cssc-1.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${CSSC_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-vcs/cvs/cvs-1.12.12-r15.ebuild b/dev-vcs/cvs/cvs-1.12.12-r15.ebuild
index 1c9d2231a2ed..ff6f8478ca6d 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r15.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r15.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="crypt doc kerberos nls pam selinux server"
 RESTRICT="test"
 
diff --git a/dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild b/dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
index bce0927b897a..150143df915e 100644
--- a/dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
+++ b/dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.pl.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl"
 
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
index 96794a47802a..f6a1fb0c0402 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="virtual/zlib:="
diff --git a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index ca102ee94e44..63504887502f 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="virtual/zlib:="
diff --git a/dev-vcs/cvsutils/cvsutils-0.2.6.ebuild b/dev-vcs/cvsutils/cvsutils-0.2.6.ebuild
index 446d29c75c6f..5730bd0b4c76 100644
--- a/dev-vcs/cvsutils/cvsutils-0.2.6.ebuild
+++ b/dev-vcs/cvsutils/cvsutils-0.2.6.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://www.red-bean.com/cvsutils/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="dev-lang/perl"
diff --git a/dev-vcs/git-annex/git-annex-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
index 5944ba071791..f052e90c67b4 100644
--- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git-annex.branchable.com/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp"
 
 REQUIRED_USE="webapp? ( assistant )"
diff --git a/dev-vcs/git-annex/git-annex-10.20230802.ebuild b/dev-vcs/git-annex/git-annex-10.20230802.ebuild
index 6d160a5cd4e0..4b02887e1e08 100644
--- a/dev-vcs/git-annex/git-annex-10.20230802.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20230802.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git-annex.branchable.com/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+assistant +benchmark +dbus debug +gitlfs +magicmime +pairing +torrentparser"
 
 GHC_BOOTSTRAP_PACKAGES=(
diff --git a/dev-vcs/git-lfs/git-lfs-3.7.1.ebuild b/dev-vcs/git-lfs/git-lfs-3.7.1.ebuild
index c650707cbc2c..bd0200c9264b 100644
--- a/dev-vcs/git-lfs/git-lfs-3.7.1.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-3.7.1.ebuild
@@ -33,7 +33,7 @@ fi
 
 LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-vcs/git-tools/git-tools-2022.12.ebuild b/dev-vcs/git-tools/git-tools-2022.12.ebuild
index 05573373a6a7..6faeab710fc6 100644
--- a/dev-vcs/git-tools/git-tools-2022.12.ebuild
+++ b/dev-vcs/git-tools/git-tools-2022.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/git-tools/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-vcs/git-tools/git-tools-2025.08.ebuild b/dev-vcs/git-tools/git-tools-2025.08.ebuild
index 1680fe64aece..18e7256524ca 100644
--- a/dev-vcs/git-tools/git-tools-2025.08.ebuild
+++ b/dev-vcs/git-tools/git-tools-2025.08.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/git-tools/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-vcs/git/git-2.49.1.ebuild b/dev-vcs/git/git-2.49.1.ebuild
index 7f2d535bc086..58040deafed0 100644
--- a/dev-vcs/git/git-2.49.1.ebuild
+++ b/dev-vcs/git/git-2.49.1.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-2.50.1.ebuild b/dev-vcs/git/git-2.50.1.ebuild
index 70012764e08b..e3361d6cd3cd 100644
--- a/dev-vcs/git/git-2.50.1.ebuild
+++ b/dev-vcs/git/git-2.50.1.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-2.51.0.ebuild b/dev-vcs/git/git-2.51.0.ebuild
index 70a8cbb1d12f..ac778840c2b8 100644
--- a/dev-vcs/git/git-2.51.0.ebuild
+++ b/dev-vcs/git/git-2.51.0.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-2.51.1.ebuild b/dev-vcs/git/git-2.51.1.ebuild
index 88cef200e423..91b4e8a4cac0 100644
--- a/dev-vcs/git/git-2.51.1.ebuild
+++ b/dev-vcs/git/git-2.51.1.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-2.51.2-r1.ebuild b/dev-vcs/git/git-2.51.2-r1.ebuild
index c850e550eab4..2d8e874785be 100644
--- a/dev-vcs/git/git-2.51.2-r1.ebuild
+++ b/dev-vcs/git/git-2.51.2-r1.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-2.51.2-r2.ebuild b/dev-vcs/git/git-2.51.2-r2.ebuild
index 50c1c617921c..f30265495732 100644
--- a/dev-vcs/git/git-2.51.2-r2.ebuild
+++ b/dev-vcs/git/git-2.51.2-r2.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-2.52.0.ebuild b/dev-vcs/git/git-2.52.0.ebuild
index 1c3418dc1895..05e2eececab6 100644
--- a/dev-vcs/git/git-2.52.0.ebuild
+++ b/dev-vcs/git/git-2.52.0.ebuild
@@ -51,7 +51,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 959fb8a5dfae..c15a030e8035 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -51,7 +51,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 959fb8a5dfae..c15a030e8035 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -51,7 +51,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 959fb8a5dfae..c15a030e8035 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -51,7 +51,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 959fb8a5dfae..c15a030e8035 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -51,7 +51,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/gitg/gitg-44-r2.ebuild b/dev-vcs/gitg/gitg-44-r2.ebuild
index 7f7999400027..d0435b13515c 100644
--- a/dev-vcs/gitg/gitg-44-r2.ebuild
+++ b/dev-vcs/gitg/gitg-44-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gitg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="glade +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-vcs/gitg/gitg-44-r3.ebuild b/dev-vcs/gitg/gitg-44-r3.ebuild
index 35a25f5adf94..e0327118e955 100644
--- a/dev-vcs/gitg/gitg-44-r3.ebuild
+++ b/dev-vcs/gitg/gitg-44-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gitg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="glade +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-vcs/hg-git/hg-git-1.2.0-r1.ebuild b/dev-vcs/hg-git/hg-git-1.2.0-r1.ebuild
index 84e3b75ab181..0927d8d17984 100644
--- a/dev-vcs/hg-git/hg-git-1.2.0-r1.ebuild
+++ b/dev-vcs/hg-git/hg-git-1.2.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-vcs/hub/hub-2.14.2-r1.ebuild b/dev-vcs/hub/hub-2.14.2-r1.ebuild
index 783e6080a8f5..52552201d37f 100644
--- a/dev-vcs/hub/hub-2.14.2-r1.ebuild
+++ b/dev-vcs/hub/hub-2.14.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/github/hub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 BDEPEND="sys-apps/groff"
 RDEPEND=">=dev-vcs/git-1.7.3"
diff --git a/dev-vcs/mercurial/mercurial-6.7.4-r2.ebuild b/dev-vcs/mercurial/mercurial-6.7.4-r2.ebuild
index 776771449a7a..a6a0208677c7 100644
--- a/dev-vcs/mercurial/mercurial-6.7.4-r2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.7.4-r2.ebuild
@@ -192,7 +192,7 @@ LICENSE="GPL-2+
 	rust? (
 		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/dev-vcs/mercurial/mercurial-6.7.4-r3.ebuild b/dev-vcs/mercurial/mercurial-6.7.4-r3.ebuild
index 11bf0de28f2e..a71dfe3685a9 100644
--- a/dev-vcs/mercurial/mercurial-6.7.4-r3.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.7.4-r3.ebuild
@@ -192,7 +192,7 @@ LICENSE="GPL-2+
 	rust? (
 		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/dev-vcs/mercurial/mercurial-6.8.2.ebuild b/dev-vcs/mercurial/mercurial-6.8.2.ebuild
index 59a6157988dc..eacc8a062e97 100644
--- a/dev-vcs/mercurial/mercurial-6.8.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.8.2.ebuild
@@ -213,7 +213,7 @@ LICENSE="GPL-2+
 		Apache-2.0 BSD MIT MPL-2.0 MPL-2.0 PYTHON Unicode-DFS-2016
 		 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/dev-vcs/mercurial/mercurial-6.9.4.ebuild b/dev-vcs/mercurial/mercurial-6.9.4.ebuild
index 21071dac6117..a29d28142fcd 100644
--- a/dev-vcs/mercurial/mercurial-6.9.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.9.4.ebuild
@@ -228,7 +228,7 @@ LICENSE="GPL-2+
 		Apache-2.0 BSD MIT MPL-2.0 MPL-2.0 PYTHON Unicode-DFS-2016
 		 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/dev-vcs/mercurial/mercurial-7.0.3.ebuild b/dev-vcs/mercurial/mercurial-7.0.3.ebuild
index d96ba6a5d079..30c325386723 100644
--- a/dev-vcs/mercurial/mercurial-7.0.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-7.0.3.ebuild
@@ -246,7 +246,7 @@ LICENSE="GPL-2+
 		Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 PYTHON Unicode-3.0
 		 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="
diff --git a/dev-vcs/mercurial/mercurial-7.1.2.ebuild b/dev-vcs/mercurial/mercurial-7.1.2.ebuild
index cf4cf4d49d4d..ad76152c3119 100644
--- a/dev-vcs/mercurial/mercurial-7.1.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-7.1.2.ebuild
@@ -265,7 +265,7 @@ LICENSE="GPL-2+
 		Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-3.0 ZLIB
 		 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="
diff --git a/dev-vcs/rcs/rcs-5.10.1-r1.ebuild b/dev-vcs/rcs/rcs-5.10.1-r1.ebuild
index 264531f8cd70..0d0ce02ed50d 100644
--- a/dev-vcs/rcs/rcs-5.10.1-r1.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/rcs/${P}.tar.lz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND="sys-apps/diffutils
diff --git a/dev-vcs/subversion/subversion-1.14.5-r2.ebuild b/dev-vcs/subversion/subversion-1.14.5-r2.ebuild
index bac35f9c31e3..50cc3d7cc48c 100644
--- a/dev-vcs/subversion/subversion-1.14.5-r2.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.5-r2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 IUSE="apache2 berkdb debug doc extras keyring java kwallet nls perl plaintext-password-storage ruby sasl test"
 RESTRICT="!test? ( test )"
diff --git a/dev-vcs/subversion/subversion-1.14.5-r3.ebuild b/dev-vcs/subversion/subversion-1.14.5-r3.ebuild
index f4475cd2b583..8e3b85ad15d6 100644
--- a/dev-vcs/subversion/subversion-1.14.5-r3.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.5-r3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 IUSE="apache2 berkdb debug doc extras keyring java kwallet nls perl plaintext-password-storage ruby sasl test ${GENTOO_PERL_USESTRING}"
 RESTRICT="!test? ( test )"
diff --git a/dev-vcs/tig/tig-2.5.10.ebuild b/dev-vcs/tig/tig-2.5.10.ebuild
index 923fa9753306..3ae81009582d 100644
--- a/dev-vcs/tig/tig-2.5.10.ebuild
+++ b/dev-vcs/tig/tig-2.5.10.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-2.5.12.ebuild b/dev-vcs/tig/tig-2.5.12.ebuild
index 923fa9753306..3ae81009582d 100644
--- a/dev-vcs/tig/tig-2.5.12.ebuild
+++ b/dev-vcs/tig/tig-2.5.12.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-2.5.8.ebuild b/dev-vcs/tig/tig-2.5.8.ebuild
index 923fa9753306..3ae81009582d 100644
--- a/dev-vcs/tig/tig-2.5.8.ebuild
+++ b/dev-vcs/tig/tig-2.5.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-2.6.0.ebuild b/dev-vcs/tig/tig-2.6.0.ebuild
index 3871a7293f60..257545b557c9 100644
--- a/dev-vcs/tig/tig-2.6.0.ebuild
+++ b/dev-vcs/tig/tig-2.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tig/tig-9999.ebuild b/dev-vcs/tig/tig-9999.ebuild
index 3871a7293f60..257545b557c9 100644
--- a/dev-vcs/tig/tig-9999.ebuild
+++ b/dev-vcs/tig/tig-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="text mode interface for git"
diff --git a/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild
index c4a0d9192c0e..1c13efc8f053 100644
--- a/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild
+++ b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.earth.li/projectpurple/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0="
diff --git a/games-board/gnugo/gnugo-3.9.1-r2.ebuild b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
index 1e39be393301..bdbc9103cbd9 100644
--- a/games-board/gnugo/gnugo-3.9.1-r2.ebuild
+++ b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="readline"
 
 RDEPEND="
diff --git a/games-board/xmahjongg/xmahjongg-3.7-r2.ebuild b/games-board/xmahjongg/xmahjongg-3.7-r2.ebuild
index 0647b09ee666..65e132535ef6 100644
--- a/games-board/xmahjongg/xmahjongg-3.7-r2.ebuild
+++ b/games-board/xmahjongg/xmahjongg-3.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.lcdf.org/xmahjongg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~mips ~x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/games-emulation/gngb/gngb-20060309-r2.ebuild b/games-emulation/gngb/gngb-20060309-r2.ebuild
index 35b82bd4fef2..2a2502db121e 100644
--- a/games-emulation/gngb/gngb-20060309-r2.ebuild
+++ b/games-emulation/gngb/gngb-20060309-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://m.peponas.free.fr/gngb/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
 RDEPEND="
diff --git a/games-emulation/zsnes/zsnes-2.0.10.ebuild b/games-emulation/zsnes/zsnes-2.0.10.ebuild
index f6739bcd1725..85d058837a0e 100644
--- a/games-emulation/zsnes/zsnes-2.0.10.ebuild
+++ b/games-emulation/zsnes/zsnes-2.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xyproto/zsnes/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="custom-cflags"
 
 RDEPEND="
diff --git a/games-emulation/zsnes/zsnes-2.0.12.ebuild b/games-emulation/zsnes/zsnes-2.0.12.ebuild
index b08f976f0bb9..8312bb851390 100644
--- a/games-emulation/zsnes/zsnes-2.0.12.ebuild
+++ b/games-emulation/zsnes/zsnes-2.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xyproto/zsnes/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="custom-cflags"
 
 RDEPEND="
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
index 156ea3bb97c0..638a01500b23 100644
--- a/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
+++ b/games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 IUSE="l10n_cs l10n_de l10n_it"
 
 RDEPEND="games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
index 0a8b77e49d37..d9803c5e4539 100644
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
index efc053afd3ad..3f9662b42f00 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/${PN/mod-/}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index d9bbae038828..e93e59d82dff 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/${PN/mod-/}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index 76e4259df71d..b48e714ccd71 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/${P/-mod/}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
index 39551e1d0b58..1e3ee468e2cd 100644
--- a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
+++ b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
index 368eafccf262..5d6a588f14aa 100644
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
index 01b8b0343d37..3ee0136c11fa 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/fortune-it-${PVR}
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
index 459ec7141c15..91ceba24559c 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/kernelcookies-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index 79066dcae7a0..919bdaf6bf11 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
index 27fc1a3c51db..a9a47535dd13 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index 4dc1ec78dc12..f2f0105ac7ca 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 DEPEND="games-misc/fortune-mod"
 RDEPEND="${DEPEND}"
diff --git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
index 17378844e364..964d017be4d4 100644
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index 192dcbe74a3e..765dc1a13454 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1-r1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1-r1.ebuild
index df0ebe50fefa..06e4fbfee3c6 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1-r1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_PN}
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod
 	!>=games-misc/fortune-mod-3.6.1"
diff --git a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
index a643dafa55a8..464023f65597 100644
--- a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
+++ b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
index e2bb3af15c76..90aad2d0c5c4 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
index 70a0fb2fab67..1c11a96c539a 100644
--- a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
+++ b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/sex/sex-1.0-r3.ebuild b/games-misc/sex/sex-1.0-r3.ebuild
index 5851e3bd5f17..8a0e4a45cff7 100644
--- a/games-misc/sex/sex-1.0-r3.ebuild
+++ b/games-misc/sex/sex-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://spatula.net/software/sex/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="!sci-astronomy/sextractor"
 
diff --git a/games-misc/wtf/wtf-20221208.ebuild b/games-misc/wtf/wtf-20221208.ebuild
index 532c18575948..f43ad6d10c05 100644
--- a/games-misc/wtf/wtf-20221208.ebuild
+++ b/games-misc/wtf/wtf-20221208.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/bsd${PN}/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~s390 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<=games-misc/bsd-games-3"
 
diff --git a/games-misc/wtf/wtf-20230906.ebuild b/games-misc/wtf/wtf-20230906.ebuild
index a51c53a10356..3b45e2240680 100644
--- a/games-misc/wtf/wtf-20230906.ebuild
+++ b/games-misc/wtf/wtf-20230906.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/bsd${PN}/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~s390 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<=games-misc/bsd-games-3"
 
diff --git a/games-strategy/warmux/warmux-11.04.1-r3.ebuild b/games-strategy/warmux/warmux-11.04.1-r3.ebuild
index 605fc2ca702a..3f634646b2e7 100644
--- a/games-strategy/warmux/warmux-11.04.1-r3.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1-r3.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 	vlgothic
 "
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug unicode"
 
 RDEPEND="
diff --git a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
index 17fdfbe1c046..eefaa06d7826 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild b/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild
index bf45e030768a..e0b87eff2131 100644
--- a/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf/dconf-0.40.0.ebuild b/gnome-base/dconf/dconf-0.40.0.ebuild
index 93eeacb94985..ab6de5ec0680 100644
--- a/gnome-base/dconf/dconf-0.40.0.ebuild
+++ b/gnome-base/dconf/dconf-0.40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild
index a9d98de85a23..1f8aa9d3582a 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-common"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 src_configure() {
 	# Force people to rely on dev-build/autoconf-archive, bug #594084
diff --git a/gnome-base/gnome-desktop/gnome-desktop-44.1-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-44.1-r300.ebuild
index 29122992ba82..7ebb0a99177d 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-44.1-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-44.1-r300.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/20" # subslot = libgnome-desktop-3 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="debug +introspection seccomp systemd udev"
 
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-44.1-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-44.1-r400.ebuild
index 77f0add39141..adc4f74a324b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-44.1-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-44.1-r400.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="4/2" # subslot = libgnome-desktop-4 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="debug gtk-doc seccomp systemd udev"
 
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-44.3-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-44.3-r300.ebuild
index c2486ff8ff06..948398792420 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-44.3-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-44.3-r300.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/20" # subslot = libgnome-desktop-3 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug +introspection seccomp systemd udev"
 
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-44.3-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-44.3-r400.ebuild
index 14ab78319a04..5c2fe68832b7 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-44.3-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-44.3-r400.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="4/2" # subslot = libgnome-desktop-4 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug gtk-doc seccomp systemd udev"
 
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-44.4-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-44.4-r300.ebuild
index 29122992ba82..7ebb0a99177d 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-44.4-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-44.4-r300.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/20" # subslot = libgnome-desktop-3 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="debug +introspection seccomp systemd udev"
 
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-44.4-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-44.4-r400.ebuild
index 77f0add39141..adc4f74a324b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-44.4-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-44.4-r400.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="4/2" # subslot = libgnome-desktop-4 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="debug gtk-doc seccomp systemd udev"
 
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
index ddfde1d9405a..22fd254959ff 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-48.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-keyring"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="caps pam selinux +ssh-agent systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
index c25d0ad1d9d0..3f731c25f067 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/gnome-session/gnome-session-47.0.1-r2.ebuild b/gnome-base/gnome-session/gnome-session-47.0.1-r2.ebuild
index a3b5b2797bec..61c752939d73 100644
--- a/gnome-base/gnome-session/gnome-session-47.0.1-r2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-47.0.1-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc elogind systemd X"
 
 REQUIRED_USE="^^ ( elogind systemd )"
diff --git a/gnome-base/gnome-session/gnome-session-48.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-48.0-r1.ebuild
index 6209574ef9c3..36ec45509df6 100644
--- a/gnome-base/gnome-session/gnome-session-48.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-48.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc elogind systemd X"
 
 REQUIRED_USE="^^ ( elogind systemd )"
diff --git a/gnome-base/gnome-session/gnome-session-48.0-r2.ebuild b/gnome-base/gnome-session/gnome-session-48.0-r2.ebuild
index 8d84631498ee..94a97796ddf9 100644
--- a/gnome-base/gnome-session/gnome-session-48.0-r2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-48.0-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc elogind systemd X"
 
 REQUIRED_USE="^^ ( elogind systemd )"
diff --git a/gnome-base/gnome-session/gnome-session-48.0.ebuild b/gnome-base/gnome-session/gnome-session-48.0.ebuild
index 30bb31079361..06a658678f86 100644
--- a/gnome-base/gnome-session/gnome-session-48.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-48.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc elogind systemd X"
 
 REQUIRED_USE="^^ ( elogind systemd )"
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-47.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-47.2.ebuild
index b62d44a4f2e5..3ead049117d1 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-47.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-47.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test wayland"
 RESTRICT="!test? ( test )"
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-48.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-48.1.ebuild
index 7a4efd813fbe..e899c80b447c 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-48.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-48.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test wayland"
 RESTRICT="!test? ( test )"
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-47.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-47.1.ebuild
index 0f79e0981882..335fab9e1de6 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-47.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-47.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+introspection"
 
 BDEPEND="
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-48.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-48.0.ebuild
index aab45e142063..699436951368 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-48.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-48.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="+introspection"
 
 BDEPEND="
diff --git a/gnome-base/gvfs/gvfs-1.52.3-r2.ebuild b/gnome-base/gvfs/gvfs-1.52.3-r2.ebuild
index 7e5297c7cd8f..ed15aaeba98f 100644
--- a/gnome-base/gvfs/gvfs-1.52.3-r2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.52.3-r2.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.70.0:2
diff --git a/gnome-base/gvfs/gvfs-1.56.1-r2.ebuild b/gnome-base/gvfs/gvfs-1.56.1-r2.ebuild
index 38475384da4c..77dc16b4d5b1 100644
--- a/gnome-base/gvfs/gvfs-1.56.1-r2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.56.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gvfs"
 LICENSE="LGPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="afp archive bluray cdda cdr elogind fuse google keyring gnome-online-accounts gphoto2 +http ios mtp nfs onedrive policykit samba systemd test +udev udisks zeroconf"
 RESTRICT="!test? ( test )"
 # elogind/systemd only relevant to udisks (in v1.38.1)
diff --git a/gnome-base/libglade/libglade-2.6.4-r5.ebuild b/gnome-base/libglade/libglade-2.6.4-r5.ebuild
index de71bca38f6a..6b84a78364d6 100644
--- a/gnome-base/libglade/libglade-2.6.4-r5.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
index 238ef9940c36..bca69e617611 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="glade"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.28.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.28.1.ebuild
index 0d2964c2d9d7..ef47413724ea 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.28.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.28.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnomekbd"
 
 LICENSE="LGPL-2+"
 SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/librsvg/librsvg-2.40.21-r1.ebuild b/gnome-base/librsvg/librsvg-2.40.21-r1.ebuild
index 37754290e535..05ea00bde186 100644
--- a/gnome-base/librsvg/librsvg-2.40.21-r1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha arm ~hppa ~loong ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha arm ~hppa ~loong ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.56.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.56.2-r1.ebuild
index c690b6681824..f6bb9d6514f6 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.56.2-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.56.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.g
 LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0/64-11-21-4-3-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 sound vala +weather"
 REQUIRED_USE="
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.58.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.58.2.ebuild
index ac048178688d..f1141c34d1d5 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.58.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.58.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.g
 LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0/66-11-21-4-3-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 sound vala +weather"
 REQUIRED_USE="
diff --git a/gnome-extra/libgsf/libgsf-1.14.53-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.53-r1.ebuild
index 051a78e7e859..c19606e25d3c 100644
--- a/gnome-extra/libgsf/libgsf-1.14.53-r1.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.53-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
 
 LICENSE="LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="bzip2 gtk +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-extra/libgsf/libgsf-1.14.54.ebuild b/gnome-extra/libgsf/libgsf-1.14.54.ebuild
index c45375d53deb..48daeb5c822f 100644
--- a/gnome-extra/libgsf/libgsf-1.14.54.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.54.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
 
 LICENSE="LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-solaris"
 IUSE="bzip2 gtk +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-42.1-r1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-42.1-r1.ebuild
index 55fd011f895e..2a64292a2f6e 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-42.1-r1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-42.1-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	>=dev-libs/libxml2-2.6.12
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-42.4.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-42.4.ebuild
index 6cf7046ac872..51dd7d5b794e 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-42.4.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-42.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	>=dev-libs/libxml2-2.6.12
diff --git a/gnome-extra/yelp/yelp-42.3.ebuild b/gnome-extra/yelp/yelp-42.3.ebuild
index 37275cfe11c4..efbe33754f11 100644
--- a/gnome-extra/yelp/yelp-42.3.ebuild
+++ b/gnome-extra/yelp/yelp-42.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://apps.gnome.org/Yelp/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 # Removed upstream in 49.beta
 IUSE="X"
 
diff --git a/gnome-extra/zenity/zenity-4.0.5.ebuild b/gnome-extra/zenity/zenity-4.0.5.ebuild
index 1c5c9c2aee6b..4b379ca36979 100644
--- a/gnome-extra/zenity/zenity-4.0.5.ebuild
+++ b/gnome-extra/zenity/zenity-4.0.5.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/zenity"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="man webkit"
 
 # TODO: X11 dependency is automagically enabled
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.31.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.31.0.ebuild
index ef3bd3388b74..b90af5521506 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.31.0.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.31.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/gnustep-back-${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.32.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.32.0.ebuild
index 1c334a77c646..9465dd2813c0 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.32.0.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.32.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/gnustep-back-${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.31.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.31.0.ebuild
index 69c746c52726..942ed934f699 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.31.0.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.31.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.32.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.32.0.ebuild
index 964e3042fab3..47c0154de47d 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.32.0.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.32.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/gnustep-back-${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.31.0.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.31.0.ebuild
index 91b4cc35db7a..f7d5cc2cd4a9 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.31.0.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.31.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/gnustep-back-${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.32.0.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.32.0.ebuild
index 11b2da995d95..dc3b97c75718 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.32.0.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.32.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/gnustep-back-${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.28.0-r3.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.28.0-r3.ebuild
index 55ce64f79286..65f05677dde7 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.28.0-r3.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.28.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+gnutls +iconv +icu +libffi zeroconf"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.29.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.29.0-r1.ebuild
index 6d547659359e..2cb038dd9eee 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.29.0-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.29.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gnustep/libs-base/releases/download/base-${PV//./_}/
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="+gnutls +iconv +icu +libffi zeroconf"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.30.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.30.0-r1.ebuild
index 7499fbc1e529..eb7f91f942bb 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.30.0-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.30.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gnustep/libs-base/releases/download/base-${PV//./_}/
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+gnutls +iconv +icu +libffi zeroconf"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.31.1-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.31.1-r1.ebuild
index 6ce6dd19deb6..845f38166128 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.31.1-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.31.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="+gnutls +iconv +icu libdispatch +libffi zeroconf"
 
 # gnustep-make: tests use the option --timeout which was added in 2.9.3
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.31.1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.31.1.ebuild
index fbe9eab732f2..5f5b227010ff 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.31.1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.31.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gnustep/libs-base/releases/download/base-${PV//./_}/
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+gnutls +iconv +icu libdispatch +libffi zeroconf"
 
 # gnustep-make: tests use the option --timeout which was added in 2.9.3
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.31.1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.31.1.ebuild
index d7f2133e3205..adcb6cdbfd29 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.31.1.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.31.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="cups icu jpeg png speech"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.32.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.32.0.ebuild
index e9cfe17b5a95..8be741ff9a3f 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.32.0.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.32.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="cups icu jpeg png speech"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild
index 158cfd1202a1..fab374ee446d 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="libobjc2 native-exceptions"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.3-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.3-r1.ebuild
index 6d3138a972a0..656419ba0437 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.3-r1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="custom-cflags libobjc2 native-exceptions"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.3-r2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.3-r2.ebuild
index 25db0f59a7e6..7428b8b75b94 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.3-r2.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="libobjc2 native-exceptions"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.3.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.3.ebuild
index 3f647e509076..4628ea23c7db 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.3.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="custom-cflags libobjc2 native-exceptions"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
index f6ea3b525f6c..c4b9b9dcd0dc 100644
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
+++ b/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="app-misc/pax-utils
diff --git a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild b/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
index fae1394b2fba..9d326a64105f 100644
--- a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
+++ b/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/m/${PN}.tool/${PN}.tool_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="gnustep-base/gnustep-gui
diff --git a/gui-libs/display-manager-init/display-manager-init-1.1.2-r3.ebuild b/gui-libs/display-manager-init/display-manager-init-1.1.2-r3.ebuild
index 1336e4f45218..5d6241f8f9f0 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.1.2-r3.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.1.2-r3.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	sys-apps/gentoo-functions
diff --git a/llvm-core/clang-common/clang-common-15.0.7-r10.ebuild b/llvm-core/clang-common/clang-common-15.0.7-r10.ebuild
index 755dceddbf2f..df3f7cb5b59d 100644
--- a/llvm-core/clang-common/clang-common-15.0.7-r10.ebuild
+++ b/llvm-core/clang-common/clang-common-15.0.7-r10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld llvm-libunwind
 	hardened
diff --git a/llvm-core/clang-common/clang-common-16.0.6-r6.ebuild b/llvm-core/clang-common/clang-common-16.0.6-r6.ebuild
index 6ee0b8dc2563..874531807461 100644
--- a/llvm-core/clang-common/clang-common-16.0.6-r6.ebuild
+++ b/llvm-core/clang-common/clang-common-16.0.6-r6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-17.0.6-r10.ebuild b/llvm-core/clang-common/clang-common-17.0.6-r10.ebuild
index 0338e9faf42e..6c016d0e3c22 100644
--- a/llvm-core/clang-common/clang-common-17.0.6-r10.ebuild
+++ b/llvm-core/clang-common/clang-common-17.0.6-r10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-17.0.6-r9.ebuild b/llvm-core/clang-common/clang-common-17.0.6-r9.ebuild
index 62b812c2cf48..ad81812b1375 100644
--- a/llvm-core/clang-common/clang-common-17.0.6-r9.ebuild
+++ b/llvm-core/clang-common/clang-common-17.0.6-r9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-18.1.8-r3.ebuild b/llvm-core/clang-common/clang-common-18.1.8-r3.ebuild
index 20611bc156a9..e64f5ee45996 100644
--- a/llvm-core/clang-common/clang-common-18.1.8-r3.ebuild
+++ b/llvm-core/clang-common/clang-common-18.1.8-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-19.1.7.ebuild b/llvm-core/clang-common/clang-common-19.1.7.ebuild
index 090d17b3f756..af89907061a2 100644
--- a/llvm-core/clang-common/clang-common-19.1.7.ebuild
+++ b/llvm-core/clang-common/clang-common-19.1.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-20.1.8-r1.ebuild b/llvm-core/clang-common/clang-common-20.1.8-r1.ebuild
index fcd13386358b..1361040abca5 100644
--- a/llvm-core/clang-common/clang-common-20.1.8-r1.ebuild
+++ b/llvm-core/clang-common/clang-common-20.1.8-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet emacs hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-20.1.8.ebuild b/llvm-core/clang-common/clang-common-20.1.8.ebuild
index a75cae47544e..75a529ca4b5c 100644
--- a/llvm-core/clang-common/clang-common-20.1.8.ebuild
+++ b/llvm-core/clang-common/clang-common-20.1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-21.1.5.ebuild b/llvm-core/clang-common/clang-common-21.1.5.ebuild
index 12c019253c53..20df295eca0a 100644
--- a/llvm-core/clang-common/clang-common-21.1.5.ebuild
+++ b/llvm-core/clang-common/clang-common-21.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet emacs hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-21.1.6.ebuild b/llvm-core/clang-common/clang-common-21.1.6.ebuild
index 12c019253c53..20df295eca0a 100644
--- a/llvm-core/clang-common/clang-common-21.1.6.ebuild
+++ b/llvm-core/clang-common/clang-common-21.1.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet emacs hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-21.1.7.ebuild b/llvm-core/clang-common/clang-common-21.1.7.ebuild
index 12c019253c53..20df295eca0a 100644
--- a/llvm-core/clang-common/clang-common-21.1.7.ebuild
+++ b/llvm-core/clang-common/clang-common-21.1.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet emacs hardened llvm-libunwind
diff --git a/llvm-core/clang-common/clang-common-21.1.8.ebuild b/llvm-core/clang-common/clang-common-21.1.8.ebuild
index 12c019253c53..20df295eca0a 100644
--- a/llvm-core/clang-common/clang-common-21.1.8.ebuild
+++ b/llvm-core/clang-common/clang-common-21.1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld
 	bootstrap-prefix cet emacs hardened llvm-libunwind
diff --git a/llvm-core/clang-linker-config/clang-linker-config-16.ebuild b/llvm-core/clang-linker-config/clang-linker-config-16.ebuild
index 08682e7cf3b7..574bf18fb49c 100644
--- a/llvm-core/clang-linker-config/clang-linker-config-16.ebuild
+++ b/llvm-core/clang-linker-config/clang-linker-config-16.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-lld"
 
 RDEPEND="
diff --git a/llvm-core/clang-linker-config/clang-linker-config-17.ebuild b/llvm-core/clang-linker-config/clang-linker-config-17.ebuild
index 08682e7cf3b7..574bf18fb49c 100644
--- a/llvm-core/clang-linker-config/clang-linker-config-17.ebuild
+++ b/llvm-core/clang-linker-config/clang-linker-config-17.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-lld"
 
 RDEPEND="
diff --git a/llvm-core/clang-linker-config/clang-linker-config-18.ebuild b/llvm-core/clang-linker-config/clang-linker-config-18.ebuild
index 189ee5279a5f..244be1abbee2 100644
--- a/llvm-core/clang-linker-config/clang-linker-config-18.ebuild
+++ b/llvm-core/clang-linker-config/clang-linker-config-18.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-lld"
 
 RDEPEND="
diff --git a/llvm-core/clang-linker-config/clang-linker-config-19.ebuild b/llvm-core/clang-linker-config/clang-linker-config-19.ebuild
index 189ee5279a5f..244be1abbee2 100644
--- a/llvm-core/clang-linker-config/clang-linker-config-19.ebuild
+++ b/llvm-core/clang-linker-config/clang-linker-config-19.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-lld"
 
 RDEPEND="
diff --git a/llvm-core/clang-linker-config/clang-linker-config-20.ebuild b/llvm-core/clang-linker-config/clang-linker-config-20.ebuild
index 68c4b9e81a78..e4319f33d8d0 100644
--- a/llvm-core/clang-linker-config/clang-linker-config-20.ebuild
+++ b/llvm-core/clang-linker-config/clang-linker-config-20.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="default-lld"
 
 RDEPEND="
diff --git a/llvm-core/clang-linker-config/clang-linker-config-21.ebuild b/llvm-core/clang-linker-config/clang-linker-config-21.ebuild
index 189ee5279a5f..244be1abbee2 100644
--- a/llvm-core/clang-linker-config/clang-linker-config-21.ebuild
+++ b/llvm-core/clang-linker-config/clang-linker-config-21.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-lld"
 
 RDEPEND="
diff --git a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
index 92d05b089059..3ffc41c40428 100644
--- a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
+++ b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
index a064f8615f42..26e6a0ebbbc9 100644
--- a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
+++ b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-17.ebuild b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-17.ebuild
index a064f8615f42..26e6a0ebbbc9 100644
--- a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-17.ebuild
+++ b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-17.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-18.ebuild b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-18.ebuild
index 43ae2d05ac22..cb267f7d41bf 100644
--- a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-18.ebuild
+++ b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-18.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-19.ebuild b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-19.ebuild
index 43ae2d05ac22..cb267f7d41bf 100644
--- a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-19.ebuild
+++ b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-19.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-20.ebuild b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-20.ebuild
index 43ae2d05ac22..cb267f7d41bf 100644
--- a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-20.ebuild
+++ b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-20.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-21.ebuild b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-21.ebuild
index 472dcb82a70a..ac318db421c7 100644
--- a/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-21.ebuild
+++ b/llvm-core/clang-toolchain-symlinks/clang-toolchain-symlinks-21.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/llvm-core/clang/clang-15.0.7-r3.ebuild b/llvm-core/clang/clang-15.0.7-r3.ebuild
index 63d11ae16019..022e0ae9d26a 100644
--- a/llvm-core/clang/clang-15.0.7-r3.ebuild
+++ b/llvm-core/clang/clang-15.0.7-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}g1"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-16.0.6-r1.ebuild b/llvm-core/clang/clang-16.0.6-r1.ebuild
index 3e5f801f31bc..7737adbdfafa 100644
--- a/llvm-core/clang/clang-16.0.6-r1.ebuild
+++ b/llvm-core/clang/clang-16.0.6-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-16.0.6.ebuild b/llvm-core/clang/clang-16.0.6.ebuild
index d3208a1dc19f..4523c7b30e5d 100644
--- a/llvm-core/clang/clang-16.0.6.ebuild
+++ b/llvm-core/clang/clang-16.0.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-17.0.6-r1.ebuild b/llvm-core/clang/clang-17.0.6-r1.ebuild
index bb1edb93b509..2e7190441bba 100644
--- a/llvm-core/clang/clang-17.0.6-r1.ebuild
+++ b/llvm-core/clang/clang-17.0.6-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-17.0.6.ebuild b/llvm-core/clang/clang-17.0.6.ebuild
index 2be8e30209a1..d6f0ab4258b0 100644
--- a/llvm-core/clang/clang-17.0.6.ebuild
+++ b/llvm-core/clang/clang-17.0.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-18.1.8-r6.ebuild b/llvm-core/clang/clang-18.1.8-r6.ebuild
index 6213aae513ad..a65ec1da586b 100644
--- a/llvm-core/clang/clang-18.1.8-r6.ebuild
+++ b/llvm-core/clang/clang-18.1.8-r6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-18.1.8-r7.ebuild b/llvm-core/clang/clang-18.1.8-r7.ebuild
index 92d57045b270..8fced63e563e 100644
--- a/llvm-core/clang/clang-18.1.8-r7.ebuild
+++ b/llvm-core/clang/clang-18.1.8-r7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-19.1.7-r1.ebuild b/llvm-core/clang/clang-19.1.7-r1.ebuild
index a844ba290d6b..6ff812d7a1d0 100644
--- a/llvm-core/clang/clang-19.1.7-r1.ebuild
+++ b/llvm-core/clang/clang-19.1.7-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-19.1.7.ebuild b/llvm-core/clang/clang-19.1.7.ebuild
index e5cf30b6b6a2..8299e9c5036c 100644
--- a/llvm-core/clang/clang-19.1.7.ebuild
+++ b/llvm-core/clang/clang-19.1.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-20.1.8.ebuild b/llvm-core/clang/clang-20.1.8.ebuild
index c25f6a2f6ef2..d39c88104a09 100644
--- a/llvm-core/clang/clang-20.1.8.ebuild
+++ b/llvm-core/clang/clang-20.1.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-21.1.5.ebuild b/llvm-core/clang/clang-21.1.5.ebuild
index 17038668c2e9..80bf1478b854 100644
--- a/llvm-core/clang/clang-21.1.5.ebuild
+++ b/llvm-core/clang/clang-21.1.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-21.1.6.ebuild b/llvm-core/clang/clang-21.1.6.ebuild
index 17038668c2e9..80bf1478b854 100644
--- a/llvm-core/clang/clang-21.1.6.ebuild
+++ b/llvm-core/clang/clang-21.1.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-21.1.7.ebuild b/llvm-core/clang/clang-21.1.7.ebuild
index 17038668c2e9..80bf1478b854 100644
--- a/llvm-core/clang/clang-21.1.7.ebuild
+++ b/llvm-core/clang/clang-21.1.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/clang/clang-21.1.8.ebuild b/llvm-core/clang/clang-21.1.8.ebuild
index 17038668c2e9..80bf1478b854 100644
--- a/llvm-core/clang/clang-21.1.8.ebuild
+++ b/llvm-core/clang/clang-21.1.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/llvm-core/llvm-common/llvm-common-15.0.7.ebuild b/llvm-core/llvm-common/llvm-common-15.0.7.ebuild
index 9fc6a51e6938..32f2380f3c85 100644
--- a/llvm-core/llvm-common/llvm-common-15.0.7.ebuild
+++ b/llvm-core/llvm-common/llvm-common-15.0.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-16.0.6.ebuild b/llvm-core/llvm-common/llvm-common-16.0.6.ebuild
index ab538bb9dffc..42d48a61fd07 100644
--- a/llvm-core/llvm-common/llvm-common-16.0.6.ebuild
+++ b/llvm-core/llvm-common/llvm-common-16.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-17.0.6.ebuild b/llvm-core/llvm-common/llvm-common-17.0.6.ebuild
index ab538bb9dffc..42d48a61fd07 100644
--- a/llvm-core/llvm-common/llvm-common-17.0.6.ebuild
+++ b/llvm-core/llvm-common/llvm-common-17.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-18.1.8.ebuild b/llvm-core/llvm-common/llvm-common-18.1.8.ebuild
index 021f208249c7..a286eb395d36 100644
--- a/llvm-core/llvm-common/llvm-common-18.1.8.ebuild
+++ b/llvm-core/llvm-common/llvm-common-18.1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-19.1.7.ebuild b/llvm-core/llvm-common/llvm-common-19.1.7.ebuild
index 021f208249c7..a286eb395d36 100644
--- a/llvm-core/llvm-common/llvm-common-19.1.7.ebuild
+++ b/llvm-core/llvm-common/llvm-common-19.1.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-20.1.8.ebuild b/llvm-core/llvm-common/llvm-common-20.1.8.ebuild
index 021f208249c7..a286eb395d36 100644
--- a/llvm-core/llvm-common/llvm-common-20.1.8.ebuild
+++ b/llvm-core/llvm-common/llvm-common-20.1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-21.1.5.ebuild b/llvm-core/llvm-common/llvm-common-21.1.5.ebuild
index 51e99804fd59..dc0235e481fb 100644
--- a/llvm-core/llvm-common/llvm-common-21.1.5.ebuild
+++ b/llvm-core/llvm-common/llvm-common-21.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-21.1.6.ebuild b/llvm-core/llvm-common/llvm-common-21.1.6.ebuild
index 51e99804fd59..dc0235e481fb 100644
--- a/llvm-core/llvm-common/llvm-common-21.1.6.ebuild
+++ b/llvm-core/llvm-common/llvm-common-21.1.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-21.1.7.ebuild b/llvm-core/llvm-common/llvm-common-21.1.7.ebuild
index 51e99804fd59..dc0235e481fb 100644
--- a/llvm-core/llvm-common/llvm-common-21.1.7.ebuild
+++ b/llvm-core/llvm-common/llvm-common-21.1.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-common/llvm-common-21.1.8.ebuild b/llvm-core/llvm-common/llvm-common-21.1.8.ebuild
index 51e99804fd59..dc0235e481fb 100644
--- a/llvm-core/llvm-common/llvm-common-21.1.8.ebuild
+++ b/llvm-core/llvm-common/llvm-common-21.1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="emacs"
 
 RDEPEND="
diff --git a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
index f4554ee8e4d2..46eba55962dc 100644
--- a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
+++ b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
index 047758c24cb0..a749606ee6ba 100644
--- a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
+++ b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-17-r1.ebuild b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-17-r1.ebuild
index 19243a2ebd5d..40617071e13c 100644
--- a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-17-r1.ebuild
+++ b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-17-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild
index df27532d3151..0f7e83122588 100644
--- a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild
+++ b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild
index df27532d3151..0f7e83122588 100644
--- a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild
+++ b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-20-r1.ebuild b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-20-r1.ebuild
index df27532d3151..0f7e83122588 100644
--- a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-20-r1.ebuild
+++ b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-20-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-21.ebuild b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-21.ebuild
index 8d7c28dc27c2..5aa491c26a3d 100644
--- a/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-21.ebuild
+++ b/llvm-core/llvm-toolchain-symlinks/llvm-toolchain-symlinks-21.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/llvm-core/llvm/llvm-15.0.7-r7.ebuild b/llvm-core/llvm/llvm-15.0.7-r7.ebuild
index ed629e4e1454..a5e9fc57334c 100644
--- a/llvm-core/llvm/llvm-15.0.7-r7.ebuild
+++ b/llvm-core/llvm/llvm-15.0.7-r7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="
 	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
 	xml z3 zstd
diff --git a/llvm-core/llvm/llvm-16.0.6-r5.ebuild b/llvm-core/llvm/llvm-16.0.6-r5.ebuild
index 2b2ebdccefb7..d71190600f33 100644
--- a/llvm-core/llvm/llvm-16.0.6-r5.ebuild
+++ b/llvm-core/llvm/llvm-16.0.6-r5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
 	xml z3 zstd
diff --git a/llvm-core/llvm/llvm-17.0.6-r3.ebuild b/llvm-core/llvm/llvm-17.0.6-r3.ebuild
index 42f692eb7a72..df1f44f0d51b 100644
--- a/llvm-core/llvm/llvm-17.0.6-r3.ebuild
+++ b/llvm-core/llvm/llvm-17.0.6-r3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
 	ncurses test xar xml z3 zstd
diff --git a/llvm-core/llvm/llvm-18.1.8-r6.ebuild b/llvm-core/llvm/llvm-18.1.8-r6.ebuild
index aa782759e24f..7b35193ffdca 100644
--- a/llvm-core/llvm/llvm-18.1.8-r6.ebuild
+++ b/llvm-core/llvm/llvm-18.1.8-r6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
 	ncurses test xml z3 zstd
diff --git a/llvm-core/llvm/llvm-19.1.7.ebuild b/llvm-core/llvm/llvm-19.1.7.ebuild
index 89121db62dc9..c1fddcca9ae9 100644
--- a/llvm-core/llvm/llvm-19.1.7.ebuild
+++ b/llvm-core/llvm/llvm-19.1.7.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
 	test xml z3 zstd
diff --git a/llvm-core/llvm/llvm-20.1.8.ebuild b/llvm-core/llvm/llvm-20.1.8.ebuild
index 0eca73d39320..211073417702 100644
--- a/llvm-core/llvm/llvm-20.1.8.ebuild
+++ b/llvm-core/llvm/llvm-20.1.8.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
 	test xml z3 zstd
diff --git a/llvm-core/llvm/llvm-21.1.5.ebuild b/llvm-core/llvm/llvm-21.1.5.ebuild
index e8451a292f68..67c9f7c97d09 100644
--- a/llvm-core/llvm/llvm-21.1.5.ebuild
+++ b/llvm-core/llvm/llvm-21.1.5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
 	test xml z3 zstd
diff --git a/llvm-core/llvm/llvm-21.1.6.ebuild b/llvm-core/llvm/llvm-21.1.6.ebuild
index e8451a292f68..67c9f7c97d09 100644
--- a/llvm-core/llvm/llvm-21.1.6.ebuild
+++ b/llvm-core/llvm/llvm-21.1.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
 	test xml z3 zstd
diff --git a/llvm-core/llvm/llvm-21.1.7.ebuild b/llvm-core/llvm/llvm-21.1.7.ebuild
index e8451a292f68..67c9f7c97d09 100644
--- a/llvm-core/llvm/llvm-21.1.7.ebuild
+++ b/llvm-core/llvm/llvm-21.1.7.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
 	test xml z3 zstd
diff --git a/llvm-core/llvm/llvm-21.1.8.ebuild b/llvm-core/llvm/llvm-21.1.8.ebuild
index e8451a292f68..67c9f7c97d09 100644
--- a/llvm-core/llvm/llvm-21.1.8.ebuild
+++ b/llvm-core/llvm/llvm-21.1.8.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
 	test xml z3 zstd
diff --git a/llvm-core/llvmgold/llvmgold-15.ebuild b/llvm-core/llvmgold/llvmgold-15.ebuild
index 93ade9c975fc..c2357ee067bd 100644
--- a/llvm-core/llvmgold/llvmgold-15.ebuild
+++ b/llvm-core/llvmgold/llvmgold-15.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	llvm-core/llvm:${PV}[binutils-plugin]
diff --git a/llvm-core/llvmgold/llvmgold-16.ebuild b/llvm-core/llvmgold/llvmgold-16.ebuild
index a6bf73974039..4122727ec5bf 100644
--- a/llvm-core/llvmgold/llvmgold-16.ebuild
+++ b/llvm-core/llvmgold/llvmgold-16.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	llvm-core/llvm:${PV}[binutils-plugin]
diff --git a/llvm-core/llvmgold/llvmgold-17.ebuild b/llvm-core/llvmgold/llvmgold-17.ebuild
index a6bf73974039..4122727ec5bf 100644
--- a/llvm-core/llvmgold/llvmgold-17.ebuild
+++ b/llvm-core/llvmgold/llvmgold-17.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	llvm-core/llvm:${PV}[binutils-plugin]
diff --git a/llvm-core/llvmgold/llvmgold-18.ebuild b/llvm-core/llvmgold/llvmgold-18.ebuild
index 1d406b767a18..5bf89f9c3cc1 100644
--- a/llvm-core/llvmgold/llvmgold-18.ebuild
+++ b/llvm-core/llvmgold/llvmgold-18.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	llvm-core/llvm:${PV}[binutils-plugin]
diff --git a/llvm-core/llvmgold/llvmgold-19.ebuild b/llvm-core/llvmgold/llvmgold-19.ebuild
index 1d406b767a18..5bf89f9c3cc1 100644
--- a/llvm-core/llvmgold/llvmgold-19.ebuild
+++ b/llvm-core/llvmgold/llvmgold-19.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	llvm-core/llvm:${PV}[binutils-plugin]
diff --git a/llvm-core/llvmgold/llvmgold-20.ebuild b/llvm-core/llvmgold/llvmgold-20.ebuild
index 1d406b767a18..5bf89f9c3cc1 100644
--- a/llvm-core/llvmgold/llvmgold-20.ebuild
+++ b/llvm-core/llvmgold/llvmgold-20.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	llvm-core/llvm:${PV}[binutils-plugin]
diff --git a/llvm-core/llvmgold/llvmgold-21.ebuild b/llvm-core/llvmgold/llvmgold-21.ebuild
index 6400423552a8..0a2ff3d2d4b0 100644
--- a/llvm-core/llvmgold/llvmgold-21.ebuild
+++ b/llvm-core/llvmgold/llvmgold-21.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	llvm-core/llvm:${PV}[binutils-plugin]
diff --git a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-16.ebuild b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-16.ebuild
index e881265c4543..15343a5416ec 100644
--- a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-16.ebuild
+++ b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-16.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt +abi_x86_32 abi_x86_64"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-17.ebuild b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-17.ebuild
index e881265c4543..15343a5416ec 100644
--- a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-17.ebuild
+++ b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-17.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt +abi_x86_32 abi_x86_64"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-18.ebuild b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-18.ebuild
index 402bf3753257..c66130915f1a 100644
--- a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-18.ebuild
+++ b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-18.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt +abi_x86_32 abi_x86_64"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-19.ebuild b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-19.ebuild
index 402bf3753257..c66130915f1a 100644
--- a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-19.ebuild
+++ b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-19.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt +abi_x86_32 abi_x86_64"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-20.ebuild b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-20.ebuild
index 7aa6b81f1f8a..b86d9884fd65 100644
--- a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-20.ebuild
+++ b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-20.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt +abi_x86_32 abi_x86_64"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-21.ebuild b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-21.ebuild
index 402bf3753257..c66130915f1a 100644
--- a/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-21.ebuild
+++ b/llvm-runtimes/clang-rtlib-config/clang-rtlib-config-21.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt +abi_x86_32 abi_x86_64"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-15.0.7.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-15.0.7.ebuild
index 4766ba87f477..d612bfbd91fc 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-15.0.7.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-15.0.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-16.0.6-r1.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-16.0.6-r1.ebuild
index 81c4d821e902..67a90f9dde31 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-16.0.6-r1.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-16.0.6-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-16.0.6.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-16.0.6.ebuild
index 6979e5f2de80..4ff3bdebe5fa 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-16.0.6.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-16.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="${PV%%.*}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-17.0.6-r1.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-17.0.6-r1.ebuild
index 81c4d821e902..67a90f9dde31 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-17.0.6-r1.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-17.0.6-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-17.0.6.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-17.0.6.ebuild
index 6979e5f2de80..4ff3bdebe5fa 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-17.0.6.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-17.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="${PV%%.*}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-18.1.8-r1.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-18.1.8-r1.ebuild
index a1823f8f937a..84599cf4e1d1 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-18.1.8-r1.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-18.1.8-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-18.1.8.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-18.1.8.ebuild
index 86cac71f946d..8663fbdbcbac 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-18.1.8.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-18.1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="${PV%%.*}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-19.1.7-r1.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-19.1.7-r1.ebuild
index 25a2aa069c5e..ae93453f710c 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-19.1.7-r1.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-19.1.7-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+compiler-rt libcxx offload openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-19.1.7.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-19.1.7.ebuild
index f9e1dc2a644a..c1764df8bfac 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-19.1.7.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-19.1.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="${PV%%.*}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+compiler-rt libcxx offload openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-20.1.8-r1.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-20.1.8-r1.ebuild
index c791a8965f21..c21a64b31f09 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-20.1.8-r1.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-20.1.8-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+compiler-rt libcxx offload openmp +sanitize
 	default-compiler-rt default-libcxx default-lld llvm-libunwind polly
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-20.1.8.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-20.1.8.ebuild
index ab58a035924e..566874507469 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-20.1.8.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-20.1.8.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+compiler-rt libcxx offload openmp +sanitize
 	default-compiler-rt default-libcxx default-lld llvm-libunwind polly
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-21.1.5.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-21.1.5.ebuild
index 0257b6f597d4..fa1e8c8c494a 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-21.1.5.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-21.1.5.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+compiler-rt libcxx offload openmp +sanitize
 	default-compiler-rt default-libcxx default-lld llvm-libunwind polly
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-21.1.6.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-21.1.6.ebuild
index 0257b6f597d4..fa1e8c8c494a 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-21.1.6.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-21.1.6.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+compiler-rt libcxx offload openmp +sanitize
 	default-compiler-rt default-libcxx default-lld llvm-libunwind polly
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-21.1.7.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-21.1.7.ebuild
index 0257b6f597d4..fa1e8c8c494a 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-21.1.7.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-21.1.7.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+compiler-rt libcxx offload openmp +sanitize
 	default-compiler-rt default-libcxx default-lld llvm-libunwind polly
diff --git a/llvm-runtimes/clang-runtime/clang-runtime-21.1.8.ebuild b/llvm-runtimes/clang-runtime/clang-runtime-21.1.8.ebuild
index 0257b6f597d4..fa1e8c8c494a 100644
--- a/llvm-runtimes/clang-runtime/clang-runtime-21.1.8.ebuild
+++ b/llvm-runtimes/clang-runtime/clang-runtime-21.1.8.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="
 	+compiler-rt libcxx offload openmp +sanitize
 	default-compiler-rt default-libcxx default-lld llvm-libunwind polly
diff --git a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-16.ebuild b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-16.ebuild
index 83af76dbe7b2..8cc966116080 100644
--- a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-16.ebuild
+++ b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-16.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-libcxx"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-17.ebuild b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-17.ebuild
index 83af76dbe7b2..8cc966116080 100644
--- a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-17.ebuild
+++ b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-17.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-libcxx"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-18.ebuild b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-18.ebuild
index 83af76dbe7b2..8cc966116080 100644
--- a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-18.ebuild
+++ b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-18.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-libcxx"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-19.ebuild b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-19.ebuild
index 83af76dbe7b2..8cc966116080 100644
--- a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-19.ebuild
+++ b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-19.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-libcxx"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-20.ebuild b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-20.ebuild
index 20f4027541e6..18b51230abd5 100644
--- a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-20.ebuild
+++ b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-20.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="default-libcxx"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-21.ebuild b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-21.ebuild
index 83af76dbe7b2..8cc966116080 100644
--- a/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-21.ebuild
+++ b/llvm-runtimes/clang-stdlib-config/clang-stdlib-config-21.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-libcxx"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-16.ebuild b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-16.ebuild
index a79060177637..e7133734f138 100644
--- a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-16.ebuild
+++ b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-16.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt llvm-libunwind"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-17.ebuild b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-17.ebuild
index a79060177637..e7133734f138 100644
--- a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-17.ebuild
+++ b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-17.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt llvm-libunwind"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-18.ebuild b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-18.ebuild
index a79060177637..e7133734f138 100644
--- a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-18.ebuild
+++ b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-18.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt llvm-libunwind"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-19.ebuild b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-19.ebuild
index a79060177637..e7133734f138 100644
--- a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-19.ebuild
+++ b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-19.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt llvm-libunwind"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-20.ebuild b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-20.ebuild
index 86afeaffbd30..77c58bc3e356 100644
--- a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-20.ebuild
+++ b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-20.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt llvm-libunwind"
 
 RDEPEND="
diff --git a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-21.ebuild b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-21.ebuild
index a79060177637..e7133734f138 100644
--- a/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-21.ebuild
+++ b/llvm-runtimes/clang-unwindlib-config/clang-unwindlib-config-21.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="default-compiler-rt llvm-libunwind"
 
 RDEPEND="
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
index e1e820112bfe..314dacac579a 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_VERSION}"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
index 39b406a01a02..9b2c4b282244 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
index d2860ee2a91d..f8c7da14a7f0 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
index d5763ec0cbeb..157b2030d24f 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild
index 98ef220c20b3..71a75a0aac12 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8-r1.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8-r1.ebuild
index 8cb90e0fcf53..29bf49a4ceaa 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8-r1.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild
index a5292776126c..2162ac87816a 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.5.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.5.ebuild
index 4da36894490d..05fbb1293013 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.5.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.6.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.6.ebuild
index 4da36894490d..05fbb1293013 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.6.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.7.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.7.ebuild
index 4da36894490d..05fbb1293013 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.7.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.8.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.8.ebuild
index 4da36894490d..05fbb1293013 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.8.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-15.0.7-r2.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-15.0.7-r2.ebuild
index 8d7bbefb92e3..800c2532d983 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-15.0.7-r2.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-15.0.7-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_VERSION}"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-16.0.6-r6.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-16.0.6-r6.ebuild
index d4bb60a5a78c..50d58bca3294 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-16.0.6-r6.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-16.0.6-r6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-17.0.6-r2.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-17.0.6-r2.ebuild
index f7212d3f40ea..42c5185683ab 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-17.0.6-r2.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-17.0.6-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-18.1.8-r2.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-18.1.8-r2.ebuild
index f729c19638ae..7841afab3edb 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-18.1.8-r2.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-18.1.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-19.1.7.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-19.1.7.ebuild
index e6df90c2c2eb..02ea2f5b7abb 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-19.1.7.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-19.1.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-20.1.8-r1.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-20.1.8-r1.ebuild
index 4867769cbe92..c81de912010f 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-20.1.8-r1.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-20.1.8-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-20.1.8.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-20.1.8.ebuild
index e6df90c2c2eb..02ea2f5b7abb 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-20.1.8.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-20.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-21.1.5.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-21.1.5.ebuild
index cbb527025390..d865769f1edc 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-21.1.5.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-21.1.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-21.1.6.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-21.1.6.ebuild
index cbb527025390..d865769f1edc 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-21.1.6.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-21.1.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-21.1.7.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-21.1.7.ebuild
index cbb527025390..d865769f1edc 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-21.1.7.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-21.1.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-21.1.8.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-21.1.8.ebuild
index cbb527025390..d865769f1edc 100644
--- a/llvm-runtimes/compiler-rt/compiler-rt-21.1.8.ebuild
+++ b/llvm-runtimes/compiler-rt/compiler-rt-21.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
 REQUIRED_USE="atomic-builtins? ( clang )"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/llvm-runtimes/openmp/openmp-15.0.7-r6.ebuild b/llvm-runtimes/openmp/openmp-15.0.7-r6.ebuild
index c2a4cfc1c057..ae067caa94ff 100644
--- a/llvm-runtimes/openmp/openmp-15.0.7-r6.ebuild
+++ b/llvm-runtimes/openmp/openmp-15.0.7-r6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~x64-macos"
 IUSE="
 	debug hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/llvm-runtimes/openmp/openmp-16.0.6.ebuild b/llvm-runtimes/openmp/openmp-16.0.6.ebuild
index 72b1601886a3..86050995b8ea 100644
--- a/llvm-runtimes/openmp/openmp-16.0.6.ebuild
+++ b/llvm-runtimes/openmp/openmp-16.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~x64-macos"
 IUSE="
 	debug gdb-plugin hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/llvm-runtimes/openmp/openmp-17.0.6.ebuild b/llvm-runtimes/openmp/openmp-17.0.6.ebuild
index 50715455a515..938023911737 100644
--- a/llvm-runtimes/openmp/openmp-17.0.6.ebuild
+++ b/llvm-runtimes/openmp/openmp-17.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~x64-macos"
 IUSE="
 	debug gdb-plugin hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/llvm-runtimes/openmp/openmp-18.1.8.ebuild b/llvm-runtimes/openmp/openmp-18.1.8.ebuild
index 866ca4a5b663..2722f77b3333 100644
--- a/llvm-runtimes/openmp/openmp-18.1.8.ebuild
+++ b/llvm-runtimes/openmp/openmp-18.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~x64-macos"
 IUSE="
 	debug gdb-plugin hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/llvm-runtimes/openmp/openmp-19.1.7.ebuild b/llvm-runtimes/openmp/openmp-19.1.7.ebuild
index 86568063e4c9..db048e8c55c3 100644
--- a/llvm-runtimes/openmp/openmp-19.1.7.ebuild
+++ b/llvm-runtimes/openmp/openmp-19.1.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~x64-macos"
 IUSE="debug gdb-plugin hwloc ompt test"
 REQUIRED_USE="
 	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
diff --git a/llvm-runtimes/openmp/openmp-20.1.8.ebuild b/llvm-runtimes/openmp/openmp-20.1.8.ebuild
index 7010c32cca7c..deb9ff7ab713 100644
--- a/llvm-runtimes/openmp/openmp-20.1.8.ebuild
+++ b/llvm-runtimes/openmp/openmp-20.1.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~x64-macos"
 IUSE="debug gdb-plugin hwloc ompt test"
 REQUIRED_USE="
 	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
diff --git a/llvm-runtimes/openmp/openmp-21.1.5.ebuild b/llvm-runtimes/openmp/openmp-21.1.5.ebuild
index f3dd3189181c..60cc0fda40e5 100644
--- a/llvm-runtimes/openmp/openmp-21.1.5.ebuild
+++ b/llvm-runtimes/openmp/openmp-21.1.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="debug gdb-plugin hwloc ompt test"
 REQUIRED_USE="
 	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
diff --git a/llvm-runtimes/openmp/openmp-21.1.6.ebuild b/llvm-runtimes/openmp/openmp-21.1.6.ebuild
index f3dd3189181c..60cc0fda40e5 100644
--- a/llvm-runtimes/openmp/openmp-21.1.6.ebuild
+++ b/llvm-runtimes/openmp/openmp-21.1.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="debug gdb-plugin hwloc ompt test"
 REQUIRED_USE="
 	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
diff --git a/llvm-runtimes/openmp/openmp-21.1.7.ebuild b/llvm-runtimes/openmp/openmp-21.1.7.ebuild
index f3dd3189181c..60cc0fda40e5 100644
--- a/llvm-runtimes/openmp/openmp-21.1.7.ebuild
+++ b/llvm-runtimes/openmp/openmp-21.1.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="debug gdb-plugin hwloc ompt test"
 REQUIRED_USE="
 	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
diff --git a/llvm-runtimes/openmp/openmp-21.1.8.ebuild b/llvm-runtimes/openmp/openmp-21.1.8.ebuild
index f3dd3189181c..60cc0fda40e5 100644
--- a/llvm-runtimes/openmp/openmp-21.1.8.ebuild
+++ b/llvm-runtimes/openmp/openmp-21.1.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="debug gdb-plugin hwloc ompt test"
 REQUIRED_USE="
 	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
diff --git a/lxde-base/lxappearance/lxappearance-0.6.4-r2.ebuild b/lxde-base/lxappearance/lxappearance-0.6.4-r2.ebuild
index 922fe1621c1b..0261d511b9de 100644
--- a/lxde-base/lxappearance/lxappearance-0.6.4-r2.ebuild
+++ b/lxde-base/lxappearance/lxappearance-0.6.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxde/lxappearance/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.26.0:2
diff --git a/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild b/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
index 8316ae07e584..3a8c4152039a 100644
--- a/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
+++ b/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild
index b7f7d2234487..c8d087818ba3 100644
--- a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild
+++ b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/LXDE%20Icon%20Theme/${P}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild b/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
index cd8ea21ff43c..88063bd7d653 100644
--- a/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
+++ b/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild b/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
index 46a171cfdb5f..a5aad561f5f9 100644
--- a/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
+++ b/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
index 49c8ca36ee8b..bb7232025d66 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild
index 7c2438aee8f8..4181854f959c 100644
--- a/lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE="+alsa wifi"
 
 RDEPEND="
diff --git a/lxde-base/lxpanel/lxpanel-0.10.1-r2.ebuild b/lxde-base/lxpanel/lxpanel-0.10.1-r2.ebuild
index 1839a56bff47..a695c01a6ae8 100644
--- a/lxde-base/lxpanel/lxpanel-0.10.1-r2.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.10.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE="+alsa wifi"
 
 RDEPEND="
diff --git a/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild b/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
index f45f9f85996e..251af1934204 100644
--- a/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
+++ b/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxsession/lxsession-0.5.6.ebuild b/lxde-base/lxsession/lxsession-0.5.6.ebuild
index adf5205bc469..329996efc6f4 100644
--- a/lxde-base/lxsession/lxsession-0.5.6.ebuild
+++ b/lxde-base/lxsession/lxsession-0.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxde/lxsession/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE="nls upower"
 # No real tests and as of 0.5.6, fails on an nls linting issue.
 RESTRICT="test"
diff --git a/lxde-base/lxtask/lxtask-0.1.10.ebuild b/lxde-base/lxtask/lxtask-0.1.10.ebuild
index db4a7552cc2b..2b0eb765bb46 100644
--- a/lxde-base/lxtask/lxtask-0.1.10.ebuild
+++ b/lxde-base/lxtask/lxtask-0.1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/lxterminal/lxterminal-0.4.0_p20230917.ebuild b/lxde-base/lxterminal/lxterminal-0.4.0_p20230917.ebuild
index 59dcdc6f4301..25384e89d0f9 100644
--- a/lxde-base/lxterminal/lxterminal-0.4.0_p20230917.ebuild
+++ b/lxde-base/lxterminal/lxterminal-0.4.0_p20230917.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86"
 
 DEPEND="
 	dev-libs/glib:2
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
index b7a91839f7ea..fa49f6e8d11b 100644
--- a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
+++ b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # ABI is v2. See Makefile.am
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/mail-client/mailx-support/mailx-support-20060102-r3.ebuild b/mail-client/mailx-support/mailx-support-20060102-r3.ebuild
index b50f7e49925b..94cbb9ee3768 100644
--- a/mail-client/mailx-support/mailx-support-20060102-r3.ebuild
+++ b/mail-client/mailx-support/mailx-support-20060102-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-respect-ldflags.patch
diff --git a/mail-client/mailx/mailx-8.1.2.20220412.ebuild b/mail-client/mailx/mailx-8.1.2.20220412.ebuild
index b6e9c22fd362..e8e4fc33913a 100644
--- a/mail-client/mailx/mailx-8.1.2.20220412.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20220412.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	>=net-libs/liblockfile-1.03
diff --git a/mail-client/mutt/mutt-2.2.14-r1.ebuild b/mail-client/mutt/mutt-2.2.14-r1.ebuild
index 9a70421f4178..f82709629880 100644
--- a/mail-client/mutt/mutt-2.2.14-r1.ebuild
+++ b/mail-client/mutt/mutt-2.2.14-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.mutt.org/pub/mutt/${P}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme gsasl +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
 # hcache: allow multiple, bug #607360
 REQUIRED_USE="
diff --git a/mail-client/mutt/mutt-2.2.16.ebuild b/mail-client/mutt/mutt-2.2.16.ebuild
index 76863b705adf..8281c15134be 100644
--- a/mail-client/mutt/mutt-2.2.16.ebuild
+++ b/mail-client/mutt/mutt-2.2.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.mutt.org/pub/mutt/${P}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme gsasl +hcache idn +imap kerberos +lmdb mbox nls pop qdbm +sasl selinux slang +smtp +ssl tokyocabinet vanilla prefix"
 # hcache: allow multiple, bug #607360
 REQUIRED_USE="
diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild b/mail-client/s-nail/s-nail-14.9.24.ebuild
index c4dcbebe8a18..8131b6e7dc0b 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -11,7 +11,7 @@ LICENSE="BSD BSD-4 ISC RSA"
 
 SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="idn kerberos net +split-usr ssl"
 
 RDEPEND="
diff --git a/mail-client/s-nail/s-nail-14.9.25.ebuild b/mail-client/s-nail/s-nail-14.9.25.ebuild
index 02ef91e71486..cb7af164979c 100644
--- a/mail-client/s-nail/s-nail-14.9.25.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz"
 
 LICENSE="BSD BSD-4 ISC RSA"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="idn kerberos net +split-usr ssl"
 
 RDEPEND="
diff --git a/mail-filter/procmail/procmail-3.24-r1.ebuild b/mail-filter/procmail/procmail-3.24-r1.ebuild
index 9b1f524fe23e..d06e98f72fa5 100644
--- a/mail-filter/procmail/procmail-3.24-r1.ebuild
+++ b/mail-filter/procmail/procmail-3.24-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/BuGlessRB/procmail/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="mbox selinux"
 
 DEPEND="
diff --git a/mail-filter/procmail/procmail-3.24.ebuild b/mail-filter/procmail/procmail-3.24.ebuild
index 5f459fb1f560..83c2d2a6f1a0 100644
--- a/mail-filter/procmail/procmail-3.24.ebuild
+++ b/mail-filter/procmail/procmail-3.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/BuGlessRB/procmail/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="mbox selinux"
 
 DEPEND="
diff --git a/mail-filter/pyzor/pyzor-1.1.2.ebuild b/mail-filter/pyzor/pyzor-1.1.2.ebuild
index 907a21b80f9e..5d86962336d0 100644
--- a/mail-filter/pyzor/pyzor-1.1.2.ebuild
+++ b/mail-filter/pyzor/pyzor-1.1.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="doc gdbm mysql pyzord redis selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/razor/razor-2.85-r5.ebuild b/mail-filter/razor/razor-2.85-r5.ebuild
index b0dda90ebb6b..391361ece1e8 100644
--- a/mail-filter/razor/razor-2.85-r5.ebuild
+++ b/mail-filter/razor/razor-2.85-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
index 4afb9cb22a2d..ab0fd9fa1f6f 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild
index 1a4bd3f92364..eb204a8d426e 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/spamassassin/spamassassin-4.0.1-r1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.1-r1.ebuild
index 0b409b47cf47..9f1d4d8b0400 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.1-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.1-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
index da24a1ddbac5..5eb16d7d42b1 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/spamassassin/spamassassin-4.0.2.ebuild b/mail-filter/spamassassin/spamassassin-4.0.2.ebuild
index 2a3e48c4833c..c5aa1b3b4fad 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.2.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-mta/esmtp/esmtp-1.2-r2.ebuild b/mail-mta/esmtp/esmtp-1.2-r2.ebuild
index 99c4b1805963..42a875a630cf 100644
--- a/mail-mta/esmtp/esmtp-1.2-r2.ebuild
+++ b/mail-mta/esmtp/esmtp-1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-libs/openssl:0=
diff --git a/mail-mta/msmtp/msmtp-1.8.30.ebuild b/mail-mta/msmtp/msmtp-1.8.30.ebuild
index ca38bd2f5dfc..fd5340350a4c 100644
--- a/mail-mta/msmtp/msmtp-1.8.30.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="daemon doc keyring +gnutls idn +mta nls sasl ssl"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
diff --git a/mail-mta/msmtp/msmtp-1.8.31-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.31-r1.ebuild
index bbc239cb81c2..078442fe96cd 100644
--- a/mail-mta/msmtp/msmtp-1.8.31-r1.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.31-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="daemon doc keyring +gnutls idn +mta nls sasl ssl"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
diff --git a/mail-mta/msmtp/msmtp-1.8.32.ebuild b/mail-mta/msmtp/msmtp-1.8.32.ebuild
index e22f5b6fab73..aa6f5457d4f9 100644
--- a/mail-mta/msmtp/msmtp-1.8.32.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.32.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="daemon doc keyring +gnutls idn +mta nls sasl ssl"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
diff --git a/mail-mta/ssmtp/ssmtp-2.64_p11-r1.ebuild b/mail-mta/ssmtp/ssmtp-2.64_p11-r1.ebuild
index d90a66683cea..5cc7e2e2a05f 100644
--- a/mail-mta/ssmtp/ssmtp-2.64_p11-r1.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64_p11-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+ssl gnutls +mta"
 REQUIRED_USE="gnutls? ( ssl )"
 
diff --git a/mail-mta/ssmtp/ssmtp-2.64_p12.ebuild b/mail-mta/ssmtp/ssmtp-2.64_p12.ebuild
index d72e3abd4ffd..0b8069da565f 100644
--- a/mail-mta/ssmtp/ssmtp-2.64_p12.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64_p12.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+ssl gnutls +mta"
 REQUIRED_USE="gnutls? ( ssl )"
 
diff --git a/media-fonts/adwaita-fonts/adwaita-fonts-49.0.ebuild b/media-fonts/adwaita-fonts/adwaita-fonts-49.0.ebuild
index 45c8eb0f4bf8..567aae570d4b 100644
--- a/media-fonts/adwaita-fonts/adwaita-fonts-49.0.ebuild
+++ b/media-fonts/adwaita-fonts/adwaita-fonts-49.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/adwaita-fonts"
 LICENSE="OFL-1.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
diff --git a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
index 40d4c1c03899..6ec561222a8e 100644
--- a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
+++ b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ttf-alee-${PV}"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/aquafont/aquafont-2.7-r4.ebuild b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
index 1b96b2b329cd..f2e03bcda114 100644
--- a/media-fonts/aquafont/aquafont-2.7-r4.ebuild
+++ b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.geocities.jp/teardrops_in_aquablue/fnt/${MY_P}.zip"
 
 LICENSE="aquafont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="X"
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
index b07cf29b8cd7..8c7d9bd38f07 100644
--- a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
+++ b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://aquablue.milkcafe.to/tears/font/${MY_P}.zip"
 
 LICENSE="aquafont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
index a6aab8a61e82..2c2336d3bc3c 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 # No binaries, only fonts
diff --git a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
index e0faea7a8f72..ab027c72cfa5 100644
--- a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
+++ b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/artwizaleczapka/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DOCS="AUTHORS BUGS ChangeLog NEWS README VERSION"
 FONT_SUFFIX="pcf"
diff --git a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
index 68611422d180..4328498d35ab 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="unicode"
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/cantarell/cantarell-0.303.1.ebuild b/media-fonts/cantarell/cantarell-0.303.1.ebuild
index b5213a8f4a7a..5a3271a7311f 100644
--- a/media-fonts/cantarell/cantarell-0.303.1.ebuild
+++ b/media-fonts/cantarell/cantarell-0.303.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/media-fonts/comic-neue/comic-neue-2.3.ebuild b/media-fonts/comic-neue/comic-neue-2.3.ebuild
index 4e9bf48a542e..1fe80465ccf4 100644
--- a/media-fonts/comic-neue/comic-neue-2.3.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://comicneue.com/${P}.zip"
 S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
-KEYWORDS="~alpha amd64 arm ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 SLOT="0"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/corefonts/corefonts-1-r7.ebuild b/media-fonts/corefonts/corefonts-1-r7.ebuild
index af4f7c16b3f4..30842246e46e 100644
--- a/media-fonts/corefonts/corefonts-1-r7.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r7.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 
 LICENSE="MSttfEULA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="X tahoma"
 
 BDEPEND="app-arch/cabextract"
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 3927aa427646..382eee1f8a0e 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="fontforge"
 
 BDEPEND="
diff --git a/media-fonts/encodings/encodings-1.1.0.ebuild b/media-fonts/encodings/encodings-1.1.0.ebuild
index 278933ee4ea1..4d84ba509930 100644
--- a/media-fonts/encodings/encodings-1.1.0.ebuild
+++ b/media-fonts/encodings/encodings-1.1.0.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-3 meson
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="x11-apps/mkfontscale"
 
diff --git a/media-fonts/font-alias/font-alias-1.0.5.ebuild b/media-fonts/font-alias/font-alias-1.0.5.ebuild
index 9656b4e551b9..75714228665e 100644
--- a/media-fonts/font-alias/font-alias-1.0.5.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org font aliases"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
index 1fd855f13a04..be86f6a39363 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org cursor font"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
index 8d3dfa58e929..18c8e7a0cd7b 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
@@ -8,5 +8,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="nls"
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
index ae9ff881f696..6353a2fdcd4f 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sun fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/media-fonts/font-util/font-util-1.4.1.ebuild b/media-fonts/font-util/font-util-1.4.1.ebuild
index d94931e2b8df..638b1df14579 100644
--- a/media-fonts/font-util/font-util-1.4.1.ebuild
+++ b/media-fonts/font-util/font-util-1.4.1.ebuild
@@ -7,7 +7,7 @@ XORG_PACKAGE_NAME="util"
 inherit xorg-3
 
 DESCRIPTION="X.Org font utilities"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
diff --git a/media-fonts/freefont/freefont-20120503.ebuild b/media-fonts/freefont/freefont-20120503.ebuild
index ac7a0ac3f39a..971f19c70b3b 100644
--- a/media-fonts/freefont/freefont-20120503.ebuild
+++ b/media-fonts/freefont/freefont-20120503.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/freefont/${PN}-ttf-${PV}.zip
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RESTRICT="strip binchecks"
diff --git a/media-fonts/freefonts/freefonts-0.10-r4.ebuild b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
index d8f15ad07166..f5e1aab3c44f 100644
--- a/media-fonts/freefonts/freefonts-0.10-r4.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
 
 LICENSE="freedist free-noncomm all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="X"
 RESTRICT="mirror bindist"
 
diff --git a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
index 1f98d7daf314..c6383ee61a4a 100644
--- a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
+++ b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/x-tt/7862/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~loong ~ppc ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~loong ~ppc ~riscv ~s390 ~sparc x86"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/ipaex/ipaex-004.01.ebuild b/media-fonts/ipaex/ipaex-004.01.ebuild
index cd7ff029d7d3..51555939acba 100644
--- a/media-fonts/ipaex/ipaex-004.01.ebuild
+++ b/media-fonts/ipaex/ipaex-004.01.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://moji.or.jp/wp-content/ipafont/IPAexfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 6011fee49aa4..fe42f0e14b46 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://moji.or.jp/wp-content/ipafont/IPAfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 372ad915e9c1..8ff3f5960dad 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.5.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.5.ebuild
index e146ea61f4f8..e7c4b00ac79f 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.5.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/
 	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/7261482/${PN}-ttf-${PV}.tar.gz )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-solaris"
 SLOT="0"
 LICENSE="OFL-1.1"
 IUSE="fontforge X"
diff --git a/media-fonts/roboto/roboto-2.138.ebuild b/media-fonts/roboto/roboto-2.138.ebuild
index 92bd694b34ef..3560636d0b4b 100644
--- a/media-fonts/roboto/roboto-2.138.ebuild
+++ b/media-fonts/roboto/roboto-2.138.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~x64-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/sazanami/sazanami-20040629.ebuild b/media-fonts/sazanami/sazanami-20040629.ebuild
index 38ba7fbd4421..8b88e797a34d 100644
--- a/media-fonts/sazanami/sazanami-20040629.ebuild
+++ b/media-fonts/sazanami/sazanami-20040629.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/10087/${P}.tar.bz2"
 
 LICENSE="mplus-fonts public-domain" #446166
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~loong ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ppc ppc64 ~s390 ~sparc x86"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
index 197892349ad2..5ab428a73cc4 100644
--- a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/static_otf"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE=""
 
 RESTRICT="binchecks strip test"
diff --git a/media-fonts/terminus-font/terminus-font-4.49.1-r2.ebuild b/media-fonts/terminus-font/terminus-font-4.49.1-r2.ebuild
index 4ee12d3b7eb2..5fdebf82d6e0 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.1-r2.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}-$(ver_cut 1-2)/${
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="a-like-o +center-tilde distinct-l +otf pcf-8bit +pcf-unicode +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
index 41fb65aa6ebb..2c9bcbf89973 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
 
 LICENSE="bakoma"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
index 48e9cc0f2e50..3b5efd85d8c1 100644
--- a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
+++ b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnome/sources/ttf-bitstream-vera/${PV}/${P}.tar.bz2"
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 DOCS="COPYRIGHT.TXT README.TXT RELEASENOTES.TXT"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/urw-fonts/urw-fonts-20230503-r1.ebuild b/media-fonts/urw-fonts/urw-fonts-20230503-r1.ebuild
index 2834648e5c42..132e2ef93264 100644
--- a/media-fonts/urw-fonts/urw-fonts-20230503-r1.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-20230503-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ArtifexSoftware/urw-base35-fonts/archive/${COMMIT}.t
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 S="${WORKDIR}/urw-base35-fonts-${COMMIT}"
 
diff --git a/media-fonts/vollkorn/vollkorn-4.105.ebuild b/media-fonts/vollkorn/vollkorn-4.105.ebuild
index e64b6c0b9687..11dadcce2466 100644
--- a/media-fonts/vollkorn/vollkorn-4.105.ebuild
+++ b/media-fonts/vollkorn/vollkorn-4.105.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://vollkorn-typeface.com/download/${PN}-${PV/./-}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+otf +ttf"
 REQUIRED_USE="|| ( otf ttf )"
 # Only installs fonts
diff --git a/media-gfx/asymptote/asymptote-3.05.ebuild b/media-gfx/asymptote/asymptote-3.05.ebuild
index f04352af3c83..4e8d0ceedbfc 100644
--- a/media-gfx/asymptote/asymptote-3.05.ebuild
+++ b/media-gfx/asymptote/asymptote-3.05.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
 IUSE="context curl doc emacs examples fftw gsl gui +imagemagick latex lsp +opengl python sigsegv svg test vim-syntax"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
index 1c2ef79c1ac6..437b30cc2e47 100644
--- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P/rc*/}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc x86 ~x64-solaris"
 
 RDEPEND="media-libs/aalib"
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild
index abdc845e7e64..f1e0ba291803 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg lcms"
 
diff --git a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
index 05b5a3d199f5..90e882dbffc6 100644
--- a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
+++ b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.cs.helsinki.fi/u/penberg/duhdraw/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild
index a26a0138efa0..89003d5534aa 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 # these apps are used at runtime by ebdftopcf
 RDEPEND="
diff --git a/media-gfx/exif/exif-0.6.22-r1.ebuild b/media-gfx/exif/exif-0.6.22-r1.ebuild
index e78c7337b761..76fc96ad3c74 100644
--- a/media-gfx/exif/exif-0.6.22-r1.ebuild
+++ b/media-gfx/exif/exif-0.6.22-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/exif/exif-0.6.22-r2.ebuild b/media-gfx/exif/exif-0.6.22-r2.ebuild
index ba6197f325a0..a32fadfdbafa 100644
--- a/media-gfx/exif/exif-0.6.22-r2.ebuild
+++ b/media-gfx/exif/exif-0.6.22-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/exiv2/exiv2-0.28.5.ebuild b/media-gfx/exiv2/exiv2-0.28.5.ebuild
index af03b6ceb0be..1c8ec095b4a2 100644
--- a/media-gfx/exiv2/exiv2-0.28.5.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/exiv2/exiv2-0.28.7.ebuild b/media-gfx/exiv2/exiv2-0.28.7.ebuild
index af03b6ceb0be..1c8ec095b4a2 100644
--- a/media-gfx/exiv2/exiv2-0.28.7.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild
index b5f2df476662..2d823c5d9291 100644
--- a/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild
+++ b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+ghostscript"
 
 RDEPEND="
diff --git a/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild
index e905e761f917..ff6e93aedbb6 100644
--- a/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild
+++ b/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+ghostscript test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( ghostscript )"
diff --git a/media-gfx/fig2dev/fig2dev-9999.ebuild b/media-gfx/fig2dev/fig2dev-9999.ebuild
index a9ce17eaa092..1102f7034163 100644
--- a/media-gfx/fig2dev/fig2dev-9999.ebuild
+++ b/media-gfx/fig2dev/fig2dev-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
 		mirror://gentoo/fig2mpdf-1.1.2.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/media-gfx/fondu/fondu-20060102-r1.ebuild b/media-gfx/fondu/fondu-20060102-r1.ebuild
index 2e610adaf432..cf2a743e57fb 100644
--- a/media-gfx/fondu/fondu-20060102-r1.ebuild
+++ b/media-gfx/fondu/fondu-20060102-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-build-fix.patch
diff --git a/media-gfx/fontforge/fontforge-20230101-r2.ebuild b/media-gfx/fontforge/fontforge-20230101-r2.ebuild
index b6cd22493b69..ba4f831f8364 100644
--- a/media-gfx/fontforge/fontforge-20230101-r2.ebuild
+++ b/media-gfx/fontforge/fontforge-20230101-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/gif2png/gif2png-2.5.14.ebuild b/media-gfx/gif2png/gif2png-2.5.14.ebuild
index e882d1063c5c..d3a537edb564 100644
--- a/media-gfx/gif2png/gif2png-2.5.14.ebuild
+++ b/media-gfx/gif2png/gif2png-2.5.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-libs/libpng-1.2:0=
 	virtual/zlib:="
diff --git a/media-gfx/gifsicle/gifsicle-1.93.ebuild b/media-gfx/gifsicle/gifsicle-1.93.ebuild
index 6c3f20dbf94d..1fa660c84d9f 100644
--- a/media-gfx/gifsicle/gifsicle-1.93.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.93.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-gfx/gifsicle/gifsicle-1.94.ebuild b/media-gfx/gifsicle/gifsicle-1.94.ebuild
index 7d62f1704ab2..b5b73cce8412 100644
--- a/media-gfx/gifsicle/gifsicle-1.94.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.94.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="X"
 
 PATCHES=( "${FILESDIR}/${P}-CVE-2023-46009.patch" )
diff --git a/media-gfx/gifsicle/gifsicle-1.95.ebuild b/media-gfx/gifsicle/gifsicle-1.95.ebuild
index ccf065e97206..1b1ff283d0b3 100644
--- a/media-gfx/gifsicle/gifsicle-1.95.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.95.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.ebuild
index 775a66fea1e9..2fe44426b033 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-48.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-48.0.ebuild
index 9f5c6ea7d8dc..7803e1042e1b 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-48.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-48.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://apps.gnome.org/FontViewer/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0-r1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0-r1.ebuild
index df1da5c79bae..fd0ff6a10f3b 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-41.0-r1.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="X"
 
 DEPEND="
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r2.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r2.ebuild
index d8b548403be3..e138eb597b49 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r2.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r2.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r3.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r3.ebuild
index 92189e161962..ee4d2b79e71f 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r3.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r3.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.46.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.46.ebuild
index 92189e161962..ee4d2b79e71f 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.46.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.46.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 3d41fbee1b9b..7a9ecac4ab46 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
index 5b3a4564d74a..a34eedccc2eb 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r5.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r5.ebuild
index fcf1aed65160..bd38976bade4 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r5.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="perl test ${GENTOO_PERL_USESTRING}"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild b/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild
index e41699ba214a..68ea65cb9bfd 100644
--- a/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-12.2.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt6 ruby svg tcl webp X"
 
 REQUIRED_USE="
diff --git a/media-gfx/graphviz/graphviz-14.0.5-r1.ebuild b/media-gfx/graphviz/graphviz-14.0.5-r1.ebuild
index 5de401686c22..ad3efa32f9c0 100644
--- a/media-gfx/graphviz/graphviz-14.0.5-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-14.0.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0/6.8.7.2.4" # cdt.cgraph.gvc.gvpr.pathplan
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt6 ruby svg tcl webp X"
 
 REQUIRED_USE="
diff --git a/media-gfx/gthumb/gthumb-3.12.7.ebuild b/media-gfx/gthumb/gthumb-3.12.7.ebuild
index 287c693fe176..e5940e0d9f76 100644
--- a/media-gfx/gthumb/gthumb-3.12.7.ebuild
+++ b/media-gfx/gthumb/gthumb-3.12.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gthumb/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="cdr colord exif keyring geolocation gstreamer heif jpegxl lcms raw slideshow svg tiff webkit webp"
 
 RDEPEND="
diff --git a/media-gfx/gthumb/gthumb-3.12.8.2.ebuild b/media-gfx/gthumb/gthumb-3.12.8.2.ebuild
index b57eabce1366..f6979e594c73 100644
--- a/media-gfx/gthumb/gthumb-3.12.8.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.12.8.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gthumb/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="cdr colord geolocation gstreamer heif jpegxl lcms raw slideshow svg tiff webp X"
 
 RDEPEND="
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 8276f0cf6d68..6ff9d18d7dac 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-solaris"
 IUSE="examples static-libs"
 
 # tests are severely broken, bug #483952
diff --git a/media-gfx/icoutils/icoutils-0.32.3.ebuild b/media-gfx/icoutils/icoutils-0.32.3.ebuild
index f6ac094a2244..ab7d4bb5c1d3 100644
--- a/media-gfx/icoutils/icoutils-0.32.3.ebuild
+++ b/media-gfx/icoutils/icoutils-0.32.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/igal/igal-3.2.ebuild b/media-gfx/igal/igal-3.2.ebuild
index ecc4d67ad295..f88ab280e261 100644
--- a/media-gfx/igal/igal-3.2.ebuild
+++ b/media-gfx/igal/igal-3.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}2-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.29-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.29-r1.ebuild
index 72e392fc0ca2..926994d70001 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.29-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.29-r1.ebuild
@@ -15,7 +15,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.30.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.30.ebuild
index a73b5b41e010..b474b9bb6db0 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.13.30.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.30.ebuild
@@ -15,7 +15,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.2.10.ebuild b/media-gfx/imagemagick/imagemagick-7.1.2.10.ebuild
index c78fd7ec062b..d75528542506 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.2.10.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.2.10.ebuild
@@ -18,7 +18,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.2.3-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.2.3-r1.ebuild
index a8681a235279..12607c007fd1 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.2.3-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.2.3-r1.ebuild
@@ -15,7 +15,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.2.5.ebuild b/media-gfx/imagemagick/imagemagick-7.1.2.5.ebuild
index c1c901cbecdd..440eb2fa3f6f 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.2.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.2.5.ebuild
@@ -15,7 +15,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index c78fd7ec062b..d75528542506 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -18,7 +18,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild
index d5aa388bec7f..bc476e955653 100644
--- a/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild
+++ b/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="media-libs/libjpeg-turbo:="
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.6.ebuild b/media-gfx/jpegoptim/jpegoptim-1.5.6.ebuild
index ddd997f4a4a1..e7b9921b7249 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.5.6.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.5.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/jpegpixi/jpegpixi-1.1.1-r1.ebuild b/media-gfx/jpegpixi/jpegpixi-1.1.1-r1.ebuild
index f7b8494c7176..479bf43f3ad0 100644
--- a/media-gfx/jpegpixi/jpegpixi-1.1.1-r1.ebuild
+++ b/media-gfx/jpegpixi/jpegpixi-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-libs/libjpeg-turbo:="
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild
index 8fcf4d032cb7..dc4a88d6225a 100644
--- a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86"
 IUSE="cpu_flags_x86_sse2 openmp"
 
 PATCHES=(
diff --git a/media-gfx/librecad/librecad-2.2.2_alpha1_pre20250509.ebuild b/media-gfx/librecad/librecad-2.2.2_alpha1_pre20250509.ebuild
index f3a53d54b5d0..c38a4e23b3b6 100644
--- a/media-gfx/librecad/librecad-2.2.2_alpha1_pre20250509.ebuild
+++ b/media-gfx/librecad/librecad-2.2.2_alpha1_pre20250509.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz"
 	S="${WORKDIR}/LibreCAD-${COMMIT}"
-	KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index fda2dd2c83fe..415c0046a597 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/LibreCAD-${PV}"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
index c2eda0b7e4b3..3dd6c6b5e365 100644
--- a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
+++ b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://jaafreitas.github.io/mkgallery/"
 SRC_URI="https://github.com/jaafreitas/${PN}/releases/download/v${PV}/${P/-/_}.tgz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild b/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild
index 27c673d8f36c..afab6fb45b29 100644
--- a/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.19.1-r1.ebuild
@@ -15,7 +15,7 @@ CMAKE_USE_DIR="${S}/ImageLounge"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+opencv plugins raw +tiff test zip"
 REQUIRED_USE="
 	raw? ( opencv )
diff --git a/media-gfx/nomacs/nomacs-3.21.0.ebuild b/media-gfx/nomacs/nomacs-3.21.0.ebuild
index 1f4999c78e1f..90cae30733f6 100644
--- a/media-gfx/nomacs/nomacs-3.21.0.ebuild
+++ b/media-gfx/nomacs/nomacs-3.21.0.ebuild
@@ -15,7 +15,7 @@ CMAKE_USE_DIR="${S}/ImageLounge"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+opencv plugins raw +tiff test zip"
 REQUIRED_USE="
 	raw? ( opencv )
diff --git a/media-gfx/nomacs/nomacs-3.21.1.ebuild b/media-gfx/nomacs/nomacs-3.21.1.ebuild
index 141e26420bd9..5d4bbca1d01e 100644
--- a/media-gfx/nomacs/nomacs-3.21.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.21.1.ebuild
@@ -15,7 +15,7 @@ CMAKE_USE_DIR="${S}/ImageLounge"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+opencv plugins raw +tiff test zip"
 REQUIRED_USE="
 	raw? ( opencv )
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
index 41568efe3593..243d4038634f 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="NVIDIA-r1"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc examples multilib"
 
 RESTRICT="strip"
diff --git a/media-gfx/optipng/optipng-0.7.8.ebuild b/media-gfx/optipng/optipng-0.7.8.ebuild
index 24ffb8529caf..af9255afce1d 100644
--- a/media-gfx/optipng/optipng-0.7.8.ebuild
+++ b/media-gfx/optipng/optipng-0.7.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 
 RDEPEND="virtual/zlib:=
 	media-libs/libpng:0="
diff --git a/media-gfx/optipng/optipng-7.9.1.ebuild b/media-gfx/optipng/optipng-7.9.1.ebuild
index 769b763abcd7..15c29cf64572 100644
--- a/media-gfx/optipng/optipng-7.9.1.ebuild
+++ b/media-gfx/optipng/optipng-7.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
index 50588c7568e9..03e18a6780ff 100644
--- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pmt/${P}-nolib.tar.xz"
 
 LICENSE="pngcrush"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="media-libs/libpng:0=
 	virtual/zlib:="
diff --git a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
index 56aee4240ab3..2b526ccd5ff2 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://entropymine.com/jason/${PN}/${P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 BDEPEND="app-arch/unzip"
diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
index eb570f0a409f..49b7f10b2dd5 100644
--- a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
+++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/graphics/pngtoico/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-libs/libpng:="
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/potrace/potrace-1.16-r1.ebuild b/media-gfx/potrace/potrace-1.16-r1.ebuild
index cf758d8a3d37..d08d1ed0f289 100644
--- a/media-gfx/potrace/potrace-1.16-r1.ebuild
+++ b/media-gfx/potrace/potrace-1.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="metric"
 
 RDEPEND="virtual/zlib:="
diff --git a/media-gfx/povray/povray-3.7.0.0-r6.ebuild b/media-gfx/povray/povray-3.7.0.0-r6.ebuild
index 51698aed43b7..f4b6c31be974 100644
--- a/media-gfx/povray/povray-3.7.0.0-r6.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r6.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${PN}-${MY_PV}
 # to actually be in the sources, so we don't distribute it either.
 LICENSE="AGPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="debug +io-restrictions tiff X"
 
 DEPEND="
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index d642dae2d668..053a5135c0f4 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="emf imagemagick plotutils pptx"
 
 BDEPEND="
diff --git a/media-gfx/sane-backends/sane-backends-1.2.1-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.2.1-r1.ebuild
index b73e891d053f..203aef0bbc11 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.
diff --git a/media-gfx/sane-backends/sane-backends-1.3.1-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.3.1-r2.ebuild
index 80b2486aa44c..5354c9d3c05c 100644
--- a/media-gfx/sane-backends/sane-backends-1.3.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.3.1-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/backends-${PV}"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.
diff --git a/media-gfx/tgif/tgif-4.2.5-r3.ebuild b/media-gfx/tgif/tgif-4.2.5-r3.ebuild
index 6baa1026cdad..c5ec92dac798 100644
--- a/media-gfx/tgif/tgif-4.2.5-r3.ebuild
+++ b/media-gfx/tgif/tgif-4.2.5-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="
 	virtual/zlib:=
diff --git a/media-gfx/xfig/xfig-3.2.9.ebuild b/media-gfx/xfig/xfig-3.2.9.ebuild
index f349460af113..d2858fb47c62 100644
--- a/media-gfx/xfig/xfig-3.2.9.ebuild
+++ b/media-gfx/xfig/xfig-3.2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 COMMON_DEPEND="
 	app-text/ghostscript-gpl:=
diff --git a/media-gfx/xfig/xfig-3.2.9a-r1.ebuild b/media-gfx/xfig/xfig-3.2.9a-r1.ebuild
index 706bce4f0472..3151349df0b7 100644
--- a/media-gfx/xfig/xfig-3.2.9a-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.9a-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 COMMON_DEPEND="
 	app-text/ghostscript-gpl:=
diff --git a/media-gfx/xfig/xfig-3.2.9a.ebuild b/media-gfx/xfig/xfig-3.2.9a.ebuild
index f349460af113..d2858fb47c62 100644
--- a/media-gfx/xfig/xfig-3.2.9a.ebuild
+++ b/media-gfx/xfig/xfig-3.2.9a.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 COMMON_DEPEND="
 	app-text/ghostscript-gpl:=
diff --git a/media-gfx/xfig/xfig-9999.ebuild b/media-gfx/xfig/xfig-9999.ebuild
index cd75d2717856..6f1b56a469ef 100644
--- a/media-gfx/xfig/xfig-9999.ebuild
+++ b/media-gfx/xfig/xfig-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/mcj/xfig"
 else
 	SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/media-gfx/xli/xli-1.17.0-r6.ebuild b/media-gfx/xli/xli-1.17.0-r6.ebuild
index 7f21b09b0f6e..bf7d2d31d017 100644
--- a/media-gfx/xli/xli-1.17.0-r6.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${SNAPSHOT}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/media-gfx/xsane/xsane-0.999-r6.ebuild b/media-gfx/xsane/xsane-0.999-r6.ebuild
index 6de3dbbd4f83..b686dcc85919 100644
--- a/media-gfx/xsane/xsane-0.999-r6.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86"
 IUSE="nls jpeg png tiff gimp lcms"
 
 DEPEND="
diff --git a/media-gfx/xv/xv-6.0.1.ebuild b/media-gfx/xv/xv-6.0.1.ebuild
index ac0b42deb320..fed490ca105c 100644
--- a/media-gfx/xv/xv-6.0.1.ebuild
+++ b/media-gfx/xv/xv-6.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="jpeg tiff png webp"
 
 DEPEND="
diff --git a/media-gfx/xv/xv-6.0.2.ebuild b/media-gfx/xv/xv-6.0.2.ebuild
index ac0b42deb320..fed490ca105c 100644
--- a/media-gfx/xv/xv-6.0.2.ebuild
+++ b/media-gfx/xv/xv-6.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="jpeg tiff png webp"
 
 DEPEND="
diff --git a/media-gfx/xv/xv-6.1.0-r1.ebuild b/media-gfx/xv/xv-6.1.0-r1.ebuild
index 3c7f2eec2f01..ed22144aae10 100644
--- a/media-gfx/xv/xv-6.1.0-r1.ebuild
+++ b/media-gfx/xv/xv-6.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="jpeg tiff png webp"
 
 DEPEND="
diff --git a/media-libs/SoXt/SoXt-1.4.1.ebuild b/media-libs/SoXt/SoXt-1.4.1.ebuild
index 9b047984287f..5662d71a9042 100644
--- a/media-libs/SoXt/SoXt-1.4.1.ebuild
+++ b/media-libs/SoXt/SoXt-1.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/soxt"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug doc"
 
 RDEPEND="
diff --git a/media-libs/SoXt/SoXt-1.4.2.ebuild b/media-libs/SoXt/SoXt-1.4.2.ebuild
index 642ec48a6dcc..e8188aac9c08 100644
--- a/media-libs/SoXt/SoXt-1.4.2.ebuild
+++ b/media-libs/SoXt/SoXt-1.4.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/soxt"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug doc"
 
 RDEPEND="
diff --git a/media-libs/a52dec/a52dec-0.7.4-r9.ebuild b/media-libs/a52dec/a52dec-0.7.4-r9.ebuild
index 46e6b06f4a3b..925911ddef3f 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r9.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="oss"
 
 PATCHES=(
diff --git a/media-libs/aalib/aalib-1.4_rc5-r10.ebuild b/media-libs/aalib/aalib-1.4_rc5-r10.ebuild
index 753b3f22b418..ed73ce1f768f 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r10.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.sourceforge.net/project/aa-project/aa-lib/${MY_PV}/${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X gpm slang"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
diff --git a/media-libs/aalib/aalib-1.4_rc5-r11.ebuild b/media-libs/aalib/aalib-1.4_rc5-r11.ebuild
index d8b2f6a62e56..3d01b011b6cb 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r11.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r11.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-1.4.0"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X gpm slang"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.13-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.13-r3.ebuild
index 3a2075570525..76f9d9e7368f 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.13-r3.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.13-r3.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="alisp debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild
index 6b3b010d2b45..048df1def02f 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.15-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.15-r3.ebuild
index 69add6ea6730..16a8affe6831 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.15-r3.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.15-r3.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/audiofile/audiofile-0.3.6-r6.ebuild b/media-libs/audiofile/audiofile-0.3.6-r6.ebuild
index 38415562e042..e80ad6f5881f 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r6.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://audiofile.68k.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="flac"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1:=[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/babl/babl-0.1.112.ebuild b/media-libs/babl/babl-0.1.112.ebuild
index 3ab8be58f116..a223314f4701 100644
--- a/media-libs/babl/babl-0.1.112.ebuild
+++ b/media-libs/babl/babl-0.1.112.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv -sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-0.1.116.ebuild b/media-libs/babl/babl-0.1.116.ebuild
index 3ab8be58f116..a223314f4701 100644
--- a/media-libs/babl/babl-0.1.116.ebuild
+++ b/media-libs/babl/babl-0.1.116.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv -sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index d5fef1f70792..e2cdedc22592 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 2c897b147c9a..97ec28a4164b 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86"
 IUSE="static-libs"
 
 BDEPEND="
diff --git a/media-libs/coin/coin-4.0.4.ebuild b/media-libs/coin/coin-4.0.4.ebuild
index 802a1450b4eb..09e8df85513d 100644
--- a/media-libs/coin/coin-4.0.4.ebuild
+++ b/media-libs/coin/coin-4.0.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="|| ( GPL-2 PEL )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="debug doc +exceptions openal qch test threads"
 
 REQUIRED_USE="qch? ( doc )"
diff --git a/media-libs/coin/coin-4.0.6.ebuild b/media-libs/coin/coin-4.0.6.ebuild
index 337caa753498..fd31873eb309 100644
--- a/media-libs/coin/coin-4.0.6.ebuild
+++ b/media-libs/coin/coin-4.0.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="|| ( GPL-2 PEL )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="debug doc +exceptions openal qch test threads"
 
 REQUIRED_USE="qch? ( doc )"
diff --git a/media-libs/compface/compface-1.5.2-r1.ebuild b/media-libs/compface/compface-1.5.2-r1.ebuild
index 176975060559..a71e21d6b240 100644
--- a/media-libs/compface/compface-1.5.2-r1.ebuild
+++ b/media-libs/compface/compface-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/media-libs/compface/compface-1.5.2-r2.ebuild b/media-libs/compface/compface-1.5.2-r2.ebuild
index fe453b8a7d13..56f97d46408d 100644
--- a/media-libs/compface/compface-1.5.2-r2.ebuild
+++ b/media-libs/compface/compface-1.5.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index 98eeeca4e49f..fabd4a3d72bc 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/media-libs/faac/faac-1.30.ebuild b/media-libs/faac/faac-1.30.ebuild
index ffcd2a91f6ef..b794e5d063f4 100644
--- a/media-libs/faac/faac-1.30.ebuild
+++ b/media-libs/faac/faac-1.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/faac/faac-1.31.1-r1.ebuild b/media-libs/faac/faac-1.31.1-r1.ebuild
index 008f85465cdd..d35d2b481cc1 100644
--- a/media-libs/faac/faac-1.31.1-r1.ebuild
+++ b/media-libs/faac/faac-1.31.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-unaligned.patch
diff --git a/media-libs/faad2/faad2-2.11.1.ebuild b/media-libs/faad2/faad2-2.11.1.ebuild
index 0f9673a76c2c..7f93b9ec759d 100644
--- a/media-libs/faad2/faad2-2.11.1.ebuild
+++ b/media-libs/faad2/faad2-2.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/knik0/faad2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 # no tests
 RESTRICT="test"
diff --git a/media-libs/faad2/faad2-2.11.2.ebuild b/media-libs/faad2/faad2-2.11.2.ebuild
index 527d608b661c..6868fb7cd5c2 100644
--- a/media-libs/faad2/faad2-2.11.2.ebuild
+++ b/media-libs/faad2/faad2-2.11.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/knik0/faad2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}/faad2-2.11.0-check-if-lrintf-is-defined.patch"
diff --git a/media-libs/flac/flac-1.4.3.ebuild b/media-libs/flac/flac-1.4.3.ebuild
index 8ffda1f6e8d9..c24e09ec79ab 100644
--- a/media-libs/flac/flac-1.4.3.ebuild
+++ b/media-libs/flac/flac-1.4.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 # <libFLAC SONAME>-<libFLAC++ SONAME>
 SLOT="0/10-12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="+cxx debug ogg cpu_flags_x86_avx2 cpu_flags_x86_avx static-libs"
 # AVX configure switch is for both AVX & AVX2
 REQUIRED_USE="
diff --git a/media-libs/flac/flac-1.5.0.ebuild b/media-libs/flac/flac-1.5.0.ebuild
index ce7657ccea85..79c88dece65a 100644
--- a/media-libs/flac/flac-1.5.0.ebuild
+++ b/media-libs/flac/flac-1.5.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 # <libFLAC SONAME>-<libFLAC++ SONAME>
 # On SONAME changes, please update media-libs/flac-compat too.
 SLOT="0/11-14"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="+cxx debug ogg cpu_flags_x86_avx2 cpu_flags_x86_avx static-libs"
 # AVX configure switch is for both AVX & AVX2
 REQUIRED_USE="
diff --git a/media-libs/fontconfig/fontconfig-2.16.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.16.2-r1.ebuild
index 2664071da74f..9332bb38682a 100644
--- a/media-libs/fontconfig/fontconfig-2.16.2-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.16.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/fontconfig/fontconfig-2.17.1.ebuild b/media-libs/fontconfig/fontconfig-2.17.1.ebuild
index 4755cf07b109..70d9edafaf56 100644
--- a/media-libs/fontconfig/fontconfig-2.17.1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.17.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/freealut/freealut-1.1.0-r5.ebuild b/media-libs/freealut/freealut-1.1.0-r5.ebuild
index ca629cd2cd1f..bc0f1a99a87e 100644
--- a/media-libs/freealut/freealut-1.1.0-r5.ebuild
+++ b/media-libs/freealut/freealut-1.1.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=media-libs/openal-1.15.1
diff --git a/media-libs/freeglut/freeglut-3.6.0-r1.ebuild b/media-libs/freeglut/freeglut-3.6.0-r1.ebuild
index f6e98a9877f6..06c2558b9163 100644
--- a/media-libs/freeglut/freeglut-3.6.0-r1.ebuild
+++ b/media-libs/freeglut/freeglut-3.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # enabling GLES support seems to cause build failures
 RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/freeglut/freeglut-3.8.0.ebuild b/media-libs/freeglut/freeglut-3.8.0.ebuild
index d5a822fce01f..1863d61ef49d 100644
--- a/media-libs/freeglut/freeglut-3.8.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # enabling GLES support seems to cause build failures
 RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
index 7aa228b437e1..76a202fe70f6 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
diff --git a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
index 777bf8acefab..66ee09613cf4 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
diff --git a/media-libs/freetype/freetype-2.13.3.ebuild b/media-libs/freetype/freetype-2.13.3.ebuild
index c9f7decba2a2..352ffc5fcaf5 100644
--- a/media-libs/freetype/freetype-2.13.3.ebuild
+++ b/media-libs/freetype/freetype-2.13.3.ebuild
@@ -23,7 +23,7 @@ else
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz
 		)
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
diff --git a/media-libs/freetype/freetype-2.14.1-r1.ebuild b/media-libs/freetype/freetype-2.14.1-r1.ebuild
index 3f9386751c5f..165865ced58e 100644
--- a/media-libs/freetype/freetype-2.14.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.14.1-r1.ebuild
@@ -23,7 +23,7 @@ else
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz
 		)
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
diff --git a/media-libs/freetype/freetype-2.14.1.ebuild b/media-libs/freetype/freetype-2.14.1.ebuild
index c27d7140fa99..8e216ea98c4b 100644
--- a/media-libs/freetype/freetype-2.14.1.ebuild
+++ b/media-libs/freetype/freetype-2.14.1.ebuild
@@ -23,7 +23,7 @@ else
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz
 		)
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 02e667fa92c7..e9bc1d58ec30 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -23,7 +23,7 @@ else
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz
 		)
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5-r1.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5-r1.ebuild
index 1147bcc5f51f..615f48c42ba4 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5-r1.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P2}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
index d06f60c0d42c..21b0141a02b6 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P2}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/media-libs/gd/gd-2.3.2-r3.ebuild b/media-libs/gd/gd-2.3.2-r3.ebuild
index c2f785a94a23..54009d250b84 100644
--- a/media-libs/gd/gd-2.3.2-r3.ebuild
+++ b/media-libs/gd/gd-2.3.2-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gd/gd-2.3.3-r3.ebuild b/media-libs/gd/gd-2.3.3-r3.ebuild
index 8100433b8121..9d51852b20ce 100644
--- a/media-libs/gd/gd-2.3.3-r3.ebuild
+++ b/media-libs/gd/gd-2.3.3-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gd/gd-2.3.3-r4.ebuild b/media-libs/gd/gd-2.3.3-r4.ebuild
index f0020cbce8db..be95fdefb1ef 100644
--- a/media-libs/gd/gd-2.3.3-r4.ebuild
+++ b/media-libs/gd/gd-2.3.3-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gegl/gegl-0.4.58.ebuild b/media-libs/gegl/gegl-0.4.58.ebuild
index 86487c0121c5..8ccd8b1b88f9 100644
--- a/media-libs/gegl/gegl-0.4.58.ebuild
+++ b/media-libs/gegl/gegl-0.4.58.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.64-r1.ebuild b/media-libs/gegl/gegl-0.4.64-r1.ebuild
index 253c420b8a6a..e28a160eef03 100644
--- a/media-libs/gegl/gegl-0.4.64-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.64-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 3e2ee9e6e7d0..0cf3b34cfef1 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/giflib/giflib-5.2.2.ebuild b/media-libs/giflib/giflib-5.2.2.ebuild
index e662984ba77a..ee4c535d1f3f 100644
--- a/media-libs/giflib/giflib-5.2.2.ebuild
+++ b/media-libs/giflib/giflib-5.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( virtual/imagemagick-tools )"
diff --git a/media-libs/glew/glew-1.10.0-r101.ebuild b/media-libs/glew/glew-1.10.0-r101.ebuild
index daa6d5ca2b01..ee2ce0348197 100644
--- a/media-libs/glew/glew-1.10.0-r101.ebuild
+++ b/media-libs/glew/glew-1.10.0-r101.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 	!=media-libs/glew-1.10*:0"
diff --git a/media-libs/glew/glew-1.6.0-r101.ebuild b/media-libs/glew/glew-1.6.0-r101.ebuild
index 0e13b9335031..81b28e0c3d1b 100644
--- a/media-libs/glew/glew-1.6.0-r101.ebuild
+++ b/media-libs/glew/glew-1.6.0-r101.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 
diff --git a/media-libs/glew/glew-2.2.0-r1.ebuild b/media-libs/glew/glew-2.2.0-r1.ebuild
index 9123e271848d..a3f4cd838d3d 100644
--- a/media-libs/glew/glew-2.2.0-r1.ebuild
+++ b/media-libs/glew/glew-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc egl-only static-libs"
 
 DEPEND="
diff --git a/media-libs/glu/glu-9.0.3.ebuild b/media-libs/glu/glu-9.0.3.ebuild
index 1fdba7d557a3..fdf11327d0f8 100644
--- a/media-libs/glu/glu-9.0.3.ebuild
+++ b/media-libs/glu/glu-9.0.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index fe219213d73f..ffb1964bcdeb 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.24.11-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.24.11-r1.ebuild
index e82e89771602..9a39201e51c0 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.24.11-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.24.11-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gstreamer/gstreamer-1.24.11.ebuild b/media-libs/gstreamer/gstreamer-1.24.11.ebuild
index 7f3839c3997a..9c2e75307806 100644
--- a/media-libs/gstreamer/gstreamer-1.24.11.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.24.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+caps +introspection ptp unwind"
 
 # gstreamer-1.22.x requires 2.62, but 2.64 is strongly recommended
diff --git a/media-libs/harfbuzz/harfbuzz-11.4.5.ebuild b/media-libs/harfbuzz/harfbuzz-11.4.5.ebuild
index acd0aa7a4e81..40f7c1b7a16b 100644
--- a/media-libs/harfbuzz/harfbuzz-11.4.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-11.4.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-12.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-12.1.0.ebuild
index acd0aa7a4e81..40f7c1b7a16b 100644
--- a/media-libs/harfbuzz/harfbuzz-12.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-12.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-12.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-12.2.0.ebuild
index f3f3e561af24..75f510fc1406 100644
--- a/media-libs/harfbuzz/harfbuzz-12.2.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-12.2.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index f3f3e561af24..75f510fc1406 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/id3lib/id3lib-3.8.3-r10.ebuild b/media-libs/id3lib/id3lib-3.8.3-r10.ebuild
index cf31e4aa3b72..1d1a94f2582b 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r10.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc static-libs"
 # Extra files installed with tests (bug #130922#c17)
 RESTRICT="test"
diff --git a/media-libs/id3lib/id3lib-3.8.3-r12.ebuild b/media-libs/id3lib/id3lib-3.8.3-r12.ebuild
index 871e30d59d20..ea44428fd6d3 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r12.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r12.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc static-libs"
 # Extra files installed with tests (bug #130922#c17)
 RESTRICT="test"
diff --git a/media-libs/imlib2/imlib2-1.11.0.ebuild b/media-libs/imlib2/imlib2-1.11.0.ebuild
index 382c329be71b..9a9ab7fbab95 100644
--- a/media-libs/imlib2/imlib2-1.11.0.ebuild
+++ b/media-libs/imlib2/imlib2-1.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+X apidoc bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug
 eps +filters +gif +jpeg jpeg2k jpegxl heif lzma mp3 packing +png
 +shm static-libs svg +text +tiff +webp zlib"
diff --git a/media-libs/imlib2/imlib2-1.12.3-r1.ebuild b/media-libs/imlib2/imlib2-1.12.3-r1.ebuild
index 85ba00e879d4..7362a64f74ec 100644
--- a/media-libs/imlib2/imlib2-1.12.3-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.12.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+X apidoc bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug
 eps +filters +gif +jpeg jpeg2k jpegxl heif lzma mp3 packing +png
 raw +shm static-libs svg +text +tiff +webp zlib"
diff --git a/media-libs/imlib2/imlib2-1.12.5.ebuild b/media-libs/imlib2/imlib2-1.12.5.ebuild
index 4f213c5d1106..9774380cb209 100644
--- a/media-libs/imlib2/imlib2-1.12.5.ebuild
+++ b/media-libs/imlib2/imlib2-1.12.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+X apidoc avif bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug
 eps +filters +gif +jpeg jpeg2k jpegxl heif lzma mp3 packing +png
 raw +shm static-libs svg +text +tools +tiff +webp y4m +zlib"
diff --git a/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild b/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
index 2055d71ca6a4..f6f95e33b2fe 100644
--- a/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
+++ b/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/intel/intel-hybrid-driver"
 SRC_URI="https://github.com/intel/intel-hybrid-driver/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/intel-hybrid-driver-${EGIT_COMMIT}"
 
-KEYWORDS="amd64 ~amd64-linux"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0"
 IUSE="wayland X"
diff --git a/media-libs/jbig2dec/jbig2dec-0.20.ebuild b/media-libs/jbig2dec/jbig2dec-0.20.ebuild
index 78b9920aff8a..541e486a104b 100644
--- a/media-libs/jbig2dec/jbig2dec-0.20.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)" #698428
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="png static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index 6df24cf967f6..43204b25e1f6 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}" # Since we install unversioned libraries, use ${PV} subslots.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
diff --git a/media-libs/lasi/lasi-1.1.3-r1.ebuild b/media-libs/lasi/lasi-1.1.3-r1.ebuild
index f75c25b7aa41..cf9ab8176cc1 100644
--- a/media-libs/lasi/lasi-1.1.3-r1.ebuild
+++ b/media-libs/lasi/lasi-1.1.3-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/lcms/lcms-2.15.ebuild b/media-libs/lcms/lcms-2.15.ebuild
index 58626b40a463..3d7f49c72e00 100644
--- a/media-libs/lcms/lcms-2.15.ebuild
+++ b/media-libs/lcms/lcms-2.15.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/lcms2-${PV/_}"
 LICENSE="GPL-3 MIT"
 SLOT="2"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="doc jpeg static-libs tiff"
 
diff --git a/media-libs/lcms/lcms-2.16-r1.ebuild b/media-libs/lcms/lcms-2.16-r1.ebuild
index d5984de94d6e..1d353b0a0ae3 100644
--- a/media-libs/lcms/lcms-2.16-r1.ebuild
+++ b/media-libs/lcms/lcms-2.16-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/lcms2-${PV/_}"
 LICENSE="GPL-3 MIT"
 SLOT="2"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="doc jpeg static-libs tiff"
 
diff --git a/media-libs/lcms/lcms-2.17.ebuild b/media-libs/lcms/lcms-2.17.ebuild
index 7c83d86af493..81ae53ff8ff8 100644
--- a/media-libs/lcms/lcms-2.17.ebuild
+++ b/media-libs/lcms/lcms-2.17.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/lcms2-${PV/_}"
 LICENSE="GPL-3 MIT"
 SLOT="2"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="doc jpeg static-libs test tiff"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/lensfun/lensfun-0.3.4-r1.ebuild b/media-libs/lensfun/lensfun-0.3.4-r1.ebuild
index 721453a58d1f..59e24ee0e6ca 100644
--- a/media-libs/lensfun/lensfun-0.3.4-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.4-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_rc/-RC}"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/lensfun/lensfun-0.3.4.ebuild b/media-libs/lensfun/lensfun-0.3.4.ebuild
index b53cc3872a10..f2e8a0405aeb 100644
--- a/media-libs/lensfun/lensfun-0.3.4.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_rc/-RC}"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
index 51bb949e30cf..9be5bfa17149 100644
--- a/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_rc/-RC}"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/libafterimage/libafterimage-1.20-r6.ebuild b/media-libs/libafterimage/libafterimage-1.20-r6.ebuild
index 60a27550f2bd..979ac61a4ceb 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r6.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="
diff --git a/media-libs/libao/libao-1.2.2-r3.ebuild b/media-libs/libao/libao-1.2.2-r3.ebuild
index 08e55018f696..07c5cf695c65 100644
--- a/media-libs/libao/libao-1.2.2-r3.ebuild
+++ b/media-libs/libao/libao-1.2.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="alsa nas mmap pulseaudio sndio"
 
 RDEPEND="
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index b87ce7c8b73f..add9e1e2bd27 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.levien.com/libart"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libass/libass-0.17.1-r2.ebuild b/media-libs/libass/libass-0.17.1-r2.ebuild
index 3a109b97ee7d..3c5ec2607769 100644
--- a/media-libs/libass/libass-0.17.1-r2.ebuild
+++ b/media-libs/libass/libass-0.17.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+fontconfig libunibreak test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libass/libass-0.17.1.ebuild b/media-libs/libass/libass-0.17.1.ebuild
index 6cddeca753bc..cca0ef77aecf 100644
--- a/media-libs/libass/libass-0.17.1.ebuild
+++ b/media-libs/libass/libass-0.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+fontconfig test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libass/libass-0.17.4.ebuild b/media-libs/libass/libass-0.17.4.ebuild
index a793dadcf4d3..bfff01c02b44 100644
--- a/media-libs/libass/libass-0.17.4.ebuild
+++ b/media-libs/libass/libass-0.17.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+fontconfig libunibreak test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
index fe43589ddbed..9d598ffb311c 100644
--- a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
+++ b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="gnome"
 
 COMMON_DEPEND="
diff --git a/media-libs/libcanberra/libcanberra-0.30-r8.ebuild b/media-libs/libcanberra/libcanberra-0.30-r8.ebuild
index 4e0b03a01210..c2a19497ac3f 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r8.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa gstreamer oss pulseaudio tdb udev"
 
 DEPEND="
diff --git a/media-libs/libcddb/libcddb-1.3.2-r2.ebuild b/media-libs/libcddb/libcddb-1.3.2-r2.ebuild
index 803a28c7b3d3..6cf9444b4fc4 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r2.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libcuefile/libcuefile-477-r3.ebuild b/media-libs/libcuefile/libcuefile-477-r3.ebuild
index eb3c4f56b5d0..83373f371d5f 100644
--- a/media-libs/libcuefile/libcuefile-477-r3.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-static-libs.patch
diff --git a/media-libs/libdca/libdca-0.0.7-r1.ebuild b/media-libs/libdca/libdca-0.0.7-r1.ebuild
index 81590c37acba..0d2bd4da93e4 100644
--- a/media-libs/libdca/libdca-0.0.7-r1.ebuild
+++ b/media-libs/libdca/libdca-0.0.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="debug oss"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
index e0389a2e5788..f35439547ab9 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="debug oss"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
diff --git a/media-libs/libdiscid/libdiscid-0.6.4.ebuild b/media-libs/libdiscid/libdiscid-0.6.4.ebuild
index fd1396705680..2662c59dfd96 100644
--- a/media-libs/libdiscid/libdiscid-0.6.4.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 src_configure() {
 	econf --disable-static
diff --git a/media-libs/libdv/libdv-1.0.0-r5.ebuild b/media-libs/libdv/libdv-1.0.0-r5.ebuild
index e14db0e47e2a..ceb76032e370 100644
--- a/media-libs/libdv/libdv-1.0.0-r5.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-libs/popt:="
 DEPEND="
diff --git a/media-libs/libdv/libdv-1.0.0-r6.ebuild b/media-libs/libdv/libdv-1.0.0-r6.ebuild
index c68f9f7448f5..ed8e7359aac4 100644
--- a/media-libs/libdv/libdv-1.0.0-r6.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-libs/popt:="
 DEPEND="
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.3.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.3.ebuild
index 1c39f1239fad..4ad109a0b922 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.3.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
index bc8e84c5a36f..838f05420785 100644
--- a/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 29c8c5687003..15d9a4dfea51 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-6.1.3.ebuild b/media-libs/libdvdread/libdvdread-6.1.3.ebuild
index 4bf7ee9f6d31..ed0fee10e964 100644
--- a/media-libs/libdvdread/libdvdread-6.1.3.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.1.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 # See https://code.videolan.org/videolan/libdvdread/-/commit/0e020921726ee812e633959d9ad6315ff58b902b
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index 4f5ab27fa4bd..2016d19c8d1a 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 # See https://code.videolan.org/videolan/libdvdread/-/commit/0e020921726ee812e633959d9ad6315ff58b902b
diff --git a/media-libs/libemf/libemf-1.0.13.ebuild b/media-libs/libemf/libemf-1.0.13.ebuild
index 4554e2d35d33..105e129bbfbd 100644
--- a/media-libs/libemf/libemf-1.0.13.ebuild
+++ b/media-libs/libemf/libemf-1.0.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/libemf/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc static-libs"
 
 src_configure() {
diff --git a/media-libs/libexif/libexif-0.6.24.ebuild b/media-libs/libexif/libexif-0.6.24.ebuild
index bd62880818ac..7e5dfa32b79d 100644
--- a/media-libs/libexif/libexif-0.6.24.ebuild
+++ b/media-libs/libexif/libexif-0.6.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libexif/libexif-0.6.25.ebuild b/media-libs/libexif/libexif-0.6.25.ebuild
index 1fe13face53d..baec7d148557 100644
--- a/media-libs/libexif/libexif-0.6.25.ebuild
+++ b/media-libs/libexif/libexif-0.6.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
index a0f33b79e163..fded484d52c8 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="Flashpix"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.31-r3.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.31-r3.ebuild
index a26ff566897a..b73b78699b6b 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.31-r3.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.31-r3.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # By default, drivers for all supported cameras will be compiled.
 # If you want to only compile for specific camera(s), set CAMERAS
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.32.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.32.ebuild
index b82a525330a0..3e8d722272d3 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.32.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.32.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/gphoto/${P}.tar.xz"
 LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # By default, drivers for all supported cameras will be compiled.
 # If you want to only compile for specific camera(s), set CAMERAS
diff --git a/media-libs/libharu/libharu-2.4.2-r1.ebuild b/media-libs/libharu/libharu-2.4.2-r1.ebuild
index 6710d7ad9cbc..e0eb1ec85e65 100644
--- a/media-libs/libharu/libharu-2.4.2-r1.ebuild
+++ b/media-libs/libharu/libharu-2.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	media-libs/libpng:=
diff --git a/media-libs/libharu/libharu-2.4.5.ebuild b/media-libs/libharu/libharu-2.4.5.ebuild
index ffca5d061aa0..8c1e06436050 100644
--- a/media-libs/libharu/libharu-2.4.5.ebuild
+++ b/media-libs/libharu/libharu-2.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	media-libs/libpng:=
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.1.ebuild
index f6ffa92efc99..c93f7ac44e92 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )"
 SLOT="0/0.2"
 if [[ $(ver_cut 3) -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs"
 
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild
index a62660366fe3..f2e91dc9db77 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )"
 SLOT="0/0.2"
 if [[ $(ver_cut 3) -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.3.ebuild
index 89890400d96f..0d9cec740f89 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )"
 SLOT="0/0.2"
 if [[ $(ver_cut 3) -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20241124.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20241124.ebuild
index d43ed50579e4..0badd4b87eb8 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20241124.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20241124.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lastfm/liblastfm/archive/${COMMIT}.tar.gz -> ${P}.ta
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/media-libs/libldac/libldac-2.0.2.3-r2.ebuild b/media-libs/libldac/libldac-2.0.2.3-r2.ebuild
index e2f790d951f4..2b6141f46ba7 100644
--- a/media-libs/libldac/libldac-2.0.2.3-r2.ebuild
+++ b/media-libs/libldac/libldac-2.0.2.3-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ldacBT"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=( "${FILESDIR}/${P}-cmake4.patch" ) # bug 951991
 
diff --git a/media-libs/liblrdf/liblrdf-0.6.1-r1.ebuild b/media-libs/liblrdf/liblrdf-0.6.1-r1.ebuild
index 210151b8486e..09bda127b86e 100644
--- a/media-libs/liblrdf/liblrdf-0.6.1-r1.ebuild
+++ b/media-libs/liblrdf/liblrdf-0.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/swh/LRDF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmad/libmad-0.15.1b-r10.ebuild b/media-libs/libmad/libmad-0.15.1b-r10.ebuild
index a124bd08ec42..8718382e0a2d 100644
--- a/media-libs/libmad/libmad-0.15.1b-r10.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mad/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="debug static-libs"
 
 DOCS=( CHANGES CREDITS README TODO VERSION )
diff --git a/media-libs/libmatroska/libmatroska-1.7.1-r1.ebuild b/media-libs/libmatroska/libmatroska-1.7.1-r1.ebuild
index 2fb01ab6deef..85395a3863b2 100644
--- a/media-libs/libmatroska/libmatroska-1.7.1-r1.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=dev-libs/libebml-1.4.3:="
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libmatroska/libmatroska-1.7.1.ebuild b/media-libs/libmatroska/libmatroska-1.7.1.ebuild
index a0bd628c538d..acc43415e86a 100644
--- a/media-libs/libmatroska/libmatroska-1.7.1.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=dev-libs/libebml-1.4.3:="
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libmikmod/libmikmod-3.3.12.ebuild b/media-libs/libmikmod/libmikmod-3.3.12.ebuild
index dfe3d6fdb06c..c232319ea95c 100644
--- a/media-libs/libmikmod/libmikmod-3.3.12.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+alsa coreaudio cpu_flags_ppc_altivec debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmikmod/libmikmod-3.3.13.ebuild b/media-libs/libmikmod/libmikmod-3.3.13.ebuild
index dfe3d6fdb06c..c232319ea95c 100644
--- a/media-libs/libmikmod/libmikmod-3.3.13.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+alsa coreaudio cpu_flags_ppc_altivec debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmms/libmms-0.6.4-r1.ebuild b/media-libs/libmms/libmms-0.6.4-r1.ebuild
index fc43d97d0e72..f82e0259faa0 100644
--- a/media-libs/libmms/libmms-0.6.4-r1.ebuild
+++ b/media-libs/libmms/libmms-0.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmng/libmng-2.0.3-r1.ebuild b/media-libs/libmng/libmng-2.0.3-r1.ebuild
index fd91cf5b6438..38cef99e521d 100644
--- a/media-libs/libmng/libmng-2.0.3-r1.ebuild
+++ b/media-libs/libmng/libmng-2.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="lcms"
 
 RDEPEND="
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.1.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.1.ebuild
index 3401b89635d2..d11e74f54613 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.1.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/modplug-${MY_PVR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmp4v2/libmp4v2-2.1.3-r1.ebuild b/media-libs/libmp4v2/libmp4v2-2.1.3-r1.ebuild
index bfe8f8114789..6d5ac20061a2 100644
--- a/media-libs/libmp4v2/libmp4v2-2.1.3-r1.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/enzo1982/mp4v2/releases/download/v${PV}/${MY_P}.tar.
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="utils"
 # Tests need DejaGnu but are non-existent (just an empty framework)
 RESTRICT="test"
diff --git a/media-libs/libmpd/libmpd-11.8.17-r2.ebuild b/media-libs/libmpd/libmpd-11.8.17-r2.ebuild
index 5aef3c7c0427..da2dd3d8619a 100644
--- a/media-libs/libmpd/libmpd-11.8.17-r2.ebuild
+++ b/media-libs/libmpd/libmpd-11.8.17-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
index bb11057b073a..e76e84f02d14 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="sdl X"
 
 RDEPEND="
diff --git a/media-libs/libogg/libogg-1.3.5-r1.ebuild b/media-libs/libogg/libogg-1.3.5-r1.ebuild
index 79ef0d19c44f..53eec146601d 100644
--- a/media-libs/libogg/libogg-1.3.5-r1.ebuild
+++ b/media-libs/libogg/libogg-1.3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/media-libs/libogg/libogg-1.3.5-r2.ebuild b/media-libs/libogg/libogg-1.3.5-r2.ebuild
index 0e6f2a4e173e..1aa94441cf91 100644
--- a/media-libs/libogg/libogg-1.3.5-r2.ebuild
+++ b/media-libs/libogg/libogg-1.3.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/media-libs/libogg/libogg-1.3.6.ebuild b/media-libs/libogg/libogg-1.3.6.ebuild
index 659297cc7ba1..c8039f973017 100644
--- a/media-libs/libogg/libogg-1.3.6.ebuild
+++ b/media-libs/libogg/libogg-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/libopenraw/libopenraw-0.3.7-r3.ebuild b/media-libs/libopenraw/libopenraw-0.3.7-r3.ebuild
index b2cb68518e17..37cd2f581a91 100644
--- a/media-libs/libopenraw/libopenraw-0.3.7-r3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.3.7-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.xz"
 # MPL-2.0 for mp4parse (https://gitlab.freedesktop.org/libopenraw/libopenraw/-/issues/15)
 LICENSE="GPL-3 LGPL-3 MPL-2.0"
 SLOT="0/9"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4-r1.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4-r1.ebuild
index 964c61c9ed9f..b7d8ebdcc9e3 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4-r1.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index 1a64a5db31ab..739b54fd6c47 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
diff --git a/media-libs/libpano13/libpano13-2.9.22-r1.ebuild b/media-libs/libpano13/libpano13-2.9.22-r1.ebuild
index e2cde44f6767..9f7ef0036fe5 100644
--- a/media-libs/libpano13/libpano13-2.9.22-r1.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.22-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="GPL-2"
 SLOT="0/3"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86"
 IUSE="java static-libs suitesparse"
 
 DEPEND="media-libs/libpng:=
diff --git a/media-libs/libpano13/libpano13-2.9.22.ebuild b/media-libs/libpano13/libpano13-2.9.22.ebuild
index 9c22a4cb9209..6c0204bd4355 100644
--- a/media-libs/libpano13/libpano13-2.9.22.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/panotools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/3"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86"
 IUSE="java static-libs suitesparse"
 
 DEPEND="media-libs/libpng:=
diff --git a/media-libs/libpano13/libpano13-2.9.23.ebuild b/media-libs/libpano13/libpano13-2.9.23.ebuild
index ac75ebbdb201..007e5ad13fae 100644
--- a/media-libs/libpano13/libpano13-2.9.23.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.23.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="GPL-2"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="java static-libs suitesparse"
 
 DEPEND="media-libs/libpng:=
diff --git a/media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild b/media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild
index 2932e95a1938..a92020b22a8e 100644
--- a/media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="libpng"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	>=virtual/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild
index 4c416edbd091..311503bc41b9 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.47.ebuild b/media-libs/libpng/libpng-1.6.47.ebuild
index ba255ec42548..4c2413426dac 100644
--- a/media-libs/libpng/libpng-1.6.47.ebuild
+++ b/media-libs/libpng/libpng-1.6.47.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="apng cpu_flags_x86_sse static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpng/libpng-1.6.50-r1.ebuild b/media-libs/libpng/libpng-1.6.50-r1.ebuild
index 2874ae63fdc0..11584f67539d 100644
--- a/media-libs/libpng/libpng-1.6.50-r1.ebuild
+++ b/media-libs/libpng/libpng-1.6.50-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="apng cpu_flags_x86_sse static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpng/libpng-1.6.51.ebuild b/media-libs/libpng/libpng-1.6.51.ebuild
index 2831c138b47e..6ccd70411828 100644
--- a/media-libs/libpng/libpng-1.6.51.ebuild
+++ b/media-libs/libpng/libpng-1.6.51.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="apng cpu_flags_x86_sse static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpng/libpng-1.6.52.ebuild b/media-libs/libpng/libpng-1.6.52.ebuild
index c546839ae7fd..f4b7a89846f1 100644
--- a/media-libs/libpng/libpng-1.6.52.ebuild
+++ b/media-libs/libpng/libpng-1.6.52.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="apng cpu_flags_x86_sse static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpng/libpng-1.6.53.ebuild b/media-libs/libpng/libpng-1.6.53.ebuild
index c546839ae7fd..f4b7a89846f1 100644
--- a/media-libs/libpng/libpng-1.6.53.ebuild
+++ b/media-libs/libpng/libpng-1.6.53.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="apng cpu_flags_x86_sse static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpulse/libpulse-17.0.ebuild b/media-libs/libpulse/libpulse-17.0.ebuild
index 81723a861d83..63b57899eaa7 100644
--- a/media-libs/libpulse/libpulse-17.0.ebuild
+++ b/media-libs/libpulse/libpulse-17.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/libraw/libraw-0.21.2.ebuild b/media-libs/libraw/libraw-0.21.2.ebuild
index c241a1de3dec..59cb4550629e 100644
--- a/media-libs/libraw/libraw-0.21.2.ebuild
+++ b/media-libs/libraw/libraw-0.21.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="LGPL-2.1 CDDL"
 # SONAME isn't exactly the same as PV but it does correspond and
 # libraw has unstable ABI across releases.
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples jpeg +lcms openmp zlib"
 
 RDEPEND="
diff --git a/media-libs/libraw/libraw-0.21.4.ebuild b/media-libs/libraw/libraw-0.21.4.ebuild
index 82cf6880261c..8c17b9a2b1e3 100644
--- a/media-libs/libraw/libraw-0.21.4.ebuild
+++ b/media-libs/libraw/libraw-0.21.4.ebuild
@@ -18,7 +18,7 @@ LICENSE="LGPL-2.1 CDDL"
 # SONAME isn't exactly the same as PV but it does correspond and
 # libraw has unstable ABI across releases.
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples hardened jpeg +lcms openmp zlib"
 
 RDEPEND="
diff --git a/media-libs/libreplaygain/libreplaygain-483.ebuild b/media-libs/libreplaygain/libreplaygain-483.ebuild
index e243b0e13ec8..a73d120e8495 100644
--- a/media-libs/libreplaygain/libreplaygain-483.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-483.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-static-libs.patch )
 
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
index 89973a05c127..331681272749 100644
--- a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index eb7b5df68159..912c0ad0eba4 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsndfile/libsndfile-1.2.2-r2.ebuild b/media-libs/libsndfile/libsndfile-1.2.2-r2.ebuild
index d834a6686da1..291b64a16c3b 100644
--- a/media-libs/libsndfile/libsndfile-1.2.2-r2.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.2.2-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 inherit flag-o-matic python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index bc61e7250150..39b35cc2ab04 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 inherit flag-o-matic python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.3-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.3-r1.ebuild
index 818c4cbf3b2f..cef9cd169e95 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.3.3-r1.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.3-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.4.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.4.0.ebuild
index 4fc36c29a101..6e72afb694d0 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.4.0.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/1" # subslot is libSoundTouch.so soname
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="openmp static-libs"
 IUSE+=" cpu_flags_arm_neon cpu_flags_x86_sse"
 
diff --git a/media-libs/libtheora/libtheora-1.2.0-r1.ebuild b/media-libs/libtheora/libtheora-1.2.0-r1.ebuild
index 557951d86f11..66514e95047d 100644
--- a/media-libs/libtheora/libtheora-1.2.0-r1.ebuild
+++ b/media-libs/libtheora/libtheora-1.2.0-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${P/_}
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" # bug #285895
diff --git a/media-libs/libuninameslist/libuninameslist-20221022.ebuild b/media-libs/libuninameslist/libuninameslist-20221022.ebuild
index efcde07e132d..c92b3e5853de 100644
--- a/media-libs/libuninameslist/libuninameslist-20221022.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20221022.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_configure() {
 	econf --enable-frenchlib
diff --git a/media-libs/libuninameslist/libuninameslist-20230916.ebuild b/media-libs/libuninameslist/libuninameslist-20230916.ebuild
index efcde07e132d..c92b3e5853de 100644
--- a/media-libs/libuninameslist/libuninameslist-20230916.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20230916.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_configure() {
 	econf --enable-frenchlib
diff --git a/media-libs/libv4l/libv4l-1.32.0.ebuild b/media-libs/libv4l/libv4l-1.32.0.ebuild
index d17bdced79c5..efb342a69622 100644
--- a/media-libs/libv4l/libv4l-1.32.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.32.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1+ utils? ( MIT || ( BSD GPL-2 ) )"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="bpf doc dvb jpeg qt6 tracer +utils"
 
 REQUIRED_USE="
diff --git a/media-libs/libva-compat/libva-compat-1.8.3-r2.ebuild b/media-libs/libva-compat/libva-compat-1.8.3-r2.ebuild
index ae039a72d5e8..27779577eb91 100644
--- a/media-libs/libva-compat/libva-compat-1.8.3-r2.ebuild
+++ b/media-libs/libva-compat/libva-compat-1.8.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+drm egl opengl wayland X"
 
 RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
diff --git a/media-libs/libva-compat/libva-compat-1.8.3-r3.ebuild b/media-libs/libva-compat/libva-compat-1.8.3-r3.ebuild
index 6f9a3508855f..d66cc8bd0c40 100644
--- a/media-libs/libva-compat/libva-compat-1.8.3-r3.ebuild
+++ b/media-libs/libva-compat/libva-compat-1.8.3-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+drm egl opengl wayland X"
 
 RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-2.4.4.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.4.ebuild
index 57b8d4833c11..163f857817b5 100644
--- a/media-libs/libva-intel-driver/libva-intel-driver-2.4.4.ebuild
+++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/irql-notlessorequal/intel-vaapi-driver"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/irql-notlessorequal/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-2.4.5.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.5.ebuild
index e786df79def8..7cc96ea95f26 100644
--- a/media-libs/libva-intel-driver/libva-intel-driver-2.4.5.ebuild
+++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/irql-notlessorequal/intel-vaapi-driver"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/irql-notlessorequal/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index e786df79def8..7cc96ea95f26 100644
--- a/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/irql-notlessorequal/intel-vaapi-driver"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/irql-notlessorequal/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libva/libva-2.22.0-r1.ebuild b/media-libs/libva/libva-2.22.0-r1.ebuild
index 40af41920015..dcbb1efb8718 100644
--- a/media-libs/libva/libva-2.22.0-r1.ebuild
+++ b/media-libs/libva/libva-2.22.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libva/libva-2.23.0.ebuild b/media-libs/libva/libva-2.23.0.ebuild
index 5fa18768df19..c52e51bddd27 100644
--- a/media-libs/libva/libva-2.23.0.ebuild
+++ b/media-libs/libva/libva-2.23.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
index 6d2c5c7172e0..2e5f0ad1b133 100644
--- a/media-libs/libva/libva-9999.ebuild
+++ b/media-libs/libva/libva-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild b/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild
index aa3ceba75873..4babb980015a 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libvorbis/libvorbis-1.3.7-r2.ebuild b/media-libs/libvorbis/libvorbis-1.3.7-r2.ebuild
index 76b279855305..46a910fe6d85 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7-r2.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libvpx/libvpx-1.14.1.ebuild b/media-libs/libvpx/libvpx-1.14.1.ebuild
index f9c40e9ecff0..8f7e19125472 100644
--- a/media-libs/libvpx/libvpx-1.14.1.ebuild
+++ b/media-libs/libvpx/libvpx-1.14.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads"
 REQUIRED_USE="test? ( threads )"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libvpx/libvpx-1.15.2.ebuild b/media-libs/libvpx/libvpx-1.15.2.ebuild
index aabd028de430..44d0a185b748 100644
--- a/media-libs/libvpx/libvpx-1.15.2.ebuild
+++ b/media-libs/libvpx/libvpx-1.15.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/11"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads"
 REQUIRED_USE="test? ( threads )"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libwebp/libwebp-1.4.0.ebuild b/media-libs/libwebp/libwebp-1.4.0.ebuild
index 1421464ea02f..fc15cb83aeaf 100644
--- a/media-libs/libwebp/libwebp-1.4.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.4.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
diff --git a/media-libs/libwebp/libwebp-1.5.0.ebuild b/media-libs/libwebp/libwebp-1.5.0.ebuild
index 1421464ea02f..fc15cb83aeaf 100644
--- a/media-libs/libwebp/libwebp-1.5.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.5.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
diff --git a/media-libs/libwebp/libwebp-1.6.0.ebuild b/media-libs/libwebp/libwebp-1.6.0.ebuild
index 51ab11e57b1c..818f4e06da34 100644
--- a/media-libs/libwebp/libwebp-1.6.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.6.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
diff --git a/media-libs/libwmf/libwmf-0.2.13-r2.ebuild b/media-libs/libwmf/libwmf-0.2.13-r2.ebuild
index 5f25ffa66567..9fe9efb00e62 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r2.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="
diff --git a/media-libs/libxmi/libxmi-1.3-r1.ebuild b/media-libs/libxmi/libxmi-1.3-r1.ebuild
index 9d89bc4baf08..8b8ad757ce2d 100644
--- a/media-libs/libxmi/libxmi-1.3-r1.ebuild
+++ b/media-libs/libxmi/libxmi-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_prepare() {
 	default
diff --git a/media-libs/libxmi/libxmi-1.3-r2.ebuild b/media-libs/libxmi/libxmi-1.3-r2.ebuild
index 3d11e573e08d..4d2f48860fd3 100644
--- a/media-libs/libxmi/libxmi-1.3-r2.ebuild
+++ b/media-libs/libxmi/libxmi-1.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gcc15.patch"
diff --git a/media-libs/libxspf/libxspf-1.2.1.ebuild b/media-libs/libxspf/libxspf-1.2.1.ebuild
index d2669d5e7a8f..29bf036db181 100644
--- a/media-libs/libxspf/libxspf-1.2.1.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/libspiff/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9-r2.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9-r2.ebuild
index da62b9952ae0..5f9ccb7545cc 100644
--- a/media-libs/mesa-amber/mesa-amber-21.3.9-r2.ebuild
+++ b/media-libs/mesa-amber/mesa-amber-21.3.9-r2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9-r3.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9-r3.ebuild
index 3a79fce918f2..c2bebee1b31d 100644
--- a/media-libs/mesa-amber/mesa-amber-21.3.9-r3.ebuild
+++ b/media-libs/mesa-amber/mesa-amber-21.3.9-r3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/mesa/mesa-25.0.7.ebuild b/media-libs/mesa/mesa-25.0.7.ebuild
index 5da194544570..08a1e3f2424b 100644
--- a/media-libs/mesa/mesa-25.0.7.ebuild
+++ b/media-libs/mesa/mesa-25.0.7.ebuild
@@ -36,7 +36,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.1.9.ebuild b/media-libs/mesa/mesa-25.1.9.ebuild
index 3ce14384d924..3bc7149275cc 100644
--- a/media-libs/mesa/mesa-25.1.9.ebuild
+++ b/media-libs/mesa/mesa-25.1.9.ebuild
@@ -36,7 +36,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.2.5.ebuild b/media-libs/mesa/mesa-25.2.5.ebuild
index a9fad5eea54a..ca273d0abc72 100644
--- a/media-libs/mesa/mesa-25.2.5.ebuild
+++ b/media-libs/mesa/mesa-25.2.5.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.2.6.ebuild b/media-libs/mesa/mesa-25.2.6.ebuild
index a9fad5eea54a..ca273d0abc72 100644
--- a/media-libs/mesa/mesa-25.2.6.ebuild
+++ b/media-libs/mesa/mesa-25.2.6.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.2.7.ebuild b/media-libs/mesa/mesa-25.2.7.ebuild
index 47a76f109604..e50130299b1c 100644
--- a/media-libs/mesa/mesa-25.2.7.ebuild
+++ b/media-libs/mesa/mesa-25.2.7.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.2.8.ebuild b/media-libs/mesa/mesa-25.2.8.ebuild
index 309aaec6c84b..04ebf30b0c64 100644
--- a/media-libs/mesa/mesa-25.2.8.ebuild
+++ b/media-libs/mesa/mesa-25.2.8.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.3.0.ebuild b/media-libs/mesa/mesa-25.3.0.ebuild
index ddc2c6676c4e..c46f826238bc 100644
--- a/media-libs/mesa/mesa-25.3.0.ebuild
+++ b/media-libs/mesa/mesa-25.3.0.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.3.1.ebuild b/media-libs/mesa/mesa-25.3.1.ebuild
index ddc2c6676c4e..c46f826238bc 100644
--- a/media-libs/mesa/mesa-25.3.1.ebuild
+++ b/media-libs/mesa/mesa-25.3.1.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-25.3.2.ebuild b/media-libs/mesa/mesa-25.3.2.ebuild
index ddc2c6676c4e..c46f826238bc 100644
--- a/media-libs/mesa/mesa-25.3.2.ebuild
+++ b/media-libs/mesa/mesa-25.3.2.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ddc2c6676c4e..c46f826238bc 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mlt/mlt-7.32.0.ebuild b/media-libs/mlt/mlt-7.32.0.ebuild
index 4ba8b7b6add5..d4fddc64d129 100644
--- a/media-libs/mlt/mlt-7.32.0.ebuild
+++ b/media-libs/mlt/mlt-7.32.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0/7"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt6 rtaudio rubberband sdl test vdpau vidstab xine xml"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/mlt/mlt-7.34.1-r1.ebuild b/media-libs/mlt/mlt-7.34.1-r1.ebuild
index 463ef53ec008..5eb93319a684 100644
--- a/media-libs/mlt/mlt-7.34.1-r1.ebuild
+++ b/media-libs/mlt/mlt-7.34.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0/7"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt6
 rtaudio rubberband sdl test vdpau vidstab vorbis xine xml"
 
diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0-r2.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0-r2.ebuild
index ec211c0f1bf1..716ac63a1ce7 100644
--- a/media-libs/musicbrainz/musicbrainz-5.1.0-r2.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="5/1" # soname of libmusicbrainz5.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/mutagen/mutagen-1.47.0.ebuild b/media-libs/mutagen/mutagen-1.47.0.ebuild
index 92eafafdeca9..9561e1e22877 100644
--- a/media-libs/mutagen/mutagen-1.47.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.47.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/media-libs/netpbm/netpbm-11.12.0.ebuild b/media-libs/netpbm/netpbm-11.12.0.ebuild
index 6942da4beec4..d74d24d209a7 100644
--- a/media-libs/netpbm/netpbm-11.12.0.ebuild
+++ b/media-libs/netpbm/netpbm-11.12.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
 SLOT="0/advanced"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs test tiff X xml"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/netpbm/netpbm-11.2.19.ebuild b/media-libs/netpbm/netpbm-11.2.19.ebuild
index 9c8ffb21d4e2..61b4ca174f2c 100644
--- a/media-libs/netpbm/netpbm-11.2.19.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.19.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
 SLOT="0/stable"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs tiff X xml"
 
 # app-text/ghostscript-gpl is really needed for postscript
diff --git a/media-libs/openal/openal-1.24.3.ebuild b/media-libs/openal/openal-1.24.3.ebuild
index 2d83c63f601c..a2c9ea11ff8f 100644
--- a/media-libs/openal/openal-1.24.3.ebuild
+++ b/media-libs/openal/openal-1.24.3.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 # Some components are under BSD
 LICENSE="LGPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="
 	alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio gui
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/openexr/openexr-3.3.2-r1.ebuild b/media-libs/openexr/openexr-3.3.2-r1.ebuild
index 644df90529d1..3902d0564c19 100644
--- a/media-libs/openexr/openexr-3.3.2-r1.ebuild
+++ b/media-libs/openexr/openexr-3.3.2-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/32" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~x64-macos"
 
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
 REQUIRED_USE="doc? ( utils )"
diff --git a/media-libs/openexr/openexr-3.3.3.ebuild b/media-libs/openexr/openexr-3.3.3.ebuild
index 7383dac202ff..eb8c097c85af 100644
--- a/media-libs/openexr/openexr-3.3.3.ebuild
+++ b/media-libs/openexr/openexr-3.3.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/32" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~x64-macos"
 
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
 REQUIRED_USE="doc? ( utils )"
diff --git a/media-libs/openexr/openexr-3.3.4.ebuild b/media-libs/openexr/openexr-3.3.4.ebuild
index 109bf786e743..00e03094947a 100644
--- a/media-libs/openexr/openexr-3.3.4.ebuild
+++ b/media-libs/openexr/openexr-3.3.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/32" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~x64-macos"
 
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
 REQUIRED_USE="doc? ( utils )"
diff --git a/media-libs/openexr/openexr-3.3.5.ebuild b/media-libs/openexr/openexr-3.3.5.ebuild
index 109bf786e743..00e03094947a 100644
--- a/media-libs/openexr/openexr-3.3.5.ebuild
+++ b/media-libs/openexr/openexr-3.3.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/32" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~x64-macos"
 
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
 REQUIRED_USE="doc? ( utils )"
diff --git a/media-libs/openexr/openexr-3.4.4.ebuild b/media-libs/openexr/openexr-3.4.4.ebuild
index 41664aaf9ae5..7474c63126c6 100644
--- a/media-libs/openexr/openexr-3.4.4.ebuild
+++ b/media-libs/openexr/openexr-3.4.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/33" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~x64-macos"
 
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
 REQUIRED_USE="doc? ( utils )"
diff --git a/media-libs/openjpeg/openjpeg-2.5.3-r1.ebuild b/media-libs/openjpeg/openjpeg-2.5.3-r1.ebuild
index 224172eaeace..46bdfdb3b018 100644
--- a/media-libs/openjpeg/openjpeg-2.5.3-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openjpeg/openjpeg-2.5.4.ebuild b/media-libs/openjpeg/openjpeg-2.5.4.ebuild
index 0f0667ae11c8..cf410dd6e347 100644
--- a/media-libs/openjpeg/openjpeg-2.5.4.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/plotutils/plotutils-2.6-r3.ebuild b/media-libs/plotutils/plotutils-2.6-r3.ebuild
index 2e8725be5431..cb65c112e87a 100644
--- a/media-libs/plotutils/plotutils-2.6-r3.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+png X"
 
 DEPEND="
diff --git a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
index 1478e4b3098d..44147be3d715 100644
--- a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
+++ b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/qhull/qhull-2020.2.8.1_alpha6.ebuild b/media-libs/qhull/qhull-2020.2.8.1_alpha6.ebuild
index 15d41b6fa9ee..4caa6347c934 100644
--- a/media-libs/qhull/qhull-2020.2.8.1_alpha6.ebuild
+++ b/media-libs/qhull/qhull-2020.2.8.1_alpha6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV//_/-}"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2 "${MY_PV}")"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="doc static-libs tools test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
diff --git a/media-libs/raptor/raptor-2.0.16-r1.ebuild b/media-libs/raptor/raptor-2.0.16-r1.ebuild
index 53650660e32a..782c95d5b854 100644
--- a/media-libs/raptor/raptor-2.0.16-r1.ebuild
+++ b/media-libs/raptor/raptor-2.0.16-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="debug json static-libs"
 
 DEPEND="
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
index e4f570c24833..ed4be1e23253 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0/16" # libSDL_gfx.so.16
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc cpu_flags_x86_mmx"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r2.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r2.ebuild
index 581e3fc28f1a..9bbe4f93a4d8 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r2.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0/16" # libSDL_gfx.so.16
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc cpu_flags_x86_mmx"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild
index e113b926ea42..369032c7832f 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_IMAGE_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index 2cdd643c9fd8..f7956b782686 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 
 REQUIRED_USE="
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
index be83bebe9c32..047273ba5ae6 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 
 REQUIRED_USE="
diff --git a/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild b/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild
index 5746598967a0..4bb645bc6108 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_NET_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86"
 
 RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index f87824d2cf72..29bfa8057071 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="static-libs X"
 
 RDEPEND="
diff --git a/media-libs/sg/sg-1.5.ebuild b/media-libs/sg/sg-1.5.ebuild
index 35a201b16a3f..c95bd06f50be 100644
--- a/media-libs/sg/sg-1.5.ebuild
+++ b/media-libs/sg/sg-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
index 444eada510dd..af9093d42861 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.dotsrc.org/lokigames/open-source/smpeg/${P}.tar.gz
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="cpu_flags_x86_mmx opengl"
 
 RDEPEND="
diff --git a/media-libs/smpeg/smpeg-0.4.4-r12.ebuild b/media-libs/smpeg/smpeg-0.4.4-r12.ebuild
index a69100d4f697..a104ba6ae184 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r12.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="cpu_flags_x86_mmx opengl"
 
 RDEPEND="
diff --git a/media-libs/speex/speex-1.2.1-r2.ebuild b/media-libs/speex/speex-1.2.1-r2.ebuild
index 808373402531..51c17d4dc87e 100644
--- a/media-libs/speex/speex-1.2.1-r2.ebuild
+++ b/media-libs/speex/speex-1.2.1-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils valgrind +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/speexdsp-1.2.1.ebuild b/media-libs/speexdsp/speexdsp-1.2.1.ebuild
index fe22a5dccc01..39dbca3c5b28 100644
--- a/media-libs/speexdsp/speexdsp-1.2.1.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/t1lib/t1lib-5.1.2-r5.ebuild b/media-libs/t1lib/t1lib-5.1.2-r5.ebuild
index a4ee6a6c8f0a..88bb7fac937e 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r5.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ibiblio.org/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/taglib/taglib-1.13.1.ebuild b/media-libs/taglib/taglib-1.13.1.ebuild
index d13e8b6bcb90..b88207098416 100644
--- a/media-libs/taglib/taglib-1.13.1.ebuild
+++ b/media-libs/taglib/taglib-1.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/taglib/taglib-2.1.1.ebuild b/media-libs/taglib/taglib-2.1.1.ebuild
index cadfbd8e76d8..5350aead0c82 100644
--- a/media-libs/taglib/taglib-2.1.1.ebuild
+++ b/media-libs/taglib/taglib-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
 SLOT="0/2"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff-compat/tiff-compat-4.4.0-r3.ebuild b/media-libs/tiff-compat/tiff-compat-4.4.0-r3.ebuild
index ed4938a15c54..f823d0275459 100644
--- a/media-libs/tiff-compat/tiff-compat-4.4.0-r3.ebuild
+++ b/media-libs/tiff-compat/tiff-compat-4.4.0-r3.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PN/-compat}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="4"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 IUSE="+cxx jbig jpeg lzma test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild b/media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild
index 24afa63017ba..d9b2f8c5fae5 100644
--- a/media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild
+++ b/media-libs/tiff-compat/tiff-compat-4.4.0-r4.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PN/-compat}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="4"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 IUSE="+cxx jbig jpeg lerc lzma test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/tiff-4.5.1.ebuild b/media-libs/tiff/tiff-4.5.1.ebuild
index 8e51cc1cc221..e7873685b3ee 100644
--- a/media-libs/tiff/tiff-4.5.1.ebuild
+++ b/media-libs/tiff/tiff-4.5.1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0/6"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/tiff-4.6.0-r1.ebuild b/media-libs/tiff/tiff-4.6.0-r1.ebuild
index 43d291f181c6..a1eaeb75a5d1 100644
--- a/media-libs/tiff/tiff-4.6.0-r1.ebuild
+++ b/media-libs/tiff/tiff-4.6.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0/6"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/tiff-4.6.0.ebuild b/media-libs/tiff/tiff-4.6.0.ebuild
index 80fb180daf61..7761fa6f9c84 100644
--- a/media-libs/tiff/tiff-4.6.0.ebuild
+++ b/media-libs/tiff/tiff-4.6.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0/6"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/tiff-4.7.0-r1.ebuild b/media-libs/tiff/tiff-4.7.0-r1.ebuild
index 19c7ca163a3f..34fa0e86b90b 100644
--- a/media-libs/tiff/tiff-4.7.0-r1.ebuild
+++ b/media-libs/tiff/tiff-4.7.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0/6"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+cxx jbig jpeg lerc libdeflate lzma opengl static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/tiff-4.7.0.ebuild b/media-libs/tiff/tiff-4.7.0.ebuild
index caec0f5f9396..bcc3c80f789d 100644
--- a/media-libs/tiff/tiff-4.7.0.ebuild
+++ b/media-libs/tiff/tiff-4.7.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0/6"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+cxx jbig jpeg lzma opengl static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/urt/urt-3.2_rc1_p20250101.ebuild b/media-libs/urt/urt-3.2_rc1_p20250101.ebuild
index e2ea52315503..0b3d56561253 100644
--- a/media-libs/urt/urt-3.2_rc1_p20250101.ebuild
+++ b/media-libs/urt/urt-3.2_rc1_p20250101.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
 LICENSE="GPL-2 gif? ( free-noncomm )"
 SLOT="0/3.1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
index 0cdc760954b4..9706cb4d2174 100644
--- a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
+++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
@@ -23,7 +23,7 @@ else
 		SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
 	fi
 
-	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="amd64 arm64 ~sparc x86 ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/vigra/vigra-1.12.1.ebuild b/media-libs/vigra/vigra-1.12.1.ebuild
index cb887d5e568a..161d7434a634 100644
--- a/media-libs/vigra/vigra-1.12.1.ebuild
+++ b/media-libs/vigra/vigra-1.12.1.ebuild
@@ -30,7 +30,7 @@ else
 		S="${WORKDIR}/${PN}-Version-$(ver_rs 1- -)"
 	fi
 
-	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="amd64 arm64 ~sparc x86 ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/vigra/vigra-1.12.2.ebuild b/media-libs/vigra/vigra-1.12.2.ebuild
index 2c243d3c82c7..54d20997ddc3 100644
--- a/media-libs/vigra/vigra-1.12.2.ebuild
+++ b/media-libs/vigra/vigra-1.12.2.ebuild
@@ -30,7 +30,7 @@ else
 		S="${WORKDIR}/${PN}-Version-$(ver_rs 1- -)"
 	fi
 
-	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 2c243d3c82c7..54d20997ddc3 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -30,7 +30,7 @@ else
 		S="${WORKDIR}/${PN}-Version-$(ver_rs 1- -)"
 	fi
 
-	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
index 58e83c50df26..91884989ea5f 100644
--- a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
 else
 	SRC_URI="https://downloads.sourceforge.net/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AAC encoder library"
diff --git a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
index 44001d9d2b67..0d79b954966a 100644
--- a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
 else
 	SRC_URI="https://downloads.sourceforge.net/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AAC encoder library"
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1-r1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1-r1.ebuild
index 56ebe65118cd..6c0d2ec2d937 100644
--- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1-r1.ebuild
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS NEWS README.md )
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3-r3.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3-r3.ebuild
index 112b1203df41..805454b295e0 100644
--- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3-r3.ebuild
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="cpu_flags_arm_neon"
 
 RDEPEND="dev-cpp/abseil-cpp:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-2.1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-2.1.ebuild
index 298ae284fe24..4ef2cc5894d7 100644
--- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-2.1.ebuild
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse"
 
 RDEPEND=">=dev-cpp/abseil-cpp-20240722:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/woff2/woff2-1.0.2-r7.ebuild b/media-libs/woff2/woff2-1.0.2-r7.ebuild
index 1b36ef619741..b87f922b0651 100644
--- a/media-libs/woff2/woff2-1.0.2-r7.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli:="
diff --git a/media-libs/x264/x264-0.0.20240513.ebuild b/media-libs/x264/x264-0.0.20240513.ebuild
index 0d78316e0c0f..faab78b6d035 100644
--- a/media-libs/x264/x264-0.0.20240513.ebuild
+++ b/media-libs/x264/x264-0.0.20240513.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
 	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 	S="${WORKDIR}/${PN}-${X264_COMMIT}"
 fi
 
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 5cdeb9d238bf..143efd953b95 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
 	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	S="${WORKDIR}/${PN}-${X264_COMMIT}"
 fi
 
diff --git a/media-libs/xvid/xvid-1.3.7-r2.ebuild b/media-libs/xvid/xvid-1.3.7-r2.ebuild
index 4d83898ee6e7..c33acee6527b 100644
--- a/media-libs/xvid/xvid-1.3.7-r2.ebuild
+++ b/media-libs/xvid/xvid-1.3.7-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}/build/generic"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.12.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.12.ebuild
index f6db805e3ee7..f81260be2bdd 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.12.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.24.11.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.24.11.ebuild
index a49aad525617..26c2fb37c210 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.24.11.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.24.11.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+egl +gles2 opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-base is built with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.22.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.22.ebuild
index 31bc277c90b8..c3710406e820 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.22.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.22.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.11.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.11.ebuild
index 1368ce847b7e..35fa37fce597 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.11.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.11.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.11.0.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.11.0.ebuild
index b8625361c5ee..ae522e317b6d 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.11.0.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.11.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x64-solaris"
 IUSE="xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}"
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.12.2.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.12.2.ebuild
index 28576655639f..a530c5c0be69 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.12.2.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.12.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x64-solaris"
 IUSE="xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}"
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.12.3.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.12.3.ebuild
index c5fe7a555226..d0af9f7e822a 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.12.3.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.12.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-solaris"
 IUSE="xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}"
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.12.5.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.12.5.ebuild
index 4e3c3e5799f9..975dfa8d63da 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.12.5.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.12.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris"
 IUSE="xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}"
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.9.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.9.1.ebuild
index 920dae1e9e75..b2b22ec616cf 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.9.1.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.9.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x64-solaris"
 IUSE="xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}"
diff --git a/media-plugins/live/live-2024.10.31.ebuild b/media-plugins/live/live-2024.10.31.ebuild
index 1b01e4a59cfa..3d0a7f5df28a 100644
--- a/media-plugins/live/live-2024.10.31.ebuild
+++ b/media-plugins/live/live-2024.10.31.ebuild
@@ -18,7 +18,7 @@ LICENSE="LGPL-2.1"
 # follow versioning in config.linux-with-shared-libraries
 # SLOT="0/${libliveMedia_VERSION_CURRENT}.${libBasicUsageEnvironment_VERSION_CURRENT}.${libUsageEnvironment_VERSION_CURRENT}.${libgroupsock_VERSION_CURRENT}"
 SLOT="0/115.3.5.32"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="ssl tools"
 
diff --git a/media-plugins/live/live-2025.07.19.ebuild b/media-plugins/live/live-2025.07.19.ebuild
index f6cef0894d99..ed8f9ac642a7 100644
--- a/media-plugins/live/live-2025.07.19.ebuild
+++ b/media-plugins/live/live-2025.07.19.ebuild
@@ -18,7 +18,7 @@ LICENSE="LGPL-2.1"
 # follow versioning in config.linux-with-shared-libraries
 # SLOT="0/${libliveMedia_VERSION_CURRENT}.${libBasicUsageEnvironment_VERSION_CURRENT}.${libUsageEnvironment_VERSION_CURRENT}.${libgroupsock_VERSION_CURRENT}"
 SLOT="0/116.3.5.32"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="ssl tools"
 
diff --git a/media-plugins/live/live-2025.10.13.ebuild b/media-plugins/live/live-2025.10.13.ebuild
index c9a83b7555ba..6cb6e31d46b0 100644
--- a/media-plugins/live/live-2025.10.13.ebuild
+++ b/media-plugins/live/live-2025.10.13.ebuild
@@ -18,7 +18,7 @@ LICENSE="LGPL-2.1"
 # follow versioning in config.linux-with-shared-libraries
 # SLOT="0/${libliveMedia_VERSION_CURRENT}.${libBasicUsageEnvironment_VERSION_CURRENT}.${libUsageEnvironment_VERSION_CURRENT}.${libgroupsock_VERSION_CURRENT}"
 SLOT="0/117.3.5.32"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="ssl tools"
 
diff --git a/media-plugins/live/live-2025.11.06.ebuild b/media-plugins/live/live-2025.11.06.ebuild
index 6e804d0c8703..683e354dab22 100644
--- a/media-plugins/live/live-2025.11.06.ebuild
+++ b/media-plugins/live/live-2025.11.06.ebuild
@@ -18,7 +18,7 @@ LICENSE="LGPL-2.1"
 # follow versioning in config.linux-with-shared-libraries
 # SLOT="0/${libliveMedia_VERSION_CURRENT}.${libBasicUsageEnvironment_VERSION_CURRENT}.${libUsageEnvironment_VERSION_CURRENT}.${libgroupsock_VERSION_CURRENT}"
 SLOT="0/117.3.5.32"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="ssl tools"
 
diff --git a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.10.ebuild b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.10.ebuild
index bd369b0f97c1..2e5e168a7302 100644
--- a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.10.ebuild
+++ b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.10.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.0.ebuild b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.0.ebuild
index a60614037207..d4cce885c812 100644
--- a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.0.ebuild
+++ b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.1.ebuild b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.1.ebuild
index a60614037207..d4cce885c812 100644
--- a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.1.ebuild
+++ b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.3.ebuild b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.3.ebuild
index 2be1e2253872..594bf38f8a7a 100644
--- a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.3.ebuild
+++ b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
index daf00d4de12f..c4c6f99172ca 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 IDEPEND="app-eselect/eselect-cdparanoia"
diff --git a/media-sound/cmus/cmus-2.12.0.ebuild b/media-sound/cmus/cmus-2.12.0.ebuild
index 91373d59f003..6ed16b4a73f6 100644
--- a/media-sound/cmus/cmus-2.12.0.ebuild
+++ b/media-sound/cmus/cmus-2.12.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index 37e6d0242dc9..1eca7013e4db 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/easytag/easytag-2.4.3-r6.ebuild b/media-sound/easytag/easytag-2.4.3-r6.ebuild
index eb8badb12f1b..f8538312ae5a 100644
--- a/media-sound/easytag/easytag-2.4.3-r6.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
 # Disable nautilus support until https://gitlab.gnome.org/GNOME/easytag/-/issues/78
 # is solved
diff --git a/media-sound/easytag/easytag-2.4.3-r7.ebuild b/media-sound/easytag/easytag-2.4.3-r7.ebuild
index 5e09baedf42e..105b8a66fe78 100644
--- a/media-sound/easytag/easytag-2.4.3-r7.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
 # Disable nautilus support until https://gitlab.gnome.org/GNOME/easytag/-/issues/78
 # is solved
diff --git a/media-sound/easytag/easytag-2.4.3-r8.ebuild b/media-sound/easytag/easytag-2.4.3-r8.ebuild
index d4834dcc8f4e..b11a18a7ed75 100644
--- a/media-sound/easytag/easytag-2.4.3-r8.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
 # Disable nautilus support until https://gitlab.gnome.org/GNOME/easytag/-/issues/78
 # is solved
diff --git a/media-sound/easytag/easytag-2.4.3-r9.ebuild b/media-sound/easytag/easytag-2.4.3-r9.ebuild
index 3486edac6d09..3696f27bc99b 100644
--- a/media-sound/easytag/easytag-2.4.3-r9.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
 # Disable nautilus support until https://gitlab.gnome.org/GNOME/easytag/-/issues/78
 # is solved
diff --git a/media-sound/ecasound/ecasound-2.9.3-r1.ebuild b/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
index 72fc6688b717..845c92e8d4fc 100644
--- a/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
 python ruby sndfile static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/lame/lame-3.100-r3.ebuild b/media-sound/lame/lame-3.100-r3.ebuild
index 7f8184ff1264..db0084f96cd9 100644
--- a/media-sound/lame/lame-3.100-r3.ebuild
+++ b/media-sound/lame/lame-3.100-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/madplay/madplay-0.15.2b-r2.ebuild b/media-sound/madplay/madplay-0.15.2b-r2.ebuild
index f4e11c2abdeb..e2bc058153d8 100644
--- a/media-sound/madplay/madplay-0.15.2b-r2.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="alsa nls"
 
 RDEPEND="
diff --git a/media-sound/mp3gain/mp3gain-1.6.2.ebuild b/media-sound/mp3gain/mp3gain-1.6.2.ebuild
index b1c3e4daacd2..9c50b93be26f 100644
--- a/media-sound/mp3gain/mp3gain-1.6.2.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="media-sound/mpg123"
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index ba016b27a12d..01ac0b7396d1 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="gtk"
 
 BDEPEND="
diff --git a/media-sound/mpg123-base/mpg123-base-1.32.10-r2.ebuild b/media-sound/mpg123-base/mpg123-base-1.32.10-r2.ebuild
index cfe14fbf3f02..4438e7b5b196 100644
--- a/media-sound/mpg123-base/mpg123-base-1.32.10-r2.ebuild
+++ b/media-sound/mpg123-base/mpg123-base-1.32.10-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123-base/mpg123-base-1.33.0.ebuild b/media-sound/mpg123-base/mpg123-base-1.33.0.ebuild
index 52b58d140a59..b3b31f6ebd4b 100644
--- a/media-sound/mpg123-base/mpg123-base-1.33.0.ebuild
+++ b/media-sound/mpg123-base/mpg123-base-1.33.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123-base/mpg123-base-1.33.1.ebuild b/media-sound/mpg123-base/mpg123-base-1.33.1.ebuild
index 52b58d140a59..b3b31f6ebd4b 100644
--- a/media-sound/mpg123-base/mpg123-base-1.33.1.ebuild
+++ b/media-sound/mpg123-base/mpg123-base-1.33.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123-base/mpg123-base-1.33.3.ebuild b/media-sound/mpg123-base/mpg123-base-1.33.3.ebuild
index 1d70a6be0ad9..83600aa76bb3 100644
--- a/media-sound/mpg123-base/mpg123-base-1.33.3.ebuild
+++ b/media-sound/mpg123-base/mpg123-base-1.33.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.32.3-r100.ebuild b/media-sound/mpg123/mpg123-1.32.3-r100.ebuild
index b629e943b7a3..e6edf7ad5479 100644
--- a/media-sound/mpg123/mpg123-1.32.3-r100.ebuild
+++ b/media-sound/mpg123/mpg123-1.32.3-r100.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="alsa coreaudio jack nas oss portaudio pulseaudio sdl"
 
 RDEPEND="
diff --git a/media-sound/mpg321/mpg321-0.3.2-r1.ebuild b/media-sound/mpg321/mpg321-0.3.2-r1.ebuild
index 1b94c8ad5cd2..ec289c609890 100644
--- a/media-sound/mpg321/mpg321-0.3.2-r1.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P/-/_}.orig.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa"
 
 RDEPEND="app-eselect/eselect-mpg123
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
index 796937175932..e4a5c816e9f3 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ~sparc x86"
 IUSE="vorbis"
 
 RDEPEND="
diff --git a/media-sound/musepack-tools/musepack-tools-495.ebuild b/media-sound/musepack-tools/musepack-tools-495.ebuild
index 6cd72896099f..019aea21747c 100644
--- a/media-sound/musepack-tools/musepack-tools-495.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-495.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=media-libs/libcuefile-477
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-17.0-r1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-17.0-r1.ebuild
index a1b1cb79412c..4c3a018e736d 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-17.0-r1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-17.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/qpaeq/qpaeq-17.0.ebuild b/media-sound/qpaeq/qpaeq-17.0.ebuild
index 5bfcea52ae61..cdfc641270a5 100644
--- a/media-sound/qpaeq/qpaeq-17.0.ebuild
+++ b/media-sound/qpaeq/qpaeq-17.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/media-sound/shntool/shntool-3.0.10-r3.ebuild b/media-sound/shntool/shntool-3.0.10-r3.ebuild
index 1d7030c10e8c..ac26f1e82586 100644
--- a/media-sound/shntool/shntool-3.0.10-r3.ebuild
+++ b/media-sound/shntool/shntool-3.0.10-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etree.org/shnutils/shntool/dist/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alac flac mac shorten sox wavpack"
 
 RDEPEND="
diff --git a/media-sound/snd/snd-25.6.ebuild b/media-sound/snd/snd-25.6.ebuild
index 4d014723f6a5..795c0a4b1149 100644
--- a/media-sound/snd/snd-25.6.ebuild
+++ b/media-sound/snd/snd-25.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccrma.stanford.edu/software/${PN}/${P}.tar.gz"
 
 LICENSE="Snd 0BSD BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="alsa doc fftw gmp gsl gui jack ladspa notcurses opengl oss portaudio pulseaudio readline ruby +s7"
 
 RDEPEND="
diff --git a/media-sound/sox/sox-14.4.2_p20210509-r3.ebuild b/media-sound/sox/sox-14.4.2_p20210509-r3.ebuild
index 5618d9e8c14b..d20e8c313112 100644
--- a/media-sound/sox/sox-14.4.2_p20210509-r3.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20210509-r3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa amr ao encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio twolame wavpack"
 
 RDEPEND="
diff --git a/media-sound/sox/sox-14.4.4.1.ebuild b/media-sound/sox/sox-14.4.4.1.ebuild
index cd2d601cb090..ac3cd99c003c 100644
--- a/media-sound/sox/sox-14.4.4.1.ebuild
+++ b/media-sound/sox/sox-14.4.4.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 # https://codeberg.org/sox_ng/sox_ng/wiki/Copyright
 LICENSE="GPL-2"
 SLOT="0/3" # SHLIB_VERSION in configure.ac
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="alsa amr ao encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio twolame wavpack"
 
 RDEPEND="
diff --git a/media-sound/sox/sox-14.6.0.4.ebuild b/media-sound/sox/sox-14.6.0.4.ebuild
index 7e97d1ed4ca8..57b50ea47de6 100644
--- a/media-sound/sox/sox-14.6.0.4.ebuild
+++ b/media-sound/sox/sox-14.6.0.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 # https://codeberg.org/sox_ng/sox_ng/wiki/Copyright
 LICENSE="GPL-2"
 SLOT="0/3" # SHLIB_VERSION in configure.ac
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="alsa amr ao encode +ffmpeg fftw flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio speexdsp twolame wavpack"
 
 RDEPEND="
diff --git a/media-sound/streamripper/streamripper-1.64.6-r1.ebuild b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
index 02b36ad8f8c5..edb6e6e9f91f 100644
--- a/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="vorbis"
 
 RDEPEND="
diff --git a/media-sound/twolame/twolame-0.4.0-r1.ebuild b/media-sound/twolame/twolame-0.4.0-r1.ebuild
index 7b8d8d14ab4d..0af6a89fbb4a 100644
--- a/media-sound/twolame/twolame-0.4.0-r1.ebuild
+++ b/media-sound/twolame/twolame-0.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+sndfile static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild
index 32d13bb5b405..8c4749a855a6 100644
--- a/media-sound/twolame/twolame-0.4.0.ebuild
+++ b/media-sound/twolame/twolame-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+sndfile static-libs test"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild
index 794da01ea516..8f6c19dfa24c 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.osuosl.org/pub/xiph/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="flac kate nls +ogg123 speex"
 
 RDEPEND="
diff --git a/media-sound/wavpack/wavpack-5.8.1.ebuild b/media-sound/wavpack/wavpack-5.8.1.ebuild
index 797134223ba3..8d9939d66be5 100644
--- a/media-sound/wavpack/wavpack-5.8.1.ebuild
+++ b/media-sound/wavpack/wavpack-5.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="test-full"
 
 RDEPEND=">=virtual/libiconv-0-r1"
diff --git a/media-tv/xmltv/xmltv-1.0.0-r1.ebuild b/media-tv/xmltv/xmltv-1.0.0-r1.ebuild
index 0b3291bb5163..1423cde25f34 100644
--- a/media-tv/xmltv/xmltv-1.0.0-r1.ebuild
+++ b/media-tv/xmltv/xmltv-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc x86 ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc x86"
 
 IUSE="ar ch-search eu-epgdata eu-xmltvse fi fi-sv fr
 huro is it it-dvb na-dd na-dtv na-tvmedia pt-vodafone tr
diff --git a/media-video/asfrecorder/asfrecorder-1.1-r2.ebuild b/media-video/asfrecorder/asfrecorder-1.1-r2.ebuild
index 16db1aa4ac68..3503743c7ce8 100644
--- a/media-video/asfrecorder/asfrecorder-1.1-r2.ebuild
+++ b/media-video/asfrecorder/asfrecorder-1.1-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-linux"
+KEYWORDS="~amd64 ppc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-video/dirac/dirac-1.0.2-r2.ebuild b/media-video/dirac/dirac-1.0.2-r2.ebuild
index 63d4cd623a67..9e854b4bb4ff 100644
--- a/media-video/dirac/dirac-1.0.2-r2.ebuild
+++ b/media-video/dirac/dirac-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86 ~x64-macos"
 IUSE="debug doc cpu_flags_x86_mmx"
 
 BDEPEND="
diff --git a/media-video/dvdbackup/dvdbackup-0.4.2-r2.ebuild b/media-video/dvdbackup/dvdbackup-0.4.2-r2.ebuild
index d8639c92894e..d5d533733562 100644
--- a/media-video/dvdbackup/dvdbackup-0.4.2-r2.ebuild
+++ b/media-video/dvdbackup/dvdbackup-0.4.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 RDEPEND=">=media-libs/libdvdread-4.2.0_pre:=
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
index 1662b2ea9b59..bf7ce1cc0ce1 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
index 3c6dc336e415..db50965ff30b 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-3.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
index 2452b4ea35e9..9632ac5f70a7 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-3.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild
index 6a4f1e7e4fc0..a836ea141d3d 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-3.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
index 1cd65445103c..7c015bc736e2 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-2.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild
index c0e499d39f0a..ec95180052fc 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-2.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild
index 1662b2ea9b59..bf7ce1cc0ce1 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild
index 3c6dc336e415..db50965ff30b 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-3.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg/ffmpeg-6.1.3.ebuild b/media-video/ffmpeg/ffmpeg-6.1.3.ebuild
index 2452b4ea35e9..9632ac5f70a7 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.3.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-3.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg/ffmpeg-6.1.4.ebuild b/media-video/ffmpeg/ffmpeg-6.1.4.ebuild
index 2452b4ea35e9..9632ac5f70a7 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.4.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-3.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg/ffmpeg-7.1.2.ebuild b/media-video/ffmpeg/ffmpeg-7.1.2.ebuild
index 1cd65445103c..7c015bc736e2 100644
--- a/media-video/ffmpeg/ffmpeg-7.1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.1.2.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-2.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg/ffmpeg-7.1.3.ebuild b/media-video/ffmpeg/ffmpeg-7.1.3.ebuild
index 1cd65445103c..7c015bc736e2 100644
--- a/media-video/ffmpeg/ffmpeg-7.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.1.3.ebuild
@@ -25,7 +25,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-2.tar.xz
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg/ffmpeg-8.0.1.ebuild b/media-video/ffmpeg/ffmpeg-8.0.1.ebuild
index 87b40cfb6b1b..005d85285f36 100644
--- a/media-video/ffmpeg/ffmpeg-8.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-8.0.1.ebuild
@@ -24,7 +24,7 @@ else
 		"}
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 22e302362810..99c188f36436 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -24,7 +24,7 @@ else
 		"}
 	"
 	S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
diff --git a/media-video/libva-utils/libva-utils-2.22.0.ebuild b/media-video/libva-utils/libva-utils-2.22.0.ebuild
index 4de57531c234..77f3f6fe6f1d 100644
--- a/media-video/libva-utils/libva-utils-2.22.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.22.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/libva-utils/libva-utils-2.23.0.ebuild b/media-video/libva-utils/libva-utils-2.23.0.ebuild
index 7e6bf7f339e7..7ffc55363615 100644
--- a/media-video/libva-utils/libva-utils-2.23.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.23.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 061e8bcaf812..fee456598b5c 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild
index 189c50e48af4..d1641c978299 100644
--- a/media-video/lsdvd/lsdvd-0.17.ebuild
+++ b/media-video/lsdvd/lsdvd-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="media-libs/libdvdread:0="
 DEPEND="${RDEPEND}"
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
index 4daca4c93b3d..2b0b2ac55522 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_PN}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
 
 RDEPEND="x11-libs/libX11
 	virtual/jpeg:0"
diff --git a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
index 6698c5ccf0c8..97f21fdc42d4 100644
--- a/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
+++ b/media-video/mpgtx/mpgtx-1.3.1-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://mpgtx.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-configure.patch
diff --git a/media-video/mpv/mpv-0.40.0-r3.ebuild b/media-video/mpv/mpv-0.40.0-r3.ebuild
index a1b1664e3e10..e10ef9c4d871 100644
--- a/media-video/mpv/mpv-0.40.0-r3.ebuild
+++ b/media-video/mpv/mpv-0.40.0-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 else
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Media player for the command line"
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index a9122bbc3cd6..a485d77598c2 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 else
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Media player for the command line"
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
index 998f5f08d40a..a814e4ae246d 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild
@@ -35,7 +35,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
 	SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-f1b83c1"
 fi
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 15a7257ff6b9..7f14630c918a 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -34,7 +34,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-f1b83c1"
 fi
diff --git a/media-video/smplayer/smplayer-25.6.0_p20250903-r1.ebuild b/media-video/smplayer/smplayer-25.6.0_p20250903-r1.ebuild
index 7dc739f94b03..d59bd1567b6b 100644
--- a/media-video/smplayer/smplayer-25.6.0_p20250903-r1.ebuild
+++ b/media-video/smplayer/smplayer-25.6.0_p20250903-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2+ BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="bidi debug"
 
 DEPEND="
diff --git a/net-analyzer/argus/argus-3.0.8.3-r2.ebuild b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild
index 35a18d0703ef..aed7e841ff06 100644
--- a/net-analyzer/argus/argus-3.0.8.3-r2.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_rc/.rc.}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug sasl tcpd"
 
 DEPEND="
diff --git a/net-analyzer/arping/arping-2.25.ebuild b/net-analyzer/arping/arping-2.25.ebuild
index a7658470da84..2498e16afa80 100644
--- a/net-analyzer/arping/arping-2.25.ebuild
+++ b/net-analyzer/arping/arping-2.25.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 	S="${WORKDIR}/${PN}-${P}"
 fi
diff --git a/net-analyzer/arping/arping-2.26.ebuild b/net-analyzer/arping/arping-2.26.ebuild
index d3a4a07979de..762032cde153 100644
--- a/net-analyzer/arping/arping-2.26.ebuild
+++ b/net-analyzer/arping/arping-2.26.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 	S="${WORKDIR}/${PN}-${P}"
 fi
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
index d3a4a07979de..762032cde153 100644
--- a/net-analyzer/arping/arping-9999.ebuild
+++ b/net-analyzer/arping/arping-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 	S="${WORKDIR}/${PN}-${P}"
 fi
diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
index 2af5134c2b2f..4477a4eddc2d 100644
--- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ppc64 ~s390 ~sparc x86"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/net-analyzer/fping/fping-5.1-r1.ebuild b/net-analyzer/fping/fping-5.1-r1.ebuild
index c195376928c6..08249530baa5 100644
--- a/net-analyzer/fping/fping-5.1-r1.ebuild
+++ b/net-analyzer/fping/fping-5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fping.org/dist/${P}.tar.gz"
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="suid"
 
 FILECAPS=( cap_net_raw+ep usr/sbin/fping )
diff --git a/net-analyzer/fping/fping-5.2.ebuild b/net-analyzer/fping/fping-5.2.ebuild
index e1f1552e730d..48430ee22144 100644
--- a/net-analyzer/fping/fping-5.2.ebuild
+++ b/net-analyzer/fping/fping-5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug suid"
 # There are some tests in ci/* but they don't seem to be for packaging
 # (they want to modify the live FS by e.g. copying to /tmp.)
diff --git a/net-analyzer/fping/fping-5.3.ebuild b/net-analyzer/fping/fping-5.3.ebuild
index e1f1552e730d..48430ee22144 100644
--- a/net-analyzer/fping/fping-5.3.ebuild
+++ b/net-analyzer/fping/fping-5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug suid"
 # There are some tests in ci/* but they don't seem to be for packaging
 # (they want to modify the live FS by e.g. copying to /tmp.)
diff --git a/net-analyzer/fping/fping-5.4.ebuild b/net-analyzer/fping/fping-5.4.ebuild
index 405e54c36db2..5652dab993f4 100644
--- a/net-analyzer/fping/fping-5.4.ebuild
+++ b/net-analyzer/fping/fping-5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug suid"
 # There are some tests in ci/* but they don't seem to be for packaging
 # (they want to modify the live FS by e.g. copying to /tmp.)
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild
index 2f6708e81c22..f860ce3ced6c 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild
index 8b2365f79d7b..ca30323837fb 100644
--- a/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild
+++ b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
 IUSE="berkdb ncurses syslog"
 
 RDEPEND="
diff --git a/net-analyzer/lft/lft-3.91-r1.ebuild b/net-analyzer/lft/lft-3.91-r1.ebuild
index 3fe7f8abe7e8..ad0132a7533e 100644
--- a/net-analyzer/lft/lft-3.91-r1.ebuild
+++ b/net-analyzer/lft/lft-3.91-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://pwhois.org/get/${P}.tar.gz"
 
 LICENSE="VOSTROM"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/mtr/mtr-0.95-r1.ebuild b/net-analyzer/mtr/mtr-0.95-r1.ebuild
index 04f441abf45f..d09ef1692203 100644
--- a/net-analyzer/mtr/mtr-0.95-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.95-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/mtr/mtr-0.96-r1.ebuild b/net-analyzer/mtr/mtr-0.96-r1.ebuild
index 49a959597cc1..067147b8dfc7 100644
--- a/net-analyzer/mtr/mtr-0.96-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.96-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index d2703a3252cb..1a69e6d8298f 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild
index 6991c5d77c21..10d636b7e109 100644
--- a/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild
+++ b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 DOCS=( AUTHORS CONTRIBUTING.md ChangeLog NEWS README.md )
 
diff --git a/net-analyzer/netcat/netcat-110.20180111-r2.ebuild b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild
index b49ddc080730..1d183f576804 100644
--- a/net-analyzer/netcat/netcat-110.20180111-r2.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/nc110"
 
 LICENSE="netcat"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="ipv6 static"
 
 PATCHES=(
diff --git a/net-analyzer/netdiscover/netdiscover-0.10.ebuild b/net-analyzer/netdiscover/netdiscover-0.10.ebuild
index 0471f737666e..5f3a82e37ad3 100644
--- a/net-analyzer/netdiscover/netdiscover-0.10.ebuild
+++ b/net-analyzer/netdiscover/netdiscover-0.10.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 DEPEND="
 	>=net-libs/libpcap-0.8.3-r1
diff --git a/net-analyzer/netdiscover/netdiscover-0.20.ebuild b/net-analyzer/netdiscover/netdiscover-0.20.ebuild
index b577c1928f9d..b207d52c0ff6 100644
--- a/net-analyzer/netdiscover/netdiscover-0.20.ebuild
+++ b/net-analyzer/netdiscover/netdiscover-0.20.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 DEPEND="
 	>=net-libs/libpcap-0.8.3-r1
diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild
index 79cc9f76fe34..fcab125a6285 100644
--- a/net-analyzer/netselect/netselect-0.4-r2.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="ipv6"
 
 PATCHES=(
diff --git a/net-analyzer/ngrep/ngrep-1.47-r2.ebuild b/net-analyzer/ngrep/ngrep-1.47-r2.ebuild
index 9a0c795e7d10..93e0d091afdb 100644
--- a/net-analyzer/ngrep/ngrep-1.47-r2.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/./_}"
 
 LICENSE="ngrep"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 ~sparc x86"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/ngrep/ngrep-1.47_p20241209.ebuild b/net-analyzer/ngrep/ngrep-1.47_p20241209.ebuild
index 642906dc6aa8..94a5b0547774 100644
--- a/net-analyzer/ngrep/ngrep-1.47_p20241209.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47_p20241209.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="ngrep"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 ~sparc x86"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild
index c5fef7c17092..51b29feced12 100644
--- a/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 # nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl]
 # https://bugs.gentoo.org/533900
diff --git a/net-analyzer/nikto/nikto-2.5.0.ebuild b/net-analyzer/nikto/nikto-2.5.0.ebuild
index e7bb2ea3e968..a0dc640beef7 100644
--- a/net-analyzer/nikto/nikto-2.5.0.ebuild
+++ b/net-analyzer/nikto/nikto-2.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sullo/nikto/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 # nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl]
 # https://bugs.gentoo.org/533900
diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
index 6d4403c685a0..29a91e799688 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"
diff --git a/net-analyzer/nmap/nmap-7.97.ebuild b/net-analyzer/nmap/nmap-7.97.ebuild
index dd8cd3ad5b96..467e38882499 100644
--- a/net-analyzer/nmap/nmap-7.97.ebuild
+++ b/net-analyzer/nmap/nmap-7.97.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.97-patches-1.tar.xz"
diff --git a/net-analyzer/nmap/nmap-7.98.ebuild b/net-analyzer/nmap/nmap-7.98.ebuild
index 3a04537df464..99f38927b896 100644
--- a/net-analyzer/nmap/nmap-7.98.ebuild
+++ b/net-analyzer/nmap/nmap-7.98.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.97-patches-2.tar.xz"
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 3a04537df464..99f38927b896 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.97-patches-2.tar.xz"
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
index 6de6a5851681..783bcaa6db69 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/netcat-openbsd-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	!net-analyzer/netcat
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild
index 3b971fe91184..75d8675c6a02 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/netcat-openbsd-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	!net-analyzer/netcat
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.234_p1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.234_p1.ebuild
index debffdb44a5c..37f86901e7ac 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.234_p1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.234_p1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/netcat-openbsd-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	!net-analyzer/netcat
diff --git a/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild b/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild
index 73cc796fb518..e7c8957feb58 100644
--- a/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild
+++ b/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="debug ipv6"
 
 RDEPEND="net-libs/libpcap"
diff --git a/net-analyzer/p0f/p0f-3.09_beta-r2.ebuild b/net-analyzer/p0f/p0f-3.09_beta-r2.ebuild
index 34debf98ee8b..b81400122b19 100644
--- a/net-analyzer/p0f/p0f-3.09_beta-r2.ebuild
+++ b/net-analyzer/p0f/p0f-3.09_beta-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="debug"
 
 RDEPEND="net-libs/libpcap"
diff --git a/net-analyzer/packit/packit-1.8.ebuild b/net-analyzer/packit/packit-1.8.ebuild
index 9afce60a1b14..f5476b45e11e 100644
--- a/net-analyzer/packit/packit-1.8.ebuild
+++ b/net-analyzer/packit/packit-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="net-libs/libnet:1.1
 	net-libs/libpcap"
diff --git a/net-analyzer/rrdtool/rrdtool-1.9.0-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.9.0-r2.ebuild
index e03b76ee3531..7c330e95dd2e 100644
--- a/net-analyzer/rrdtool/rrdtool-1.9.0-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.9.0-r2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/rrdtool-1.x-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-analyzer/rrdtool/rrdtool-1.9.0-r3.ebuild b/net-analyzer/rrdtool/rrdtool-1.9.0-r3.ebuild
index ecea3c80fbc7..c127b965f004 100644
--- a/net-analyzer/rrdtool/rrdtool-1.9.0-r3.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.9.0-r3.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/rrdtool-1.x-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test ${GENTOO_PERL_USESTRING}"
 
 RESTRICT="!test? ( test )"
diff --git a/net-analyzer/sec/sec-2.9.1.ebuild b/net-analyzer/sec/sec-2.9.1.ebuild
index 1ae2cc373c6e..5e6d50696360 100644
--- a/net-analyzer/sec/sec-2.9.1.ebuild
+++ b/net-analyzer/sec/sec-2.9.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND=">=dev-lang/perl-5.8.0
 	virtual/perl-JSON-PP"
diff --git a/net-analyzer/sec/sec-2.9.2.ebuild b/net-analyzer/sec/sec-2.9.2.ebuild
index f68ded17058c..cb7d06d91b22 100644
--- a/net-analyzer/sec/sec-2.9.2.ebuild
+++ b/net-analyzer/sec/sec-2.9.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-lang/perl-5.8.0
diff --git a/net-analyzer/sec/sec-2.9.3.ebuild b/net-analyzer/sec/sec-2.9.3.ebuild
index 0be42991c0a1..863ac1c4bc31 100644
--- a/net-analyzer/sec/sec-2.9.3.ebuild
+++ b/net-analyzer/sec/sec-2.9.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-lang/perl-5.8.0
diff --git a/net-analyzer/ssldump/ssldump-1.5.ebuild b/net-analyzer/ssldump/ssldump-1.5.ebuild
index 2ec79a046c4b..a247c33d32e6 100644
--- a/net-analyzer/ssldump/ssldump-1.5.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~sparc x86"
 
 RDEPEND="dev-libs/json-c:=
 	 dev-libs/openssl:=
diff --git a/net-analyzer/ssldump/ssldump-1.8.ebuild b/net-analyzer/ssldump/ssldump-1.8.ebuild
index 18bed392a075..f20cb707284d 100644
--- a/net-analyzer/ssldump/ssldump-1.8.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~sparc x86"
 
 RDEPEND="dev-libs/json-c:=
 	dev-libs/openssl:=
diff --git a/net-analyzer/ssldump/ssldump-1.9.ebuild b/net-analyzer/ssldump/ssldump-1.9.ebuild
index 18bed392a075..f20cb707284d 100644
--- a/net-analyzer/ssldump/ssldump-1.9.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~sparc x86"
 
 RDEPEND="dev-libs/json-c:=
 	dev-libs/openssl:=
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild
index 3c95aee8b701..e24a465253cb 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 249713bdec34..60b8ed3e0515 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
index 0fa56102639d..97efcb64e901 100644
--- a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-macos"
 IUSE="cairo test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
index 1b02ab772a1f..071e672a2c52 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/traceroute/traceroute-2.1.3.ebuild b/net-analyzer/traceroute/traceroute-2.1.3.ebuild
index ac28238c6efa..939853208759 100644
--- a/net-analyzer/traceroute/traceroute-2.1.3.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static"
 
 RDEPEND="!net-misc/iputils[traceroute6(-)]"
diff --git a/net-analyzer/traceroute/traceroute-2.1.5.ebuild b/net-analyzer/traceroute/traceroute-2.1.5.ebuild
index ac28238c6efa..939853208759 100644
--- a/net-analyzer/traceroute/traceroute-2.1.5.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static"
 
 RDEPEND="!net-misc/iputils[traceroute6(-)]"
diff --git a/net-analyzer/ttcp/ttcp-1.12-r3.ebuild b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild
index 97035e1a0cc7..b33de09f14cc 100644
--- a/net-analyzer/ttcp/ttcp-1.12-r3.ebuild
+++ b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 
 src_prepare() {
 	cp "${DISTDIR}"/${P}.c ${PN}.c || die
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r10.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r10.ebuild
index 0483075497a5..8fbe8d7fd0d3 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r10.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/net-dialup/minicom/minicom-2.10.ebuild b/net-dialup/minicom/minicom-2.10.ebuild
index dde951aee1a3..4fd4f61d5393 100644
--- a/net-dialup/minicom/minicom-2.10.ebuild
+++ b/net-dialup/minicom/minicom-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nls"
 
 DEPEND="sys-libs/ncurses:="
diff --git a/net-dns/bind-tools/bind-tools-9.18.0-r1.ebuild b/net-dns/bind-tools/bind-tools-9.18.0-r1.ebuild
index 339785debe83..e60054aaba73 100644
--- a/net-dns/bind-tools/bind-tools-9.18.0-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.18.0-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.isc.org/bind/ https://gitlab.isc.org/isc-projects/bind9"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+caps doc gssapi idn libedit readline xml"
 
 RDEPEND="=net-dns/bind-9.18*[caps?,doc?,gssapi?,idn?,xml?]"
diff --git a/net-dns/bind/bind-9.18.38.ebuild b/net-dns/bind/bind-9.18.38.ebuild
index 412ff181c373..0bc7a9f363e4 100644
--- a/net-dns/bind/bind-9.18.38.ebuild
+++ b/net-dns/bind/bind-9.18.38.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+caps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/bind/bind-9.18.39.ebuild b/net-dns/bind/bind-9.18.39.ebuild
index b05eb8eb4cfb..c2419bdebd5c 100644
--- a/net-dns/bind/bind-9.18.39.ebuild
+++ b/net-dns/bind/bind-9.18.39.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+caps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/bind/bind-9.18.42.ebuild b/net-dns/bind/bind-9.18.42.ebuild
index 730e083480b9..47d73b450a8b 100644
--- a/net-dns/bind/bind-9.18.42.ebuild
+++ b/net-dns/bind/bind-9.18.42.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+caps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/bind/bind-9.20.13.ebuild b/net-dns/bind/bind-9.20.13.ebuild
index 6b606d7d38ad..a51a04c864e5 100644
--- a/net-dns/bind/bind-9.20.13.ebuild
+++ b/net-dns/bind/bind-9.20.13.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs systemtap test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/bind/bind-9.20.16.ebuild b/net-dns/bind/bind-9.20.16.ebuild
index 6b606d7d38ad..a51a04c864e5 100644
--- a/net-dns/bind/bind-9.20.16.ebuild
+++ b/net-dns/bind/bind-9.20.16.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs systemtap test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/c-ares/c-ares-1.34.5.ebuild b/net-dns/c-ares/c-ares-1.34.5.ebuild
index 751abf29983c..776f44445b5c 100644
--- a/net-dns/c-ares/c-ares-1.34.5.ebuild
+++ b/net-dns/c-ares/c-ares-1.34.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="MIT ISC"
 # Subslot = SONAME of libcares.so.2
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/c-ares/c-ares-1.34.6.ebuild b/net-dns/c-ares/c-ares-1.34.6.ebuild
index ce7bd765ef4b..0acf02516358 100644
--- a/net-dns/c-ares/c-ares-1.34.6.ebuild
+++ b/net-dns/c-ares/c-ares-1.34.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="MIT ISC"
 # Subslot = SONAME of libcares.so.2
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/libidn/libidn-1.42.ebuild b/net-dns/libidn/libidn-1.42.ebuild
index 67709dcc8d1a..bc3217009664 100644
--- a/net-dns/libidn/libidn-1.42.ebuild
+++ b/net-dns/libidn/libidn-1.42.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-3 LGPL-3"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="emacs nls"
 
 DEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-dns/libidn/libidn-1.43.ebuild b/net-dns/libidn/libidn-1.43.ebuild
index 0cc6b38719a6..bfe2e4c130ef 100644
--- a/net-dns/libidn/libidn-1.43.ebuild
+++ b/net-dns/libidn/libidn-1.43.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-3 LGPL-3"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="emacs nls"
 
 DEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-dns/libidn2/libidn2-2.3.7.ebuild b/net-dns/libidn2/libidn2-2.3.7.ebuild
index e61d44cfce20..2d810483dc6a 100644
--- a/net-dns/libidn2/libidn2-2.3.7.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.7.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${P/a/}
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) GPL-3+ unicode"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/net-dns/libidn2/libidn2-2.3.8.ebuild b/net-dns/libidn2/libidn2-2.3.8.ebuild
index 050a95eaa8db..4c5a78797950 100644
--- a/net-dns/libidn2/libidn2-2.3.8.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.8.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${P/a/}
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) GPL-3+ unicode"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild
index 427fc00cfa1f..c2ffc03be37c 100644
--- a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+acl +ads +caps creds pam +python systemd"
 
 RDEPEND="
diff --git a/net-fs/cifs-utils/cifs-utils-7.3.ebuild b/net-fs/cifs-utils/cifs-utils-7.3.ebuild
index c46b5251d347..5af15e3d2163 100644
--- a/net-fs/cifs-utils/cifs-utils-7.3.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+acl +ads +caps creds pam +python systemd"
 
 RDEPEND="
diff --git a/net-fs/cifs-utils/cifs-utils-7.4.ebuild b/net-fs/cifs-utils/cifs-utils-7.4.ebuild
index 7beca89c84f2..9535ad03e6c8 100644
--- a/net-fs/cifs-utils/cifs-utils-7.4.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+acl +ads +caps creds pam +python systemd"
 
 RDEPEND="
diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r5.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r5.ebuild
index c291639f1821..06bf9879ed9d 100644
--- a/net-fs/curlftpfs/curlftpfs-0.9.2-r5.ebuild
+++ b/net-fs/curlftpfs/curlftpfs-0.9.2-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86"
 RESTRICT="test" # bug 258460
 
 RDEPEND="
diff --git a/net-fs/openafs/openafs-1.8.13-r1.ebuild b/net-fs/openafs/openafs-1.8.13-r1.ebuild
index bf20909094ac..4fb7e5e03049 100644
--- a/net-fs/openafs/openafs-1.8.13-r1.ebuild
+++ b/net-fs/openafs/openafs-1.8.13-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 -riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -riscv ~sparc x86"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write"
diff --git a/net-fs/openafs/openafs-1.8.13-r2.ebuild b/net-fs/openafs/openafs-1.8.13-r2.ebuild
index 1a2667ea60db..c18d2d5e3690 100644
--- a/net-fs/openafs/openafs-1.8.13-r2.ebuild
+++ b/net-fs/openafs/openafs-1.8.13-r2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 -riscv ~sparc ~x86"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write"
diff --git a/net-fs/openafs/openafs-1.8.13.1-r1.ebuild b/net-fs/openafs/openafs-1.8.13.1-r1.ebuild
index 97687454c3d9..87eec90789a7 100644
--- a/net-fs/openafs/openafs-1.8.13.1-r1.ebuild
+++ b/net-fs/openafs/openafs-1.8.13.1-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 -riscv ~sparc ~x86"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write"
diff --git a/net-fs/openafs/openafs-1.8.13.1.ebuild b/net-fs/openafs/openafs-1.8.13.1.ebuild
index 86e2aeed829f..4fb00de284d9 100644
--- a/net-fs/openafs/openafs-1.8.13.1.ebuild
+++ b/net-fs/openafs/openafs-1.8.13.1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 -riscv ~sparc ~x86"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write"
diff --git a/net-fs/openafs/openafs-1.8.13.2-r1.ebuild b/net-fs/openafs/openafs-1.8.13.2-r1.ebuild
index 99af92313867..c9acb3e8a75f 100644
--- a/net-fs/openafs/openafs-1.8.13.2-r1.ebuild
+++ b/net-fs/openafs/openafs-1.8.13.2-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 -riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -riscv ~sparc x86"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write"
diff --git a/net-fs/openafs/openafs-1.8.13.2.ebuild b/net-fs/openafs/openafs-1.8.13.2.ebuild
index 12abde88956f..8f6eccfd5f25 100644
--- a/net-fs/openafs/openafs-1.8.13.2.ebuild
+++ b/net-fs/openafs/openafs-1.8.13.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 -riscv ~sparc ~x86"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write"
diff --git a/net-fs/smbnetfs/smbnetfs-0.6.3.ebuild b/net-fs/smbnetfs/smbnetfs-0.6.3.ebuild
index 7cbf21c76ce2..c1cd612f59c6 100644
--- a/net-fs/smbnetfs/smbnetfs-0.6.3.ebuild
+++ b/net-fs/smbnetfs/smbnetfs-0.6.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/SMBNetFS-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="keyring"
 
 RDEPEND=">=sys-fs/fuse-2.3:0=
diff --git a/net-fs/sshfs/sshfs-3.7.3-r2.ebuild b/net-fs/sshfs/sshfs-3.7.3-r2.ebuild
index f4f59947776f..2ecde5840b8e 100644
--- a/net-fs/sshfs/sshfs-3.7.3-r2.ebuild
+++ b/net-fs/sshfs/sshfs-3.7.3-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
 SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 SLOT="0"
 
 DEPEND=">=sys-fs/fuse-3.1.0:3=
diff --git a/net-fs/sshfs/sshfs-3.7.5.ebuild b/net-fs/sshfs/sshfs-3.7.5.ebuild
index c41de3b64bd6..c66e47f48206 100644
--- a/net-fs/sshfs/sshfs-3.7.5.ebuild
+++ b/net-fs/sshfs/sshfs-3.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND=">=sys-fs/fuse-3.1.0:3=
 	>=dev-libs/glib-2.4.2"
diff --git a/net-ftp/lftp/lftp-4.9.3.ebuild b/net-ftp/lftp/lftp-4.9.3.ebuild
index 2fcb85de43a3..054c2a65aaf7 100644
--- a/net-ftp/lftp/lftp-4.9.3.ebuild
+++ b/net-ftp/lftp/lftp-4.9.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lavv17/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="convert-mozilla-cookies +gnutls idn nls socks5 +ssl verify-file"
 RESTRICT="test"
 
diff --git a/net-ftp/ncftp/ncftp-3.3.0.ebuild b/net-ftp/ncftp/ncftp-3.3.0.ebuild
index b78b7932cf61..1300f943232c 100644
--- a/net-ftp/ncftp/ncftp-3.3.0.ebuild
+++ b/net-ftp/ncftp/ncftp-3.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.ncftp.com/public_ftp/${PN}/${P}-src.tar.gz"
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="pch"
 
 DEPEND="
diff --git a/net-ftp/tnftp/tnftp-20210827.ebuild b/net-ftp/tnftp/tnftp-20210827.ebuild
index 10400c0e78e0..dd94cc6f8ee8 100644
--- a/net-ftp/tnftp/tnftp-20210827.ebuild
+++ b/net-ftp/tnftp/tnftp-20210827.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 
 SLOT="0"
 LICENSE="BSD-4 BSD ISC"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE="ipv6 socks5 ssl"
 REQUIRED_USE="socks5? ( !ipv6 )"
 
diff --git a/net-ftp/tnftp/tnftp-20230507.ebuild b/net-ftp/tnftp/tnftp-20230507.ebuild
index 06cebd9ea102..0c27e2a6dce3 100644
--- a/net-ftp/tnftp/tnftp-20230507.ebuild
+++ b/net-ftp/tnftp/tnftp-20230507.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 
 SLOT="0"
 LICENSE="BSD-4 BSD ISC"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE="ipv6 socks5 ssl"
 REQUIRED_USE="socks5? ( !ipv6 )"
 
diff --git a/net-im/pidgin/pidgin-2.14.14-r2.ebuild b/net-im/pidgin/pidgin-2.14.14-r2.ebuild
index d3635eecfa09..3475523d8c09 100644
--- a/net-im/pidgin/pidgin-2.14.14-r2.ebuild
+++ b/net-im/pidgin/pidgin-2.14.14-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gui idn
 meanwhile ncurses networkmanager nls perl prediction python sasl spell tcl
 test tk v4l +xscreensaver zephyr zeroconf"
diff --git a/net-im/pidgin/pidgin-2.14.14-r3.ebuild b/net-im/pidgin/pidgin-2.14.14-r3.ebuild
index 0f3446bfa43a..544baa4584b9 100644
--- a/net-im/pidgin/pidgin-2.14.14-r3.ebuild
+++ b/net-im/pidgin/pidgin-2.14.14-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gui idn
 meanwhile ncurses networkmanager nls perl prediction python sasl spell tcl
 test tk v4l +xscreensaver zephyr zeroconf ${GENTOO_PERL_USESTRING}"
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2-r2.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2-r2.ebuild
index 6ad41dc2ecdb..ee25f27b3cec 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.8.2-r2.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2_p4-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2_p4-r1.ebuild
index c8b2c0e8d2c1..934cdf75e7c6 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.8.2_p4-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2_p4-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P/_p*}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
index ea075d7d9c63..134d7df44ee7 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug networkmanager"
 
 RDEPEND="
diff --git a/net-irc/hexchat/hexchat-2.16.2-r1.ebuild b/net-irc/hexchat/hexchat-2.16.2-r1.ebuild
index b7846842ec52..8faf40c05108 100644
--- a/net-irc/hexchat/hexchat-2.16.2-r1.ebuild
+++ b/net-irc/hexchat/hexchat-2.16.2-r1.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
diff --git a/net-irc/hexchat/hexchat-2.16.2-r2.ebuild b/net-irc/hexchat/hexchat-2.16.2-r2.ebuild
index 5bbc6abdad6b..97cd15e1b043 100644
--- a/net-irc/hexchat/hexchat-2.16.2-r2.ebuild
+++ b/net-irc/hexchat/hexchat-2.16.2-r2.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
diff --git a/net-irc/ii/ii-1.9.ebuild b/net-irc/ii/ii-1.9.ebuild
index f1cd0011b17c..881c17b7ca92 100644
--- a/net-irc/ii/ii-1.9.ebuild
+++ b/net-irc/ii/ii-1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 src_prepare() {
 	default
diff --git a/net-irc/ii/ii-2.0.ebuild b/net-irc/ii/ii-2.0.ebuild
index ff668b9f4764..1fe3ce4f6b1f 100644
--- a/net-irc/ii/ii-2.0.ebuild
+++ b/net-irc/ii/ii-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/net-irc/ircii/ircii-20240111.ebuild b/net-irc/ircii/ircii-20240111.ebuild
index a29a3ca47696..592c2d9a0686 100644
--- a/net-irc/ircii/ircii-20240111.ebuild
+++ b/net-irc/ircii/ircii-20240111.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ircii.warped.com/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 DEPEND="dev-libs/openssl:0=
 	sys-libs/ncurses:0=
diff --git a/net-irc/ircii/ircii-20240918.ebuild b/net-irc/ircii/ircii-20240918.ebuild
index 6f96f9f0aaf4..c06357b87025 100644
--- a/net-irc/ircii/ircii-20240918.ebuild
+++ b/net-irc/ircii/ircii-20240918.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ircii.warped.com/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 DEPEND="dev-libs/openssl:0=
 	sys-libs/ncurses:0=
diff --git a/net-irc/irssi/irssi-1.4.5-r1.ebuild b/net-irc/irssi/irssi-1.4.5-r1.ebuild
index 52b3e54b8153..8ffc187060b9 100644
--- a/net-irc/irssi/irssi-1.4.5-r1.ebuild
+++ b/net-irc/irssi/irssi-1.4.5-r1.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${P/_/-}"
 
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-irc/irssi/irssi-1.4.5.ebuild b/net-irc/irssi/irssi-1.4.5.ebuild
index b7098498fe8d..270679b4225b 100644
--- a/net-irc/irssi/irssi-1.4.5.ebuild
+++ b/net-irc/irssi/irssi-1.4.5.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${P/_/-}"
 
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 52b3e54b8153..8ffc187060b9 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${P/_/-}"
 
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-irc/quassel/quassel-0.14.0-r8.ebuild b/net-irc/quassel/quassel-0.14.0-r8.ebuild
index cdad658f3f1f..933f7d492fde 100644
--- a/net-irc/quassel/quassel-0.14.0-r8.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != *9999* ]]; then
 		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	else
 		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-		KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+		KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 	fi
 	S="${WORKDIR}/${MY_P}"
 else
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index a23623eb04fa..db3c6b660806 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != *9999* ]]; then
 		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	else
 		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-		KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+		KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 	fi
 	S="${WORKDIR}/${MY_P}"
 else
diff --git a/net-irc/scrollz/scrollz-2.3.1.ebuild b/net-irc/scrollz/scrollz-2.3.1.ebuild
index f979c7aba0bd..c2ae92317cb9 100644
--- a/net-irc/scrollz/scrollz-2.3.1.ebuild
+++ b/net-irc/scrollz/scrollz-2.3.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="gmp gnutls ipv6 ssl"
 REQUIRED_USE="gnutls? ( ssl )"
 
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
index e570ee1dbd2d..383ee408ad42 100644
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
diff --git a/net-irc/unrealircd/unrealircd-6.0.4.2-r1.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.2-r1.ebuild
index a486d48b344c..58714a58ebd8 100644
--- a/net-irc/unrealircd/unrealircd-6.0.4.2-r1.ebuild
+++ b/net-irc/unrealircd/unrealircd-6.0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
 
 RDEPEND="
diff --git a/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
index dbccbe87ef94..b1c945669cff 100644
--- a/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
+++ b/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
 
 RDEPEND="
diff --git a/net-libs/canlock/canlock-3.3.0.ebuild b/net-libs/canlock/canlock-3.3.0.ebuild
index d8299aca68c6..a6dde68b416e 100644
--- a/net-libs/canlock/canlock-3.3.0.ebuild
+++ b/net-libs/canlock/canlock-3.3.0.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="BSD MIT"
 SLOT="0/3"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="header-parser +legacy"
 
 BDEPEND="
diff --git a/net-libs/canlock/canlock-3.3.1.ebuild b/net-libs/canlock/canlock-3.3.1.ebuild
index 577cdaa34016..449b8092589a 100644
--- a/net-libs/canlock/canlock-3.3.1.ebuild
+++ b/net-libs/canlock/canlock-3.3.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="BSD MIT"
 SLOT="0/3"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="header-parser +legacy"
 
 BDEPEND="
diff --git a/net-libs/cppzmq/cppzmq-4.10.0.ebuild b/net-libs/cppzmq/cppzmq-4.10.0.ebuild
index 21f81e94f89b..fb106d371a00 100644
--- a/net-libs/cppzmq/cppzmq-4.10.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/cppzmq/cppzmq-4.11.0.ebuild b/net-libs/cppzmq/cppzmq-4.11.0.ebuild
index 902b3eee1e30..de872f9b3246 100644
--- a/net-libs/cppzmq/cppzmq-4.11.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/cppzmq/cppzmq-4.9.0.ebuild b/net-libs/cppzmq/cppzmq-4.9.0.ebuild
index 52885b68923b..bc0e9e1928a9 100644
--- a/net-libs/cppzmq/cppzmq-4.9.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/farstream/farstream-0.2.9-r2.ebuild b/net-libs/farstream/farstream-0.2.9-r2.ebuild
index e64c5784c476..fc6238b4e6a3 100644
--- a/net-libs/farstream/farstream-0.2.9-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.9-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2/5" # .so version
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="+introspection test upnp valgrind"
 
 # Tests need shmsink from gst-plugins-bad, which isn't packaged
diff --git a/net-libs/glib-networking/glib-networking-2.80.1.ebuild b/net-libs/glib-networking/glib-networking-2.80.1.ebuild
index 71b9913983b1..837fe9234dcd 100644
--- a/net-libs/glib-networking/glib-networking-2.80.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.80.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/gnutls/gnutls-3.8.10-r1.ebuild b/net-libs/gnutls/gnutls-3.8.10-r1.ebuild
index cb86f7007bda..bded588c4145 100644
--- a/net-libs/gnutls/gnutls-3.8.10-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.10-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-3 LGPL-2.1+"
 # Subslot format:
 # <libgnutls.so number>.<libgnutlsxx.so number>
 SLOT="0/30.30"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/gnutls/gnutls-3.8.10.ebuild b/net-libs/gnutls/gnutls-3.8.10.ebuild
index ad551a7b6877..39988f5ddd92 100644
--- a/net-libs/gnutls/gnutls-3.8.10.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.10.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-3 LGPL-2.1+"
 # Subslot format:
 # <libgnutls.so number>.<libgnutlsxx.so number>
 SLOT="0/30.30"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/gnutls/gnutls-3.8.11.ebuild b/net-libs/gnutls/gnutls-3.8.11.ebuild
index a609e809535c..11efee9543ef 100644
--- a/net-libs/gnutls/gnutls-3.8.11.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.11.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-3 LGPL-2.1+"
 # Subslot format:
 # <libgnutls.so number>.<libgnutlsxx.so number>
 SLOT="0/30.30"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/gnutls/gnutls-3.8.9-r1.ebuild b/net-libs/gnutls/gnutls-3.8.9-r1.ebuild
index 32041f26d0aa..9a7f3cfc8049 100644
--- a/net-libs/gnutls/gnutls-3.8.9-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.9-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-3 LGPL-2.1+"
 # Subslot format:
 # <libgnutls.so number>.<libgnutlsxx.so number>
 SLOT="0/30.30"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/http-parser/http-parser-2.9.4-r2.ebuild b/net-libs/http-parser/http-parser-2.9.4-r2.ebuild
index 57587c9cab10..ceb1b3900391 100644
--- a/net-libs/http-parser/http-parser-2.9.4-r2.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.4-r2.ebuild
@@ -13,7 +13,7 @@ LICENSE="MIT"
 # 2.9.4 restored ABI compatibility with 2.9.0 but since we failed
 # to set subslot in 2.9.3, we want to provoke another rebuild
 SLOT="0/2.9.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-non-x86-test.patch
diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index 207bd34d10cd..f2dd434e4220 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libesmtp/libesmtp-1.1.0-r2.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r2.ebuild
index 90d54d620210..bd7e1ad2c50b 100644
--- a/net-libs/libesmtp/libesmtp-1.1.0-r2.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/libESMTP-${PV}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="LGPL-2.1+ GPL-2+"
diff --git a/net-libs/libetpan/libetpan-1.9.4-r2.ebuild b/net-libs/libetpan/libetpan-1.9.4-r2.ebuild
index 25e53e562106..499155a6177e 100644
--- a/net-libs/libetpan/libetpan-1.9.4-r2.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="berkdb gnutls ipv6 liblockfile lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 5bb73afb5e1e..ab579300eae2 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="doc ssl threads"
 
diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
index ce1a38804cc8..3ed98363e2ec 100644
--- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc ssl test threads"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
index 0a5363dffa81..f59e188727ca 100644
--- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Before giving keywords, please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild
index 2ddb63cbecfb..7887cc79ba79 100644
--- a/net-libs/liblockfile/liblockfile-1.17.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/libmnl/libmnl-1.0.5.ebuild b/net-libs/libmnl/libmnl-1.0.5.ebuild
index 8f0257b961ba..2954bb817ff7 100644
--- a/net-libs/libmnl/libmnl-1.0.5.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
 
 LICENSE="LGPL-2.1"
 SLOT="0/0.2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples"
 
 DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
diff --git a/net-libs/libnet/libnet-1.3-r1.ebuild b/net-libs/libnet/libnet-1.3-r1.ebuild
index 4e297294ed47..8965150a895f 100644
--- a/net-libs/libnet/libnet-1.3-r1.ebuild
+++ b/net-libs/libnet/libnet-1.3-r1.ebuild
@@ -29,7 +29,7 @@ fi
 
 LICENSE="BSD BSD-2"
 SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="${LIBNET_DOCS_USEFLAG} static-libs test"
 # Fails in sandbox, tries to access /proc/self/uid_map.
 RESTRICT="!test? ( test ) test"
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
index 20055fd5bf5e..c1962bb25472 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="examples"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
 
diff --git a/net-libs/libnice/libnice-0.1.22-r1.ebuild b/net-libs/libnice/libnice-0.1.22-r1.ebuild
index 0c053710336e..1eb8c64c97e2 100644
--- a/net-libs/libnice/libnice-0.1.22-r1.ebuild
+++ b/net-libs/libnice/libnice-0.1.22-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libnice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="+gnutls gtk-doc +introspection test +upnp"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libnsl/libnsl-0-r2.ebuild b/net-libs/libnsl/libnsl-0-r2.ebuild
index e63b3fc1aefb..850a4fa282c0 100644
--- a/net-libs/libnsl/libnsl-0-r2.ebuild
+++ b/net-libs/libnsl/libnsl-0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 
 DEPEND="elibc_glibc? ( <sys-libs/glibc-2.26 )"
 RDEPEND="${DEPEND}"
diff --git a/net-libs/libnsl/libnsl-1.3.0-r2.ebuild b/net-libs/libnsl/libnsl-1.3.0-r2.ebuild
index 2fea09a80481..ce4a21ade9f3 100644
--- a/net-libs/libnsl/libnsl-1.3.0-r2.ebuild
+++ b/net-libs/libnsl/libnsl-1.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+ BSD"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE="static-libs"
 
diff --git a/net-libs/libnsl/libnsl-2.0.1.ebuild b/net-libs/libnsl/libnsl-2.0.1.ebuild
index 8bff7966e863..56d0beb8dcea 100644
--- a/net-libs/libnsl/libnsl-2.0.1.ebuild
+++ b/net-libs/libnsl/libnsl-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
 # changes.
 SLOT="0/3"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]"
diff --git a/net-libs/libntlm/libntlm-1.8.ebuild b/net-libs/libntlm/libntlm-1.8.ebuild
index 7911155112bd..60b1b756aee0 100644
--- a/net-libs/libntlm/libntlm-1.8.ebuild
+++ b/net-libs/libntlm/libntlm-1.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/net-libs/libotr/libotr-4.1.1-r2.ebuild b/net-libs/libotr/libotr-4.1.1-r2.ebuild
index d085cba69fc8..bb34f7242ebf 100644
--- a/net-libs/libotr/libotr-4.1.1-r2.ebuild
+++ b/net-libs/libotr/libotr-4.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-libs/libgcrypt:=
diff --git a/net-libs/libpcap/libpcap-1.10.5.ebuild b/net-libs/libpcap/libpcap-1.10.5.ebuild
index 55a194b6a7fe..7e182278791f 100644
--- a/net-libs/libpcap/libpcap-1.10.5.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.5.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 # The project itself has COPYING with BSD, but the files used for
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index d64ed2829072..00c21ad17162 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 # The project itself has COPYING with BSD, but the files used for
diff --git a/net-libs/libproxy/libproxy-0.5.11.ebuild b/net-libs/libproxy/libproxy-0.5.11.ebuild
index 881ad4ab87f6..f47fd83aa63c 100644
--- a/net-libs/libproxy/libproxy-0.5.11.ebuild
+++ b/net-libs/libproxy/libproxy-0.5.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="duktape gnome gtk-doc +introspection test vala"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
diff --git a/net-libs/libproxy/libproxy-0.5.9.ebuild b/net-libs/libproxy/libproxy-0.5.9.ebuild
index 881ad4ab87f6..f47fd83aa63c 100644
--- a/net-libs/libproxy/libproxy-0.5.9.ebuild
+++ b/net-libs/libproxy/libproxy-0.5.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="duktape gnome gtk-doc +introspection test vala"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
diff --git a/net-libs/librsync/librsync-2.3.2.ebuild b/net-libs/librsync/librsync-2.3.2.ebuild
index 0309544cddc7..f62bd6043273 100644
--- a/net-libs/librsync/librsync-2.3.2.ebuild
+++ b/net-libs/librsync/librsync-2.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2.2"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/librsync/librsync-2.3.4.ebuild b/net-libs/librsync/librsync-2.3.4.ebuild
index 020bfa6de0aa..b2e32816dd55 100644
--- a/net-libs/librsync/librsync-2.3.4.ebuild
+++ b/net-libs/librsync/librsync-2.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2.2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libssh/libssh-0.11.2.ebuild b/net-libs/libssh/libssh-0.11.2.ebuild
index beea61ab3756..63f02653b90d 100644
--- a/net-libs/libssh/libssh-0.11.2.ebuild
+++ b/net-libs/libssh/libssh-0.11.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-0.11.3.ebuild b/net-libs/libssh/libssh-0.11.3.ebuild
index beea61ab3756..63f02653b90d 100644
--- a/net-libs/libssh/libssh-0.11.3.ebuild
+++ b/net-libs/libssh/libssh-0.11.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 056cafb06e3f..b5f6fee5879b 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh2/libssh2-1.11.1.ebuild b/net-libs/libssh2/libssh2-1.11.1.ebuild
index b7cdbaedad19..b882b2b1bec9 100644
--- a/net-libs/libssh2/libssh2-1.11.1.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libssh2.org/download/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libtirpc/libtirpc-1.3.6.ebuild b/net-libs/libtirpc/libtirpc-1.3.6.ebuild
index 49065287fcd2..257556a725be 100644
--- a/net-libs/libtirpc/libtirpc-1.3.6.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtirpc/libtirpc-1.3.7-r2.ebuild b/net-libs/libtirpc/libtirpc-1.3.7-r2.ebuild
index 056f0fc8b4e3..228c0b7dd321 100644
--- a/net-libs/libtirpc/libtirpc-1.3.7-r2.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtirpc/libtirpc-1.3.7.ebuild b/net-libs/libtirpc/libtirpc-1.3.7.ebuild
index becbc24a3b27..38833e27ebe2 100644
--- a/net-libs/libtirpc/libtirpc-1.3.7.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtorrent/libtorrent-0.15.7.ebuild b/net-libs/libtorrent/libtorrent-0.15.7.ebuild
index 8a61216681a8..9458439aa5aa 100644
--- a/net-libs/libtorrent/libtorrent-0.15.7.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.15.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/rakshasa/${PN}.git"
 else
 	SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-libs/libtorrent/libtorrent-0.16.5.ebuild b/net-libs/libtorrent/libtorrent-0.16.5.ebuild
index 4ef2de15509d..22a919b5cb7f 100644
--- a/net-libs/libtorrent/libtorrent-0.16.5.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.16.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/rakshasa/${PN}.git"
 else
 	SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-libs/libtorrent/libtorrent-9999.ebuild b/net-libs/libtorrent/libtorrent-9999.ebuild
index 4ef2de15509d..22a919b5cb7f 100644
--- a/net-libs/libtorrent/libtorrent-9999.ebuild
+++ b/net-libs/libtorrent/libtorrent-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/rakshasa/${PN}.git"
 else
 	SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-libs/libupnp/libupnp-1.14.24.ebuild b/net-libs/libupnp/libupnp-1.14.24.ebuild
index f745243931fd..7ed9d1cb36bc 100644
--- a/net-libs/libupnp/libupnp-1.14.24.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.24.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="blocking-tcp debug doc +reuseaddr samples +ssl static-libs"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/net-libs/libupnp/libupnp-1.14.25.ebuild b/net-libs/libupnp/libupnp-1.14.25.ebuild
index 0f37b21a3435..031b5a5d3ac9 100644
--- a/net-libs/libupnp/libupnp-1.14.25.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.25.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="blocking-tcp debug doc +reuseaddr samples +ssl static-libs"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/net-libs/libvncserver/libvncserver-0.9.15-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.15-r1.ebuild
index 2e6945cfcb84..109fa3b835dd 100644
--- a/net-libs/libvncserver/libvncserver-0.9.15-r1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.15-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+24bpp +filetransfer gnutls ipv6 +jpeg lzo +png sasl ssl systemd test +threads +zlib"
 RESTRICT="!test? ( test )"
 # https://bugs.gentoo.org/690202
diff --git a/net-libs/neon/neon-0.34.0.ebuild b/net-libs/neon/neon-0.34.0.ebuild
index 576dff64e09d..1d9b2b29f14f 100644
--- a/net-libs/neon/neon-0.34.0.ebuild
+++ b/net-libs/neon/neon-0.34.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+" # manpages+tests, core project
 SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+expat gnutls kerberos libproxy nls pkcs11 ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/nghttp2/nghttp2-1.65.0-r2.ebuild b/net-libs/nghttp2/nghttp2-1.65.0-r2.ebuild
index a6616fa5224d..f9844b40b007 100644
--- a/net-libs/nghttp2/nghttp2-1.65.0-r2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.65.0-r2.ebuild
@@ -17,7 +17,7 @@ else
 	inherit autotools
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/nghttp2/nghttp2-1.66.0.ebuild b/net-libs/nghttp2/nghttp2-1.66.0.ebuild
index d65fff70ee35..a2c5561ec627 100644
--- a/net-libs/nghttp2/nghttp2-1.66.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.66.0.ebuild
@@ -17,7 +17,7 @@ else
 	inherit autotools
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/nghttp2/nghttp2-1.67.1.ebuild b/net-libs/nghttp2/nghttp2-1.67.1.ebuild
index d65fff70ee35..a2c5561ec627 100644
--- a/net-libs/nghttp2/nghttp2-1.67.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.67.1.ebuild
@@ -17,7 +17,7 @@ else
 	inherit autotools
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index d65fff70ee35..a2c5561ec627 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -17,7 +17,7 @@ else
 	inherit autotools
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/nodejs/nodejs-20.18.2.ebuild b/net-libs/nodejs/nodejs-20.18.2.ebuild
index 4d21e2fd5850..fdb7876cf109 100644
--- a/net-libs/nodejs/nodejs-20.18.2.ebuild
+++ b/net-libs/nodejs/nodejs-20.18.2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-20.19.2.ebuild b/net-libs/nodejs/nodejs-20.19.2.ebuild
index b9ec203a7fdc..8f0659d05b91 100644
--- a/net-libs/nodejs/nodejs-20.19.2.ebuild
+++ b/net-libs/nodejs/nodejs-20.19.2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-20.19.5.ebuild b/net-libs/nodejs/nodejs-20.19.5.ebuild
index 0d597c084899..d54ee90242ae 100644
--- a/net-libs/nodejs/nodejs-20.19.5.ebuild
+++ b/net-libs/nodejs/nodejs-20.19.5.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-20.19.6.ebuild b/net-libs/nodejs/nodejs-20.19.6.ebuild
index 0d597c084899..d54ee90242ae 100644
--- a/net-libs/nodejs/nodejs-20.19.6.ebuild
+++ b/net-libs/nodejs/nodejs-20.19.6.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.13.1.ebuild b/net-libs/nodejs/nodejs-22.13.1.ebuild
index bedbd219bb04..d62e56ebc91f 100644
--- a/net-libs/nodejs/nodejs-22.13.1.ebuild
+++ b/net-libs/nodejs/nodejs-22.13.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.16.0.ebuild b/net-libs/nodejs/nodejs-22.16.0.ebuild
index d5b2e6b0f979..f9e10514dbbf 100644
--- a/net-libs/nodejs/nodejs-22.16.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.16.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.19.0.ebuild b/net-libs/nodejs/nodejs-22.19.0.ebuild
index d5b2e6b0f979..f9e10514dbbf 100644
--- a/net-libs/nodejs/nodejs-22.19.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.19.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.20.0.ebuild b/net-libs/nodejs/nodejs-22.20.0.ebuild
index d5b2e6b0f979..f9e10514dbbf 100644
--- a/net-libs/nodejs/nodejs-22.20.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.20.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.21.1.ebuild b/net-libs/nodejs/nodejs-22.21.1.ebuild
index 6153f44bfa7c..f4e9881c0ca0 100644
--- a/net-libs/nodejs/nodejs-22.21.1.ebuild
+++ b/net-libs/nodejs/nodejs-22.21.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-24.1.0.ebuild b/net-libs/nodejs/nodejs-24.1.0.ebuild
index 0814231cfbed..d5c013d8fc0b 100644
--- a/net-libs/nodejs/nodejs-24.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-24.1.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-24.11.1.ebuild b/net-libs/nodejs/nodejs-24.11.1.ebuild
index 03d45119624e..8629604bb294 100644
--- a/net-libs/nodejs/nodejs-24.11.1.ebuild
+++ b/net-libs/nodejs/nodejs-24.11.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-24.2.0.ebuild b/net-libs/nodejs/nodejs-24.2.0.ebuild
index 3a370cd5eaec..2a77ea9d8ead 100644
--- a/net-libs/nodejs/nodejs-24.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-24.2.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-24.7.0.ebuild b/net-libs/nodejs/nodejs-24.7.0.ebuild
index 3a370cd5eaec..2a77ea9d8ead 100644
--- a/net-libs/nodejs/nodejs-24.7.0.ebuild
+++ b/net-libs/nodejs/nodejs-24.7.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-24.9.0.ebuild b/net-libs/nodejs/nodejs-24.9.0.ebuild
index 5e56aedb414a..ff692c967cd1 100644
--- a/net-libs/nodejs/nodejs-24.9.0.ebuild
+++ b/net-libs/nodejs/nodejs-24.9.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 358e2e2fd94b..4b625339020e 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/pacparser/pacparser-1.4.3.ebuild b/net-libs/pacparser/pacparser-1.4.3.ebuild
index 04a35093486b..1417af507c1c 100644
--- a/net-libs/pacparser/pacparser-1.4.3.ebuild
+++ b/net-libs/pacparser/pacparser-1.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc python"
 
 DEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/net-libs/pacparser/pacparser-1.4.5.ebuild b/net-libs/pacparser/pacparser-1.4.5.ebuild
index e86cfa006330..66e32a5ef853 100644
--- a/net-libs/pacparser/pacparser-1.4.5.ebuild
+++ b/net-libs/pacparser/pacparser-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc python"
 
 DEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/net-libs/pacparser/pacparser-1.4.6.ebuild b/net-libs/pacparser/pacparser-1.4.6.ebuild
index 4b86062b1690..40ea8d929a88 100644
--- a/net-libs/pacparser/pacparser-1.4.6.ebuild
+++ b/net-libs/pacparser/pacparser-1.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc python"
 
 DEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
index ee36c15e61e0..00a6777a9ddc 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 LICENSE="LGPL-2.1+ BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
 RDEPEND="${DEPEND}"
diff --git a/net-libs/serf/serf-1.3.10.ebuild b/net-libs/serf/serf-1.3.10.ebuild
index 40ff078f50e6..1d89f597d3fb 100644
--- a/net-libs/serf/serf-1.3.10.ebuild
+++ b/net-libs/serf/serf-1.3.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="kerberos"
 # Many test failures.
 RESTRICT="test"
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.2-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.2-r1.ebuild
index 9828e76b616e..347a2db6ddb5 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.2-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 # Broken for a long time and upstream doesn't care
diff --git a/net-libs/xrootd/xrootd-5.8.2.ebuild b/net-libs/xrootd/xrootd-5.8.2.ebuild
index f50325fdfb0c..ecbbfb8f2e09 100644
--- a/net-libs/xrootd/xrootd-5.8.2.ebuild
+++ b/net-libs/xrootd/xrootd-5.8.2.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xrootd/xrootd.git"
 else
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://xrootd.web.cern.ch/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/net-libs/xrootd/xrootd-5.8.3.ebuild b/net-libs/xrootd/xrootd-5.8.3.ebuild
index cb5019f3ff3b..2722e60ce5f6 100644
--- a/net-libs/xrootd/xrootd-5.8.3.ebuild
+++ b/net-libs/xrootd/xrootd-5.8.3.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xrootd/xrootd.git"
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://xrootd.web.cern.ch/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/net-libs/xrootd/xrootd-5.8.4.ebuild b/net-libs/xrootd/xrootd-5.8.4.ebuild
index cbdeb91f451d..0d23bb30eb81 100644
--- a/net-libs/xrootd/xrootd-5.8.4.ebuild
+++ b/net-libs/xrootd/xrootd-5.8.4.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xrootd/xrootd.git"
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://xrootd.web.cern.ch/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/net-libs/xrootd/xrootd-5.9.1.ebuild b/net-libs/xrootd/xrootd-5.9.1.ebuild
index e5b4958a01b0..9fb430c5f7d0 100644
--- a/net-libs/xrootd/xrootd-5.9.1.ebuild
+++ b/net-libs/xrootd/xrootd-5.9.1.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xrootd/xrootd.git"
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://xrootd.web.cern.ch/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/net-libs/xrootd/xrootd-9999.ebuild b/net-libs/xrootd/xrootd-9999.ebuild
index e5b4958a01b0..9fb430c5f7d0 100644
--- a/net-libs/xrootd/xrootd-9999.ebuild
+++ b/net-libs/xrootd/xrootd-9999.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xrootd/xrootd.git"
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://xrootd.web.cern.ch/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/net-libs/zeromq/zeromq-4.3.5-r1.ebuild b/net-libs/zeromq/zeromq-4.3.5-r1.ebuild
index 0d116258d3e2..e8d994aec85f 100644
--- a/net-libs/zeromq/zeromq-4.3.5-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="doc drafts +libbsd +sodium static-libs test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/net-mail/fetchmail/fetchmail-6.5.6.ebuild b/net-mail/fetchmail/fetchmail-6.5.6.ebuild
index 527ef83468b8..317c9e7780e8 100644
--- a/net-mail/fetchmail/fetchmail-6.5.6.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.5.6.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${P/_/.}
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="ssl nls kerberos tk selinux socks"
 
 RDEPEND="acct-user/fetchmail
diff --git a/net-mail/fetchmail/fetchmail-6.6.2.ebuild b/net-mail/fetchmail/fetchmail-6.6.2.ebuild
index 9c021cf591c9..881579d8580e 100644
--- a/net-mail/fetchmail/fetchmail-6.6.2.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.6.2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${P/_/.}
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="ssl nls kerberos tk selinux socks"
 
 RDEPEND="acct-user/fetchmail
diff --git a/net-mail/mailbase/mailbase-1.8.1.ebuild b/net-mail/mailbase/mailbase-1.8.1.ebuild
index 437af2acb3e3..dbf59c59fe94 100644
--- a/net-mail/mailbase/mailbase-1.8.1.ebuild
+++ b/net-mail/mailbase/mailbase-1.8.1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-mail/mlmmj/mlmmj-1.5.2.ebuild b/net-mail/mlmmj/mlmmj-1.5.2.ebuild
index fcebd6216d30..d38e244ac23f 100644
--- a/net-mail/mlmmj/mlmmj-1.5.2.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/RELEASE_${PV}/${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-mail/mlmmj/mlmmj-1.6.0.ebuild b/net-mail/mlmmj/mlmmj-1.6.0.ebuild
index 6ae99a181681..c0ff68bf6f23 100644
--- a/net-mail/mlmmj/mlmmj-1.6.0.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/RELEASE_${PV}/${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/aget/aget-0.4.1-r2.ebuild b/net-misc/aget/aget-0.4.1-r2.ebuild
index 98c7c8837fa9..323050edb9b6 100644
--- a/net-misc/aget/aget-0.4.1-r2.ebuild
+++ b/net-misc/aget/aget-0.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.enderunix.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-overflow.patch
diff --git a/net-misc/aria2/aria2-1.37.0.ebuild b/net-misc/aria2/aria2-1.37.0.ebuild
index b611fc46188e..f5254849dd6c 100644
--- a/net-misc/aria2/aria2-1.37.0.ebuild
+++ b/net-misc/aria2/aria2-1.37.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/"
 SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 SLOT="0"
 IUSE="
 	adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle
diff --git a/net-misc/autossh/autossh-1.4g-r2.ebuild b/net-misc/autossh/autossh-1.4g-r2.ebuild
index f35e6439a315..d91767ec645a 100644
--- a/net-misc/autossh/autossh-1.4g-r2.ebuild
+++ b/net-misc/autossh/autossh-1.4g-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.harding.motd.ca/autossh/"
 SRC_URI="https://www.harding.motd.ca/${PN}/${P}.tgz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
 SLOT="0"
 
 DEPEND="dev-libs/libbsd"
diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild
index f022a7cb6dbb..0543cc79767e 100644
--- a/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild
+++ b/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://utenti.gufi.org/~drizzt/codes/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.43.2.1-musl-cdefs.patch"
diff --git a/net-misc/clusterssh/clusterssh-4.16.ebuild b/net-misc/clusterssh/clusterssh-4.16.ebuild
index 5cde5cedf0cd..57e39968c123 100644
--- a/net-misc/clusterssh/clusterssh-4.16.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.16.ebuild
@@ -17,7 +17,7 @@ else
 	DIST_AUTHOR="DUNCS"
 	DIST_NAME="App-ClusterSSH"
 
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 DIST_TEST="do parallel"
diff --git a/net-misc/clusterssh/clusterssh-4.18.ebuild b/net-misc/clusterssh/clusterssh-4.18.ebuild
index 37d2a9210318..1561bbf92306 100644
--- a/net-misc/clusterssh/clusterssh-4.18.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.18.ebuild
@@ -17,7 +17,7 @@ else
 	DIST_AUTHOR="DUNCS"
 	DIST_NAME="App-ClusterSSH"
 
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86"
 fi
 
 DIST_TEST="do parallel"
diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild
index 7627c4d16310..404f71ddde08 100644
--- a/net-misc/clusterssh/clusterssh-9999.ebuild
+++ b/net-misc/clusterssh/clusterssh-9999.ebuild
@@ -17,7 +17,7 @@ else
 	DIST_AUTHOR="DUNCS"
 	DIST_NAME="App-ClusterSSH"
 
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DIST_TEST="do parallel"
diff --git a/net-misc/curl/curl-8.15.0.ebuild b/net-misc/curl/curl-8.15.0.ebuild
index b2b139cdbae7..4715d49e9e95 100644
--- a/net-misc/curl/curl-8.15.0.ebuild
+++ b/net-misc/curl/curl-8.15.0.ebuild
@@ -22,7 +22,7 @@ else
 		S="${WORKDIR}/${P//_/-}"
 	else
 		CURL_URI="https://curl.se/download/"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 	SRC_URI="
 		${CURL_URI}${P//_/-}.tar.xz
diff --git a/net-misc/curl/curl-8.16.0-r1.ebuild b/net-misc/curl/curl-8.16.0-r1.ebuild
index 21b68b597107..08ff73b2477d 100644
--- a/net-misc/curl/curl-8.16.0-r1.ebuild
+++ b/net-misc/curl/curl-8.16.0-r1.ebuild
@@ -22,7 +22,7 @@ else
 		S="${WORKDIR}/${P//_/-}"
 	else
 		CURL_URI="https://curl.se/download/"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 	SRC_URI="
 		${CURL_URI}${P//_/-}.tar.xz
diff --git a/net-misc/curl/curl-8.17.0-r1.ebuild b/net-misc/curl/curl-8.17.0-r1.ebuild
index 1f64032dd191..b3c358322107 100644
--- a/net-misc/curl/curl-8.17.0-r1.ebuild
+++ b/net-misc/curl/curl-8.17.0-r1.ebuild
@@ -22,7 +22,7 @@ else
 		S="${WORKDIR}/${P//_/-}"
 	else
 		CURL_URI="https://curl.se/download/"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 	SRC_URI="
 		${CURL_URI}${P//_/-}.tar.xz
diff --git a/net-misc/curl/curl-8.17.0.ebuild b/net-misc/curl/curl-8.17.0.ebuild
index cba43b0468ff..1b2ccf8c874c 100644
--- a/net-misc/curl/curl-8.17.0.ebuild
+++ b/net-misc/curl/curl-8.17.0.ebuild
@@ -22,7 +22,7 @@ else
 		S="${WORKDIR}/${P//_/-}"
 	else
 		CURL_URI="https://curl.se/download/"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 	SRC_URI="
 		${CURL_URI}${P//_/-}.tar.xz
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index cba43b0468ff..1b2ccf8c874c 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -22,7 +22,7 @@ else
 		S="${WORKDIR}/${P//_/-}"
 	else
 		CURL_URI="https://curl.se/download/"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 	SRC_URI="
 		${CURL_URI}${P//_/-}.tar.xz
diff --git a/net-misc/dhcpcd/dhcpcd-10.2.2-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.2-r1.ebuild
index 02523a8f1e4c..7ad939c59e7b 100644
--- a/net-misc/dhcpcd/dhcpcd-10.2.2-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.2.2-r1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
index 1da2dfdddefb..785e551f1b05 100644
--- a/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dhcpcd/dhcpcd-10.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.3.ebuild
index 1da2dfdddefb..785e551f1b05 100644
--- a/net-misc/dhcpcd/dhcpcd-10.2.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.2.3.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dhcpcd/dhcpcd-10.2.4.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.4.ebuild
index c6cd43db3fc9..acda1dcf0554 100644
--- a/net-misc/dhcpcd/dhcpcd-10.2.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.2.4.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dhcpcd/dhcpcd-10.3.0.ebuild b/net-misc/dhcpcd/dhcpcd-10.3.0.ebuild
index 64b80d6c62fa..a4e0fffd0a6a 100644
--- a/net-misc/dhcpcd/dhcpcd-10.3.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.3.0.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 64b80d6c62fa..a4e0fffd0a6a 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dropbear/dropbear-2025.87.ebuild b/net-misc/dropbear/dropbear-2025.87.ebuild
index 9381f9200875..b1f3cb90a0c3 100644
--- a/net-misc/dropbear/dropbear-2025.87.ebuild
+++ b/net-misc/dropbear/dropbear-2025.87.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="bsdpty legacy-ciphers minimal multicall pam +shadow static +syslog test +test-async zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/dropbear/dropbear-2025.88-r1.ebuild b/net-misc/dropbear/dropbear-2025.88-r1.ebuild
index 498278dd3611..079d3b856ba8 100644
--- a/net-misc/dropbear/dropbear-2025.88-r1.ebuild
+++ b/net-misc/dropbear/dropbear-2025.88-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="bsdpty legacy-ciphers minimal multicall pam +shadow static +syslog test +test-async zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/dropbear/dropbear-2025.89.ebuild b/net-misc/dropbear/dropbear-2025.89.ebuild
index 7301e735b317..c2ccda9d5649 100644
--- a/net-misc/dropbear/dropbear-2025.89.ebuild
+++ b/net-misc/dropbear/dropbear-2025.89.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="bsdpty legacy-ciphers minimal multicall pam +shadow static +syslog test +test-async zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/gsasl/gsasl-2.2.1.ebuild b/net-misc/gsasl/gsasl-2.2.1.ebuild
index affbad948fca..b6242e3e1aad 100644
--- a/net-misc/gsasl/gsasl-2.2.1.ebuild
+++ b/net-misc/gsasl/gsasl-2.2.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
 REQUIRED_USE="|| ( client server )"
 
diff --git a/net-misc/gsasl/gsasl-2.2.2-r1.ebuild b/net-misc/gsasl/gsasl-2.2.2-r1.ebuild
index d3457b5138b1..a86bdec0847f 100644
--- a/net-misc/gsasl/gsasl-2.2.2-r1.ebuild
+++ b/net-misc/gsasl/gsasl-2.2.2-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
 REQUIRED_USE="|| ( client server )"
 
diff --git a/net-misc/gsasl/gsasl-2.2.2.ebuild b/net-misc/gsasl/gsasl-2.2.2.ebuild
index a555aac751c6..bf1d7aa9a52f 100644
--- a/net-misc/gsasl/gsasl-2.2.2.ebuild
+++ b/net-misc/gsasl/gsasl-2.2.2.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
 REQUIRED_USE="|| ( client server )"
 
diff --git a/net-misc/htpdate/htpdate-2.0.0.ebuild b/net-misc/htpdate/htpdate-2.0.0.ebuild
index 84d70494292f..f40a9f7721df 100644
--- a/net-misc/htpdate/htpdate-2.0.0.ebuild
+++ b/net-misc/htpdate/htpdate-2.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/twekkel/htpdate"
 else
 	SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/net-misc/htpdate/htpdate-9999.ebuild b/net-misc/htpdate/htpdate-9999.ebuild
index 76a9b1d3a834..b702d817e8f7 100644
--- a/net-misc/htpdate/htpdate-9999.ebuild
+++ b/net-misc/htpdate/htpdate-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/twekkel/htpdate"
 else
 	SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/net-misc/httptype/httptype-1.3.9-r1.ebuild b/net-misc/httptype/httptype-1.3.9-r1.ebuild
index 01c030b8e90e..0a5778b7b74f 100644
--- a/net-misc/httptype/httptype-1.3.9-r1.ebuild
+++ b/net-misc/httptype/httptype-1.3.9-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
index 9209b6e6aefe..dd9dc3d097a8 100644
--- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-0.5
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=">=dev-lang/perl-5.6.0"
 
diff --git a/net-misc/ipcalc/ipcalc-0.51.ebuild b/net-misc/ipcalc/ipcalc-0.51.ebuild
index 63e720ca341d..7933488610e3 100644
--- a/net-misc/ipcalc/ipcalc-0.51.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.51.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kjokjo/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-lang/perl-5.6.0"
 
diff --git a/net-misc/iperf/iperf-2.2.1.ebuild b/net-misc/iperf/iperf-2.2.1.ebuild
index b6ac5ad5efda..0b067a699f6a 100644
--- a/net-misc/iperf/iperf-2.2.1.ebuild
+++ b/net-misc/iperf/iperf-2.2.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://downloads.sourceforge.net/iperf2/${P}.tar.gz"
 
-	KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="HPND"
diff --git a/net-misc/iperf/iperf-2.9999.ebuild b/net-misc/iperf/iperf-2.9999.ebuild
index 288959f5e5e4..ca7f03ba3e51 100644
--- a/net-misc/iperf/iperf-2.9999.ebuild
+++ b/net-misc/iperf/iperf-2.9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://downloads.sourceforge.net/iperf2/${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="HPND"
diff --git a/net-misc/iperf/iperf-3.19.1-r1.ebuild b/net-misc/iperf/iperf-3.19.1-r1.ebuild
index 79c547ac67d2..541141e14e15 100644
--- a/net-misc/iperf/iperf-3.19.1-r1.ebuild
+++ b/net-misc/iperf/iperf-3.19.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/esnet/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="sctp"
 
 DEPEND="
diff --git a/net-misc/iperf/iperf-3.19.1.ebuild b/net-misc/iperf/iperf-3.19.1.ebuild
index a741ac3581e3..8afde2f6d15b 100644
--- a/net-misc/iperf/iperf-3.19.1.ebuild
+++ b/net-misc/iperf/iperf-3.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/esnet/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="sctp"
 
 DEPEND="
diff --git a/net-misc/iperf/iperf-3.20.ebuild b/net-misc/iperf/iperf-3.20.ebuild
index 934c804d0b25..8f105795bdc3 100644
--- a/net-misc/iperf/iperf-3.20.ebuild
+++ b/net-misc/iperf/iperf-3.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/esnet/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="sctp"
 
 DEPEND="
diff --git a/net-misc/iputils/iputils-20211215.ebuild b/net-misc/iputils/iputils-20211215.ebuild
index 8cc4280e57b4..6a7e696d6382 100644
--- a/net-misc/iputils/iputils-20211215.ebuild
+++ b/net-misc/iputils/iputils-20211215.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-20221126-r1.ebuild b/net-misc/iputils/iputils-20221126-r1.ebuild
index 62e6dc899fa9..a27303bc5969 100644
--- a/net-misc/iputils/iputils-20221126-r1.ebuild
+++ b/net-misc/iputils/iputils-20221126-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-20240117.ebuild b/net-misc/iputils/iputils-20240117.ebuild
index 875c15914d34..45d2fb3f3571 100644
--- a/net-misc/iputils/iputils-20240117.ebuild
+++ b/net-misc/iputils/iputils-20240117.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-20240905.ebuild b/net-misc/iputils/iputils-20240905.ebuild
index df4ec305f674..f9d9799b542a 100644
--- a/net-misc/iputils/iputils-20240905.ebuild
+++ b/net-misc/iputils/iputils-20240905.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-20250605-r1.ebuild b/net-misc/iputils/iputils-20250605-r1.ebuild
index dbe6fc4c0273..977b00780125 100644
--- a/net-misc/iputils/iputils-20250605-r1.ebuild
+++ b/net-misc/iputils/iputils-20250605-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-20250605.ebuild b/net-misc/iputils/iputils-20250605.ebuild
index c8bd53da9b3b..83c4fa9d4b30 100644
--- a/net-misc/iputils/iputils-20250605.ebuild
+++ b/net-misc/iputils/iputils-20250605.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 5182e29fbed5..5c1ae81c28e2 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild b/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
index c6db22add90c..7207a8268c78 100644
--- a/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="cgi geoip +openssl"
 
 RDEPEND="
diff --git a/net-misc/ipv6calc/ipv6calc-4.4.0.ebuild b/net-misc/ipv6calc/ipv6calc-4.4.0.ebuild
index 9e4594bdd20e..4242998f07d3 100644
--- a/net-misc/ipv6calc/ipv6calc-4.4.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="apache geoip +openssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/keychain/keychain-2.8.5-r2.ebuild b/net-misc/keychain/keychain-2.8.5-r2.ebuild
index 480f3a8dd824..cbd8231f5e5e 100644
--- a/net-misc/keychain/keychain-2.8.5-r2.ebuild
+++ b/net-misc/keychain/keychain-2.8.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/danielrobbins/keychain/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/net-misc/lanmap/lanmap-81-r3.ebuild b/net-misc/lanmap/lanmap-81-r3.ebuild
index d2bb7fd585a4..aad6927470c3 100644
--- a/net-misc/lanmap/lanmap-81-r3.ebuild
+++ b/net-misc/lanmap/lanmap-81-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}
diff --git a/net-misc/memcached/memcached-1.6.31.ebuild b/net-misc/memcached/memcached-1.6.31.ebuild
index bf8560163bd3..00b6a64c6f8b 100644
--- a/net-misc/memcached/memcached-1.6.31.ebuild
+++ b/net-misc/memcached/memcached-1.6.31.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/memcached/memcached-1.6.38.ebuild b/net-misc/memcached/memcached-1.6.38.ebuild
index bf8560163bd3..00b6a64c6f8b 100644
--- a/net-misc/memcached/memcached-1.6.38.ebuild
+++ b/net-misc/memcached/memcached-1.6.38.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/memcached/memcached-1.6.39.ebuild b/net-misc/memcached/memcached-1.6.39.ebuild
index bf8560163bd3..00b6a64c6f8b 100644
--- a/net-misc/memcached/memcached-1.6.39.ebuild
+++ b/net-misc/memcached/memcached-1.6.39.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild
index d1ce400fc92d..1dd475317095 100644
--- a/net-misc/mico/mico-2.3.13-r14.ebuild
+++ b/net-misc/mico/mico-2.3.13-r14.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
diff --git a/net-misc/mosh/mosh-1.4.0-r1.ebuild b/net-misc/mosh/mosh-1.4.0-r1.ebuild
index ee821123f62e..76a7cb78da6b 100644
--- a/net-misc/mosh/mosh-1.4.0-r1.ebuild
+++ b/net-misc/mosh/mosh-1.4.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 IUSE="+client examples +hardened nettle +server syslog ufw +utempter"
 
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r15.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r15.ebuild
index f24ca281779f..d2eced67bb4f 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r15.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild
index 0a921ac94c01..18de1d37231a 100644
--- a/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 DEPEND="
diff --git a/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild
index cfc67d4576ee..1da4ffeb846d 100644
--- a/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 DEPEND="
diff --git a/net-misc/ntp/ntp-4.2.8_p18-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p18-r1.ebuild
index ccefd7e0e4b1..8eb4edbf2323 100644
--- a/net-misc/ntp/ntp-4.2.8_p18-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p18-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 DEPEND="
diff --git a/net-misc/ntp/ntp-4.2.8_p18-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p18-r2.ebuild
index 9380dc986566..11dd454101e4 100644
--- a/net-misc/ntp/ntp-4.2.8_p18-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p18-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 DEPEND="
diff --git a/net-misc/openssh/openssh-10.0_p1.ebuild b/net-misc/openssh/openssh-10.0_p1.ebuild
index 2405e8cf7f25..14bd40b093ec 100644
--- a/net-misc/openssh/openssh-10.0_p1.ebuild
+++ b/net-misc/openssh/openssh-10.0_p1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss"
 
diff --git a/net-misc/openssh/openssh-10.0_p2.ebuild b/net-misc/openssh/openssh-10.0_p2.ebuild
index 2adeac646a1f..10c5606b0ca5 100644
--- a/net-misc/openssh/openssh-10.0_p2.ebuild
+++ b/net-misc/openssh/openssh-10.0_p2.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${PN}-10.0p1"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam security-key selinux +ssl static test xmss"
 
diff --git a/net-misc/openssh/openssh-10.1_p1-r1.ebuild b/net-misc/openssh/openssh-10.1_p1-r1.ebuild
index a3ddcfbfbe24..9845193702df 100644
--- a/net-misc/openssh/openssh-10.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-10.1_p1-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam security-key selinux +ssl static test"
 
diff --git a/net-misc/openssh/openssh-10.2_p1.ebuild b/net-misc/openssh/openssh-10.2_p1.ebuild
index 9536fd3819eb..eadf4625c73e 100644
--- a/net-misc/openssh/openssh-10.2_p1.ebuild
+++ b/net-misc/openssh/openssh-10.2_p1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam security-key selinux +ssl static test"
 
diff --git a/net-misc/openssh/openssh-9.8_p1-r4.ebuild b/net-misc/openssh/openssh-9.8_p1-r4.ebuild
index c8b83906c10e..37ba4097aad7 100644
--- a/net-misc/openssh/openssh-9.8_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-9.8_p1-r4.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss"
 
diff --git a/net-misc/openssh/openssh-9.9_p2-r4.ebuild b/net-misc/openssh/openssh-9.9_p2-r4.ebuild
index 2740e8b849d9..c4f8dd7c965e 100644
--- a/net-misc/openssh/openssh-9.9_p2-r4.ebuild
+++ b/net-misc/openssh/openssh-9.9_p2-r4.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss"
 
diff --git a/net-misc/pssh/pssh-2.3.4-r3.ebuild b/net-misc/pssh/pssh-2.3.4-r3.ebuild
index 7992ab01da29..2d54b8f4c17b 100644
--- a/net-misc/pssh/pssh-2.3.4-r3.ebuild
+++ b/net-misc/pssh/pssh-2.3.4-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lilydjwg/pssh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	!net-misc/putty
diff --git a/net-misc/pssh/pssh-2.3.5.ebuild b/net-misc/pssh/pssh-2.3.5.ebuild
index 555c7d2e8648..58d99af1ee6c 100644
--- a/net-misc/pssh/pssh-2.3.5.ebuild
+++ b/net-misc/pssh/pssh-2.3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lilydjwg/pssh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	!net-misc/putty
diff --git a/net-misc/puf/puf-1.0.0-r2.ebuild b/net-misc/puf/puf-1.0.0-r2.ebuild
index bb6d8e87f1c2..cbe64a9d8041 100644
--- a/net-misc/puf/puf-1.0.0-r2.ebuild
+++ b/net-misc/puf/puf-1.0.0-r2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://downloads.sourceforge.net/puf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild
index c44f96bfb9e3..ac045d69bade 100644
--- a/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${PV/_/-}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="alsa ao kerberos oss pcsc-lite pulseaudio xrandr"
 
 RDEPEND="
diff --git a/net-misc/rsync/rsync-3.3.0-r2.ebuild b/net-misc/rsync/rsync-3.3.0-r2.ebuild
index 75678756237c..e52e8bc51c9f 100644
--- a/net-misc/rsync/rsync-3.3.0-r2.ebuild
+++ b/net-misc/rsync/rsync-3.3.0-r2.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/rsync/rsync-3.4.1-r1.ebuild b/net-misc/rsync/rsync-3.4.1-r1.ebuild
index d3508b7e661b..1cffda104c00 100644
--- a/net-misc/rsync/rsync-3.4.1-r1.ebuild
+++ b/net-misc/rsync/rsync-3.4.1-r1.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/rsync/rsync-3.4.1.ebuild b/net-misc/rsync/rsync-3.4.1.ebuild
index c6c08b9d8725..0ae7546ebdba 100644
--- a/net-misc/rsync/rsync-3.4.1.ebuild
+++ b/net-misc/rsync/rsync-3.4.1.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 65f3e131acb7..ecfa3c6f2c51 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/s3cmd/s3cmd-2.4.0.ebuild b/net-misc/s3cmd/s3cmd-2.4.0.ebuild
index 989350fe3e13..40813dc79bbf 100644
--- a/net-misc/s3cmd/s3cmd-2.4.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.4.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~loong x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~loong x86 ~x64-macos"
 
 RDEPEND="
 	|| (
diff --git a/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild b/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
index 24f02ec5b015..284db3254075 100644
--- a/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
+++ b/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
@@ -10,4 +10,4 @@ SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~sparc x86"
diff --git a/net-misc/socat/socat-1.8.0.3.ebuild b/net-misc/socat/socat-1.8.0.3.ebuild
index d8a5924abed0..9597dea04de8 100644
--- a/net-misc/socat/socat-1.8.0.3.ebuild
+++ b/net-misc/socat/socat-1.8.0.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 # bug #946404 (and many others), whack-a-mole with timeouts and friends
 # Try again in the future.
diff --git a/net-misc/socket/socket-1.5.ebuild b/net-misc/socket/socket-1.5.ebuild
index 0a9cad96c8ec..179dd98f824b 100644
--- a/net-misc/socket/socket-1.5.ebuild
+++ b/net-misc/socket/socket-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://w21.org/jnickelsen/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 PATCHES=(
diff --git a/net-misc/stunnel/stunnel-5.71-r1.ebuild b/net-misc/stunnel/stunnel-5.71-r1.ebuild
index 387c0648b933..4381702277aa 100644
--- a/net-misc/stunnel/stunnel-5.71-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.71-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/stunnel/stunnel-5.74.ebuild b/net-misc/stunnel/stunnel-5.74.ebuild
index c87e3c1387ee..7ef50797ab7c 100644
--- a/net-misc/stunnel/stunnel-5.74.ebuild
+++ b/net-misc/stunnel/stunnel-5.74.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/stunnel/stunnel-5.75.ebuild b/net-misc/stunnel/stunnel-5.75.ebuild
index 62b4701d2620..c5ec6d7bc07b 100644
--- a/net-misc/stunnel/stunnel-5.75.ebuild
+++ b/net-misc/stunnel/stunnel-5.75.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/stunnel/stunnel-5.76.ebuild b/net-misc/stunnel/stunnel-5.76.ebuild
index c87e3c1387ee..7ef50797ab7c 100644
--- a/net-misc/stunnel/stunnel-5.76.ebuild
+++ b/net-misc/stunnel/stunnel-5.76.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux stunnel3 systemd tcpd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild
index 9100e872c538..1cb8038d124d 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="nls selinux xinetd"
 
 DEPEND="
diff --git a/net-misc/throttle/throttle-1.2-r1.ebuild b/net-misc/throttle/throttle-1.2-r1.ebuild
index f1270932697e..dad7b43a37d3 100644
--- a/net-misc/throttle/throttle-1.2-r1.ebuild
+++ b/net-misc/throttle/throttle-1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/net-misc/throttle/throttle-1.2-r3.ebuild b/net-misc/throttle/throttle-1.2-r3.ebuild
index 439c6ca68369..76bc9ecc5e5a 100644
--- a/net-misc/throttle/throttle-1.2-r3.ebuild
+++ b/net-misc/throttle/throttle-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-bool.patch
diff --git a/net-misc/unison/unison-2.53.7-r1.ebuild b/net-misc/unison/unison-2.53.7-r1.ebuild
index 898d7bd63c82..d368bbff7b2b 100644
--- a/net-misc/unison/unison-2.53.7-r1.ebuild
+++ b/net-misc/unison/unison-2.53.7-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/bcpierce00/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~ppc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/unison/unison-2.53.8.ebuild b/net-misc/unison/unison-2.53.8.ebuild
index c863d63cc11c..566cd2a11ab8 100644
--- a/net-misc/unison/unison-2.53.8.ebuild
+++ b/net-misc/unison/unison-2.53.8.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/bcpierce00/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
index a10352db085c..9e3fc043a764 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpoliv/wakeonlan/archive/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/net-misc/wakeonlan/wakeonlan-0.42.ebuild b/net-misc/wakeonlan/wakeonlan-0.42.ebuild
index 90ed3b016044..1a1c2006ea34 100644
--- a/net-misc/wakeonlan/wakeonlan-0.42.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.42.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpoliv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/wget/wget-1.25.0-r1.ebuild b/net-misc/wget/wget-1.25.0-r1.ebuild
index 7100cf8a6dad..feeac90da955 100644
--- a/net-misc/wget/wget-1.25.0-r1.ebuild
+++ b/net-misc/wget/wget-1.25.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.lz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="cookie-check debug gnutls idn libproxy metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/whois/whois-5.5.20.ebuild b/net-misc/whois/whois-5.5.20.ebuild
index 1f0b8109407d..4c9b56304204 100644
--- a/net-misc/whois/whois-5.5.20.ebuild
+++ b/net-misc/whois/whois-5.5.20.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}"/${PN}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/whois/whois-5.5.21.ebuild b/net-misc/whois/whois-5.5.21.ebuild
index 1f0b8109407d..4c9b56304204 100644
--- a/net-misc/whois/whois-5.5.21.ebuild
+++ b/net-misc/whois/whois-5.5.21.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}"/${PN}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/whois/whois-5.5.23.ebuild b/net-misc/whois/whois-5.5.23.ebuild
index 1f0b8109407d..4c9b56304204 100644
--- a/net-misc/whois/whois-5.5.23.ebuild
+++ b/net-misc/whois/whois-5.5.23.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}"/${PN}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild
index c27ae99b57b9..2e8630e931a5 100644
--- a/net-misc/whois/whois-9999.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}"/${PN}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2-r2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2-r2.ebuild
index b239707c2d3b..e07cd7684a4b 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.2-r2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.2-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="CAOSL"
 SLOT="0"
-KEYWORDS="amd64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND=">=dev-java/javahelp-2.0.02_p46:0"
diff --git a/net-nds/openldap/openldap-2.5.19.ebuild b/net-nds/openldap/openldap-2.5.19.ebuild
index 580a28773520..c787455a6686 100644
--- a/net-nds/openldap/openldap-2.5.19.ebuild
+++ b/net-nds/openldap/openldap-2.5.19.ebuild
@@ -27,7 +27,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openldap.asc
 LICENSE="OPENLDAP GPL-2"
 # Subslot added for bug #835654
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
 IUSE_OVERLAY="overlays perl autoca"
diff --git a/net-nds/openldap/openldap-2.6.8-r1.ebuild b/net-nds/openldap/openldap-2.6.8-r1.ebuild
index 7d47017d51b5..4525d2599106 100644
--- a/net-nds/openldap/openldap-2.6.8-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.8-r1.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
 LICENSE="OPENLDAP GPL-2"
 # Subslot added for bug #835654
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
 IUSE_OVERLAY="overlays perl autoca"
diff --git a/net-nds/openldap/openldap-2.6.9.ebuild b/net-nds/openldap/openldap-2.6.9.ebuild
index b76192650eb4..392a6aa8f55e 100644
--- a/net-nds/openldap/openldap-2.6.9.ebuild
+++ b/net-nds/openldap/openldap-2.6.9.ebuild
@@ -28,7 +28,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openldap.asc
 LICENSE="OPENLDAP GPL-2"
 # Subslot added for bug #835654
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
 IUSE_OVERLAY="overlays perl autoca"
diff --git a/net-news/snownews/snownews-1.9-r2.ebuild b/net-news/snownews/snownews-1.9-r2.ebuild
index 17be3ea78e39..7c8c65502c79 100644
--- a/net-news/snownews/snownews-1.9-r2.ebuild
+++ b/net-news/snownews/snownews-1.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msharov/snownews/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/net-nntp/newspost/newspost-2.1.1-r3.ebuild b/net-nntp/newspost/newspost-2.1.1-r3.ebuild
index 61fc3cc2dc8c..4b147760fbab 100644
--- a/net-nntp/newspost/newspost-2.1.1-r3.ebuild
+++ b/net-nntp/newspost/newspost-2.1.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://newspost.unixcab.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	# Should fix some problems with unexpected server replies, cf. bug 185468
diff --git a/net-nntp/slrn/slrn-1.0.3-r2.ebuild b/net-nntp/slrn/slrn-1.0.3-r2.ebuild
index 74bf15a2129b..aed8b9b248ee 100644
--- a/net-nntp/slrn/slrn-1.0.3-r2.ebuild
+++ b/net-nntp/slrn/slrn-1.0.3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://jedsoft.org/releases/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 IUSE="canlock nls selinux ssl uudeview"
 
 RDEPEND="app-arch/sharutils
diff --git a/net-nntp/tin/tin-2.6.4.ebuild b/net-nntp/tin/tin-2.6.4.ebuild
index 558dff20eabb..95930a5eacdf 100644
--- a/net-nntp/tin/tin-2.6.4.ebuild
+++ b/net-nntp/tin/tin-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
 
 RDEPEND="
diff --git a/net-p2p/bitcoin-core/bitcoin-core-29.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-29.0.ebuild
index d964a4f37b22..f9d55b3b221e 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-29.0.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-29.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 LICENSE="MIT"
 SLOT="0"
 if [[ "${PV}" != *_rc* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 fi
 IUSE="asm +berkdb +cli +daemon dbus examples +external-signer gui qrcode +sqlite +system-libsecp256k1 systemtap test test-full zeromq"
 RESTRICT="!test? ( test )"
diff --git a/net-p2p/bitcoin-core/bitcoin-core-29.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-29.1.ebuild
index 100fcb6a0475..1639994b592b 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-29.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-29.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 LICENSE="MIT"
 SLOT="0"
 if [[ "${PV}" != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 IUSE="asm +berkdb +cli +daemon dbus examples +external-signer gui qrcode +sqlite +system-libsecp256k1 systemtap test test-full zeromq"
 RESTRICT="!test? ( test )"
diff --git a/net-p2p/bitcoin-core/bitcoin-core-29.2.ebuild b/net-p2p/bitcoin-core/bitcoin-core-29.2.ebuild
index 40e419072042..b5e9563642e7 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-29.2.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-29.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 LICENSE="MIT"
 SLOT="0"
 if [[ "${PV}" != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 IUSE="asm +berkdb +cli +daemon dbus examples +external-signer gui qrcode +sqlite +system-libsecp256k1 systemtap test test-full zeromq"
 RESTRICT="!test? ( test )"
diff --git a/net-p2p/bitcoin-core/bitcoin-core-30.0-r1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-30.0-r1.ebuild
index 5c7e4cc303eb..7a0a01111d79 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-30.0-r1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-30.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 LICENSE="MIT"
 SLOT="0"
 if [[ "${PV}" != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 IUSE="asm +cli +daemon dbus examples +external-signer gui qrcode +system-libsecp256k1 systemtap test test-full +wallet zeromq"
 RESTRICT="!test? ( test )"
diff --git a/net-p2p/rtorrent/rtorrent-0.15.7.ebuild b/net-p2p/rtorrent/rtorrent-0.15.7.ebuild
index 0d70816b8d02..901977f44647 100644
--- a/net-p2p/rtorrent/rtorrent-0.15.7.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.15.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/rakshasa/${PN}.git"
 else
 	SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-p2p/rtorrent/rtorrent-0.16.5.ebuild b/net-p2p/rtorrent/rtorrent-0.16.5.ebuild
index cfe87b302cb0..cbb786db55da 100644
--- a/net-p2p/rtorrent/rtorrent-0.16.5.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.16.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/rakshasa/${PN}.git"
 else
 	SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-p2p/rtorrent/rtorrent-9999.ebuild b/net-p2p/rtorrent/rtorrent-9999.ebuild
index cfe87b302cb0..cbb786db55da 100644
--- a/net-p2p/rtorrent/rtorrent-9999.ebuild
+++ b/net-p2p/rtorrent/rtorrent-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/rakshasa/${PN}.git"
 else
 	SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/tinc/tinc-1.0.36-r1.ebuild b/net-vpn/tinc/tinc-1.0.36-r1.ebuild
index 4dbf4c9968e9..f7905ba20b9b 100644
--- a/net-vpn/tinc/tinc-1.0.36-r1.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.tinc-vpn.org/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+lzo uml vde +zlib"
 
 DEPEND="
diff --git a/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild b/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild
index 60d74b1672c9..f0fc50097163 100644
--- a/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.tinc-vpn.org/packages/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+lzo +ncurses +readline +ssl uml vde upnp +zlib"
 
 DEPEND="
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild
index 6a917fd2d400..ba01a0588beb 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 78004c26bafb..8c131c3455f8 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/iw/iw-6.17.ebuild b/net-wireless/iw/iw-6.17.ebuild
index 973ed4b8434f..e0cffb089eb4 100644
--- a/net-wireless/iw/iw-6.17.ebuild
+++ b/net-wireless/iw/iw-6.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="dev-libs/libnl:="
 RDEPEND="
diff --git a/net-wireless/iw/iw-6.9.ebuild b/net-wireless/iw/iw-6.9.ebuild
index 7aeb59d67d4c..2eda9b8aba82 100644
--- a/net-wireless/iw/iw-6.9.ebuild
+++ b/net-wireless/iw/iw-6.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 DEPEND="dev-libs/libnl:="
 RDEPEND="
diff --git a/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r3.ebuild b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r3.ebuild
index fee2ff4b06a4..833ba48ac272 100644
--- a/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r3.ebuild
+++ b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r3.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
 
-	KEYWORDS="amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ppc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index a409a8f697a5..7be97eb925c5 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/perl-core/CPAN/CPAN-2.290.0-r4.ebuild b/perl-core/CPAN/CPAN-2.290.0-r4.ebuild
index 52a9d1d88ccd..54bf46aa7538 100644
--- a/perl-core/CPAN/CPAN-2.290.0-r4.ebuild
+++ b/perl-core/CPAN/CPAN-2.290.0-r4.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Query, download and build perl modules from CPAN sites"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # parallel testing fails, run tests sequentially #827014
 DIST_TEST=do
diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.206.0.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.206.0.ebuild
index 5b389936fd94..043e98d4a45f 100644
--- a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.206.0.ebuild
+++ b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.206.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-Level Interface to zlib compression library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # We use the bundled version of zlib as the minimum version for the system copy
 # Check on bumps! Look in https://github.com/pmqs/Compress-Raw-Zlib/commits/master/zlib-src.
diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.212.0.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.212.0.ebuild
index d2e7640f07bd..0f2004bf81c6 100644
--- a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.212.0.ebuild
+++ b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.212.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-Level Interface to zlib compression library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # We use the bundled version of zlib as the minimum version for the system copy
 # Check on bumps! Look in https://github.com/pmqs/Compress-Raw-Zlib/commits/master/zlib-src.
diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.213.0.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.213.0.ebuild
index 0ea44bb526bd..b755cdf3832b 100644
--- a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.213.0.ebuild
+++ b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.213.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-Level Interface to zlib compression library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # We use the bundled version of zlib as the minimum version for the system copy
 # Check on bumps! Look in https://github.com/pmqs/Compress-Raw-Zlib/commits/master/zlib-src.
diff --git a/perl-core/Encode/Encode-3.190.0.ebuild b/perl-core/Encode/Encode-3.190.0.ebuild
index a44c439f2b26..a803e5f34feb 100644
--- a/perl-core/Encode/Encode-3.190.0.ebuild
+++ b/perl-core/Encode/Encode-3.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Character encodings in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/gentoo_enc2xs.diff
diff --git a/perl-core/Encode/Encode-3.210.0.ebuild b/perl-core/Encode/Encode-3.210.0.ebuild
index af313523b637..9e3e382d3403 100644
--- a/perl-core/Encode/Encode-3.210.0.ebuild
+++ b/perl-core/Encode/Encode-3.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Character encodings in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/gentoo_enc2xs.diff
diff --git a/perl-core/File-Temp/File-Temp-0.231.100-r1.ebuild b/perl-core/File-Temp/File-Temp-0.231.100-r1.ebuild
index 5c829fabbe2b..2db000d8441b 100644
--- a/perl-core/File-Temp/File-Temp-0.231.100-r1.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.231.100-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/perl-core/Getopt-Long/Getopt-Long-2.580.0.ebuild b/perl-core/Getopt-Long/Getopt-Long-2.580.0.ebuild
index 40d3aa37d314..66e026ad19fe 100644
--- a/perl-core/Getopt-Long/Getopt-Long-2.580.0.ebuild
+++ b/perl-core/Getopt-Long/Getopt-Long-2.580.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Advanced handling of command line options"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/perl-core/Math-BigInt/Math-BigInt-1.999.842-r4.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.999.842-r4.ebuild
index 753776f1fc82..a294493b3db2 100644
--- a/perl-core/Math-BigInt/Math-BigInt-1.999.842-r4.ebuild
+++ b/perl-core/Math-BigInt/Math-BigInt-1.999.842-r4.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Arbitrary size floating point math package"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Carp-1.220.0
diff --git a/perl-core/Module-Load/Module-Load-0.360.0.ebuild b/perl-core/Module-Load/Module-Load-0.360.0.ebuild
index 034187d57e2b..0327653cd288 100644
--- a/perl-core/Module-Load/Module-Load-0.360.0.ebuild
+++ b/perl-core/Module-Load/Module-Load-0.360.0.ebuild
@@ -10,5 +10,5 @@ inherit perl-module
 DESCRIPTION="Runtime require of both modules and files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE=""
diff --git a/perl-core/Module-Loaded/Module-Loaded-0.80.0-r2.ebuild b/perl-core/Module-Loaded/Module-Loaded-0.80.0-r2.ebuild
index 8096247ad363..741e19a89b62 100644
--- a/perl-core/Module-Loaded/Module-Loaded-0.80.0-r2.ebuild
+++ b/perl-core/Module-Loaded/Module-Loaded-0.80.0-r2.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Mark modules as loaded or unloaded"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/perl-core/Params-Check/Params-Check-0.380.0-r3.ebuild b/perl-core/Params-Check/Params-Check-0.380.0-r3.ebuild
index 2391c7092908..7f74578383bf 100644
--- a/perl-core/Params-Check/Params-Check-0.380.0-r3.ebuild
+++ b/perl-core/Params-Check/Params-Check-0.380.0-r3.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="A generic input parsing/checking mechanism"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.630.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.630.0.ebuild
index 9da7f257efe8..5ef7ed9589f2 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.630.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.630.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Common Scalar and List utility subroutines"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.680.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.680.0.ebuild
index 56a3964706de..55f9f29da014 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.680.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.680.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Common Scalar and List utility subroutines"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/perl-core/Term-Table/Term-Table-0.22.0.ebuild b/perl-core/Term-Table/Term-Table-0.22.0.ebuild
index 9b1308782913..217213e7fbab 100644
--- a/perl-core/Term-Table/Term-Table-0.22.0.ebuild
+++ b/perl-core/Term-Table/Term-Table-0.22.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module optfeature
 DESCRIPTION="Format a header and rows into a table"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/perl-core/Term-Table/Term-Table-0.23.0.ebuild b/perl-core/Term-Table/Term-Table-0.23.0.ebuild
index 30b8e1aeafa4..10226ffb10a5 100644
--- a/perl-core/Term-Table/Term-Table-0.23.0.ebuild
+++ b/perl-core/Term-Table/Term-Table-0.23.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module optfeature
 DESCRIPTION="Format a header and rows into a table"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/perl-core/Term-Table/Term-Table-0.24.0.ebuild b/perl-core/Term-Table/Term-Table-0.24.0.ebuild
index 5362e746fd5c..48bf115894a7 100644
--- a/perl-core/Term-Table/Term-Table-0.24.0.ebuild
+++ b/perl-core/Term-Table/Term-Table-0.24.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module optfeature
 DESCRIPTION="Format a header and rows into a table"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/perl-core/Test-Harness/Test-Harness-3.500.0.ebuild b/perl-core/Test-Harness/Test-Harness-3.500.0.ebuild
index 46e468946957..df39c04fdb5f 100644
--- a/perl-core/Test-Harness/Test-Harness-3.500.0.ebuild
+++ b/perl-core/Test-Harness/Test-Harness-3.500.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Runs Perl standard test scripts with statistics"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/perl-core/Test-Simple/Test-Simple-1.302.196.ebuild b/perl-core/Test-Simple/Test-Simple-1.302.196.ebuild
index 019602dbb6f5..3c1dec1be6a6 100644
--- a/perl-core/Test-Simple/Test-Simple-1.302.196.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-1.302.196.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Basic utilities for writing tests"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-perl/Test-Tester-0.114.0
diff --git a/perl-core/Test-Simple/Test-Simple-1.302.208-r1.ebuild b/perl-core/Test-Simple/Test-Simple-1.302.208-r1.ebuild
index cab1e1d2dcb3..3655e4933a76 100644
--- a/perl-core/Test-Simple/Test-Simple-1.302.208-r1.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-1.302.208-r1.ebuild
@@ -13,7 +13,7 @@ inherit perl-module
 DESCRIPTION="Basic utilities for writing tests"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-lang/perl:=
diff --git a/perl-core/Test2-Suite/Test2-Suite-0.0.162-r1.ebuild b/perl-core/Test2-Suite/Test2-Suite-0.0.162-r1.ebuild
index 5904bd888bf9..981d5c89e55b 100644
--- a/perl-core/Test2-Suite/Test2-Suite-0.0.162-r1.ebuild
+++ b/perl-core/Test2-Suite/Test2-Suite-0.0.162-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Rich set of tools built upon the Test2 framework"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Module-Pluggable is just suggested now
 RDEPEND="
diff --git a/perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2023.51.100.ebuild b/perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2023.51.100.ebuild
index 943afdc57a52..31aa209fc10b 100644
--- a/perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2023.51.100.ebuild
+++ b/perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2023.51.100.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Expand/unexpand tabs per unix expand and line wrapping"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/perl-core/Unicode-Collate/Unicode-Collate-1.310.0.ebuild b/perl-core/Unicode-Collate/Unicode-Collate-1.310.0.ebuild
index 04003a6d1c1f..9981a1f676d9 100644
--- a/perl-core/Unicode-Collate/Unicode-Collate-1.310.0.ebuild
+++ b/perl-core/Unicode-Collate/Unicode-Collate-1.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Unicode Collate Algorithm"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/sci-astronomy/cdsclient/cdsclient-3.8.4-r1.ebuild b/sci-astronomy/cdsclient/cdsclient-3.8.4-r1.ebuild
index 3087cd4f8f5b..4273f00384a4 100644
--- a/sci-astronomy/cdsclient/cdsclient-3.8.4-r1.ebuild
+++ b/sci-astronomy/cdsclient/cdsclient-3.8.4-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="mirror bindist"
 
 RDEPEND="app-shells/tcsh"
diff --git a/sci-astronomy/cpl/cpl-7.3.2.ebuild b/sci-astronomy/cpl/cpl-7.3.2.ebuild
index 29d0bdbb3378..9b22c689a57a 100644
--- a/sci-astronomy/cpl/cpl-7.3.2.ebuild
+++ b/sci-astronomy/cpl/cpl-7.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/26"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="doc gasgano static-libs threads"
 
diff --git a/sci-astronomy/ds9-bin/ds9-bin-7.4-r1.ebuild b/sci-astronomy/ds9-bin/ds9-bin-7.4-r1.ebuild
index dc73289e6d4d..a4ee5eba8e50 100644
--- a/sci-astronomy/ds9-bin/ds9-bin-7.4-r1.ebuild
+++ b/sci-astronomy/ds9-bin/ds9-bin-7.4-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-libs/libxml2:=
diff --git a/sci-astronomy/erfa/erfa-2.0.0.ebuild b/sci-astronomy/erfa/erfa-2.0.0.ebuild
index 79da58d989d5..0a6a2cc78bf1 100644
--- a/sci-astronomy/erfa/erfa-2.0.0.ebuild
+++ b/sci-astronomy/erfa/erfa-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/liberfa/erfa/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 src_prepare() {
 	default
diff --git a/sci-astronomy/esorex/esorex-3.12.3-r1.ebuild b/sci-astronomy/esorex/esorex-3.12.3-r1.ebuild
index 8222ab6f2ffb..cc504c535889 100644
--- a/sci-astronomy/esorex/esorex-3.12.3-r1.ebuild
+++ b/sci-astronomy/esorex/esorex-3.12.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=sci-astronomy/cpl-6.3:="
 RDEPEND="${DEPEND}"
diff --git a/sci-astronomy/fitsh/fitsh-0.9.4.ebuild b/sci-astronomy/fitsh/fitsh-0.9.4.ebuild
index 365fa1515cac..74f1a7327f50 100644
--- a/sci-astronomy/fitsh/fitsh-0.9.4.ebuild
+++ b/sci-astronomy/fitsh/fitsh-0.9.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fitsh.net/download/fitsh/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.4-makefile.patch
diff --git a/sci-astronomy/fitspng/fitspng-2.0.ebuild b/sci-astronomy/fitspng/fitspng-2.0.ebuild
index 4dd61791dcf2..3db39ea1e620 100644
--- a/sci-astronomy/fitspng/fitspng-2.0.ebuild
+++ b/sci-astronomy/fitspng/fitspng-2.0.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	sci-libs/cfitsio:0=
diff --git a/sci-astronomy/funtools/funtools-1.4.8-r1.ebuild b/sci-astronomy/funtools/funtools-1.4.8-r1.ebuild
index fb3434788a21..b14ce260ca6f 100644
--- a/sci-astronomy/funtools/funtools-1.4.8-r1.ebuild
+++ b/sci-astronomy/funtools/funtools-1.4.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild b/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild
index 88341dfa0584..3f4fb74903ab 100644
--- a/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild
+++ b/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.kornelix.com/uploads/${PID}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="x11-libs/gtk+:3"
 RDEPEND="${DEPEND}
diff --git a/sci-astronomy/gasgano/gasgano-2.4.8-r2.ebuild b/sci-astronomy/gasgano/gasgano-2.4.8-r2.ebuild
index 70b7df39898b..807881b273e4 100644
--- a/sci-astronomy/gasgano/gasgano-2.4.8-r2.ebuild
+++ b/sci-astronomy/gasgano/gasgano-2.4.8-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64"
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/sci-astronomy/gnuastro/gnuastro-0.16-r1.ebuild b/sci-astronomy/gnuastro/gnuastro-0.16-r1.ebuild
index 9dac89168ab6..baee7f80a96b 100644
--- a/sci-astronomy/gnuastro/gnuastro-0.16-r1.ebuild
+++ b/sci-astronomy/gnuastro/gnuastro-0.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="static-libs threads"
 
diff --git a/sci-astronomy/idlastro/idlastro-20161220-r1.ebuild b/sci-astronomy/idlastro/idlastro-20161220-r1.ebuild
index e2308225e731..ebdaa656932b 100644
--- a/sci-astronomy/idlastro/idlastro-20161220-r1.ebuild
+++ b/sci-astronomy/idlastro/idlastro-20161220-r1.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="BSD-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 RDEPEND="dev-lang/gdl"
 
 src_install() {
diff --git a/sci-astronomy/missfits/missfits-2.8.0.ebuild b/sci-astronomy/missfits/missfits-2.8.0.ebuild
index c619190e23f7..9dd38b78ce32 100644
--- a/sci-astronomy/missfits/missfits-2.8.0.ebuild
+++ b/sci-astronomy/missfits/missfits-2.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-run-AM_PROG_AR.patch
diff --git a/sci-astronomy/montage/montage-6.1.ebuild b/sci-astronomy/montage/montage-6.1.ebuild
index eeacf49c95a8..0fd15af04341 100644
--- a/sci-astronomy/montage/montage-6.1.ebuild
+++ b/sci-astronomy/montage/montage-6.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/Montage-${PV}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-astronomy/pal/pal-0.9.8-r1.ebuild b/sci-astronomy/pal/pal-0.9.8-r1.ebuild
index 9b0e2ee32686..530faefbe18a 100644
--- a/sci-astronomy/pal/pal-0.9.8-r1.ebuild
+++ b/sci-astronomy/pal/pal-0.9.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Starlink/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 RDEPEND="sci-astronomy/erfa:="
 DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/pal/pal-0.9.8.ebuild b/sci-astronomy/pal/pal-0.9.8.ebuild
index 164a46ed2fe3..2fe78f3e9637 100644
--- a/sci-astronomy/pal/pal-0.9.8.ebuild
+++ b/sci-astronomy/pal/pal-0.9.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Starlink/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 RDEPEND="sci-astronomy/erfa:="
 DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/psfex/psfex-3.17.1.ebuild b/sci-astronomy/psfex/psfex-3.17.1.ebuild
index d5dbf1306d4d..a94250461846 100644
--- a/sci-astronomy/psfex/psfex-3.17.1.ebuild
+++ b/sci-astronomy/psfex/psfex-3.17.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="Extracts models of the Point Spread Function from FITS images"
 HOMEPAGE="http://www.astromatic.net/software/psfex"
 SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sci-astronomy/pyephem/pyephem-4.1.1.ebuild b/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
index 68e64d9a6b26..baf625ea3bfc 100644
--- a/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
+++ b/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brandon-rhodes/pyephem/archive/refs/tags/${PV}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( dev-python/sphinx )"
diff --git a/sci-astronomy/pyephem/pyephem-4.1.3.ebuild b/sci-astronomy/pyephem/pyephem-4.1.3.ebuild
index 9a27c111ab24..09f10bcd54cb 100644
--- a/sci-astronomy/pyephem/pyephem-4.1.3.ebuild
+++ b/sci-astronomy/pyephem/pyephem-4.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brandon-rhodes/pyephem/archive/refs/tags/${PV}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( dev-python/sphinx )"
diff --git a/sci-astronomy/pyephem/pyephem-4.1.5.ebuild b/sci-astronomy/pyephem/pyephem-4.1.5.ebuild
index 7e059b2217bc..50643fb0531c 100644
--- a/sci-astronomy/pyephem/pyephem-4.1.5.ebuild
+++ b/sci-astronomy/pyephem/pyephem-4.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/brandon-rhodes/pyephem/archive/refs/tags/${PV}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( dev-python/sphinx )"
diff --git a/sci-astronomy/scamp/scamp-2.13.1.ebuild b/sci-astronomy/scamp/scamp-2.13.1.ebuild
index 13b2f01fe1a0..32bed9ac878a 100644
--- a/sci-astronomy/scamp/scamp-2.13.1.ebuild
+++ b/sci-astronomy/scamp/scamp-2.13.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/astromatic/${PN}.git"
 else
 	SRC_URI="https://github.com/astromatic/scamp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/sci-astronomy/scamp/scamp-2.14.0.ebuild b/sci-astronomy/scamp/scamp-2.14.0.ebuild
index 13b2f01fe1a0..32bed9ac878a 100644
--- a/sci-astronomy/scamp/scamp-2.14.0.ebuild
+++ b/sci-astronomy/scamp/scamp-2.14.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/astromatic/${PN}.git"
 else
 	SRC_URI="https://github.com/astromatic/scamp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild b/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
index 784c9d8c33fe..6e61c1580a01 100644
--- a/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc modelfit test threads"
 REQUIRED_USE="test? ( modelfit )"
 RESTRICT="!test? ( test )"
diff --git a/sci-astronomy/skymaker/skymaker-3.10.5.ebuild b/sci-astronomy/skymaker/skymaker-3.10.5.ebuild
index dd5c6c6a1882..bec83d5d62ff 100644
--- a/sci-astronomy/skymaker/skymaker-3.10.5.ebuild
+++ b/sci-astronomy/skymaker/skymaker-3.10.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="threads"
 
 RDEPEND="sci-libs/fftw:3.0="
diff --git a/sci-astronomy/sofa_c/sofa_c-20231011.ebuild b/sci-astronomy/sofa_c/sofa_c-20231011.ebuild
index fc542d499085..71ec404941bb 100644
--- a/sci-astronomy/sofa_c/sofa_c-20231011.ebuild
+++ b/sci-astronomy/sofa_c/sofa_c-20231011.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/sofa/${MYPV}/c/src"
 
 LICENSE="SOFA"
 SLOT=0
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/sci-astronomy/stiff/stiff-2.4.0-r1.ebuild b/sci-astronomy/stiff/stiff-2.4.0-r1.ebuild
index c32b7f86de49..9d3bd8592411 100644
--- a/sci-astronomy/stiff/stiff-2.4.0-r1.ebuild
+++ b/sci-astronomy/stiff/stiff-2.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc threads"
 
 RDEPEND="
diff --git a/sci-astronomy/stuff/stuff-1.26.0.ebuild b/sci-astronomy/stuff/stuff-1.26.0.ebuild
index 8c31f838acdf..f464b794239a 100644
--- a/sci-astronomy/stuff/stuff-1.26.0.ebuild
+++ b/sci-astronomy/stuff/stuff-1.26.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="threads"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
diff --git a/sci-astronomy/swarp/swarp-2.41.5.ebuild b/sci-astronomy/swarp/swarp-2.41.5.ebuild
index ef3fa14ef8e2..5a105a2a502e 100644
--- a/sci-astronomy/swarp/swarp-2.41.5.ebuild
+++ b/sci-astronomy/swarp/swarp-2.41.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astromatic/swarp/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cfitsio doc threads"
 
 RDEPEND="cfitsio? ( sci-libs/cfitsio )"
diff --git a/sci-astronomy/wcslib/wcslib-8.3-r1.ebuild b/sci-astronomy/wcslib/wcslib-8.3-r1.ebuild
index 119ebaa448f4..89f26dce9678 100644
--- a/sci-astronomy/wcslib/wcslib-8.3-r1.ebuild
+++ b/sci-astronomy/wcslib/wcslib-8.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
 SLOT="0/$(ver_cut 1)"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc fortran fits pgplot static-libs +tools"
 
 RDEPEND="
diff --git a/sci-astronomy/wcstools/wcstools-3.9.5-r1.ebuild b/sci-astronomy/wcstools/wcstools-3.9.5-r1.ebuild
index 941a31e5f8e0..acf4b50071a4 100644
--- a/sci-astronomy/wcstools/wcstools-3.9.5-r1.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.9.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tdc-www.harvard.edu/software/wcstools/Old/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DOCS=( Readme Programs NEWS )
 
diff --git a/sci-astronomy/wcstools/wcstools-3.9.7.ebuild b/sci-astronomy/wcstools/wcstools-3.9.7.ebuild
index 00797d0e90cc..0cedf8e08f5f 100644
--- a/sci-astronomy/wcstools/wcstools-3.9.7.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.9.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://tdc-www.harvard.edu/software/wcstools/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DOCS=( Readme Programs NEWS )
 
diff --git a/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild b/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild
index 2aa44a1044b1..040c72a86993 100644
--- a/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild
+++ b/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 DESCRIPTION="Combine weight maps and polygon for astronomical images weighting"
 HOMEPAGE="http://www.astromatic.net/software/weightwatcher/"
 SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild b/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
index 5918c6ef4b29..695269892c31 100644
--- a/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
+++ b/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/XEphem-${PV}"
 
 LICENSE="MIT"
 SLOT=0
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/sci-astronomy/xephem/xephem-4.2.0.ebuild b/sci-astronomy/xephem/xephem-4.2.0.ebuild
index e901ea9da1c0..80dd283c0a5c 100644
--- a/sci-astronomy/xephem/xephem-4.2.0.ebuild
+++ b/sci-astronomy/xephem/xephem-4.2.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/XEphem-${PV}"
 
 LICENSE="MIT"
 SLOT=0
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild b/sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild
index 32762bcf8728..b671e309be7c 100644
--- a/sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild
+++ b/sci-astronomy/xfitsview/xfitsview-2.2-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=x11-libs/motif-2.3:0"
 RDEPEND="${DEPEND}"
diff --git a/sci-biology/aaindex/aaindex-9.1-r2.ebuild b/sci-biology/aaindex/aaindex-9.1-r2.ebuild
index 76b95ddb1bcf..dea4b6531d4b 100644
--- a/sci-biology/aaindex/aaindex-9.1-r2.ebuild
+++ b/sci-biology/aaindex/aaindex-9.1-r2.ebuild
@@ -11,7 +11,7 @@ LICENSE="public-domain"
 SLOT="0"
 # Minimal build keeps only the indexed files (if applicable) and the
 # documentation. The non-indexed database is not installed.
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="emboss minimal"
 
 BDEPEND="emboss? ( sci-biology/emboss )"
diff --git a/sci-biology/biopython/biopython-1.85.ebuild b/sci-biology/biopython/biopython-1.85.ebuild
index 99eb4782d5fc..0a59d56d45f1 100644
--- a/sci-biology/biopython/biopython-1.85.ebuild
+++ b/sci-biology/biopython/biopython-1.85.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.biopython.org/ https://pypi.org/project/biopython/"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/sci-biology/cd-hit/cd-hit-4.6.6-r1.ebuild b/sci-biology/cd-hit/cd-hit-4.6.6-r1.ebuild
index 20e7e2d784fe..18d126aa8653 100644
--- a/sci-biology/cd-hit/cd-hit-4.6.6-r1.ebuild
+++ b/sci-biology/cd-hit/cd-hit-4.6.6-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${RELEASE}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="openmp"
 
 RDEPEND="dev-lang/perl"
diff --git a/sci-biology/clustalw/clustalw-1.83-r4.ebuild b/sci-biology/clustalw/clustalw-1.83-r4.ebuild
index 1845f8d7f524..b11c6e2bf48c 100644
--- a/sci-biology/clustalw/clustalw-1.83-r4.ebuild
+++ b/sci-biology/clustalw/clustalw-1.83-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}${PV}"
 
 LICENSE="clustalw"
 SLOT="1"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-as-needed.patch
diff --git a/sci-biology/clustalw/clustalw-2.1-r2.ebuild b/sci-biology/clustalw/clustalw-2.1-r2.ebuild
index 30b7dc4331eb..7b45d9b4cb84 100644
--- a/sci-biology/clustalw/clustalw-2.1-r2.ebuild
+++ b/sci-biology/clustalw/clustalw-2.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.clustal.org/download/current/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 src_install() {
 	default
diff --git a/sci-biology/cutg/cutg-160-r1.ebuild b/sci-biology/cutg/cutg-160-r1.ebuild
index 417248e5890c..07bf5566a84b 100644
--- a/sci-biology/cutg/cutg-160-r1.ebuild
+++ b/sci-biology/cutg/cutg-160-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 # Minimal build keeps only the indexed files (if applicable) and the
 # documentation. The non-indexed database is not installed.
 IUSE="emboss minimal"
diff --git a/sci-biology/dialign2/dialign2-2.2.1-r1.ebuild b/sci-biology/dialign2/dialign2-2.2.1-r1.ebuild
index 13b56b66c37b..264c43a03c17 100644
--- a/sci-biology/dialign2/dialign2-2.2.1-r1.ebuild
+++ b/sci-biology/dialign2/dialign2-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dialign_package"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.1-fix-build-system.patch
diff --git a/sci-biology/elph/elph-1.0.1-r3.ebuild b/sci-biology/elph/elph-1.0.1-r3.ebuild
index 6a0f6b28e6cb..e0ac9eece3b5 100644
--- a/sci-biology/elph/elph-1.0.1-r3.ebuild
+++ b/sci-biology/elph/elph-1.0.1-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN^^}/sources"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.1-fix-build-system.patch
diff --git a/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660-r1.ebuild b/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660-r1.ebuild
index 40dafb6bb62c..d2a1341fe194 100644
--- a/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660-r1.ebuild
+++ b/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Applications from the CBS group"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/CBSTOOLS-1.0.0.650"
 PATCHES=( "${FILESDIR}"/${PN}-1.0.0.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-clustalomega/embassy-clustalomega-1.1.0.660-r1.ebuild b/sci-biology/embassy-clustalomega/embassy-clustalomega-1.1.0.660-r1.ebuild
index 600b75769e5f..ad0926d1d2f4 100644
--- a/sci-biology/embassy-clustalomega/embassy-clustalomega-1.1.0.660-r1.ebuild
+++ b/sci-biology/embassy-clustalomega/embassy-clustalomega-1.1.0.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Clustal Omega - Multiple Sequence Alignment"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sci-biology/clustal-omega"
 
diff --git a/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.660-r1.ebuild b/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.660-r1.ebuild
index affd53e8a3b4..98e38b44b0b0 100644
--- a/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.660-r1.ebuild
+++ b/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Protein domain analysis add-on package"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/DOMAINATRIX-0.1.650"
 PATCHES=( "${FILESDIR}"/${PN}-0.1.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-domalign/embassy-domalign-0.1.660-r1.ebuild b/sci-biology/embassy-domalign/embassy-domalign-0.1.660-r1.ebuild
index 106fbd13912b..00f7c7c4468a 100644
--- a/sci-biology/embassy-domalign/embassy-domalign-0.1.660-r1.ebuild
+++ b/sci-biology/embassy-domalign/embassy-domalign-0.1.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Protein domain alignment add-on package"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/DOMALIGN-0.1.650"
 PATCHES=( "${FILESDIR}"/${PN}-0.1.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660-r1.ebuild b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660-r1.ebuild
index 07a16e7e2272..d00a21f42efc 100644
--- a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660-r1.ebuild
+++ b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Protein domain search add-on package"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/DOMSEARCH-0.1.650"
 PATCHES=( "${FILESDIR}"/${PN}-0.1.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-emnu/embassy-emnu-1.05.660-r1.ebuild b/sci-biology/embassy-emnu/embassy-emnu-1.05.660-r1.ebuild
index 8f26aee861c1..33c8039eb166 100644
--- a/sci-biology/embassy-emnu/embassy-emnu-1.05.660-r1.ebuild
+++ b/sci-biology/embassy-emnu/embassy-emnu-1.05.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Simple menu of EMBOSS applications"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/sci-biology/embassy-esim4/embassy-esim4-1.0.0.660-r1.ebuild b/sci-biology/embassy-esim4/embassy-esim4-1.0.0.660-r1.ebuild
index 9da13422f06e..940abbd9e388 100644
--- a/sci-biology/embassy-esim4/embassy-esim4-1.0.0.660-r1.ebuild
+++ b/sci-biology/embassy-esim4/embassy-esim4-1.0.0.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="sim4 - Alignment of cDNA and genomic DNA"
 
 inherit autotools emboss-r3 flag-o-matic
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/ESIM4-1.0.0.650"
 PATCHES=( "${FILESDIR}"/${PN}-1.0.0.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660-r1.ebuild b/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660-r1.ebuild
index 964e637d657c..7f38492396b1 100644
--- a/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660-r1.ebuild
+++ b/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="HMMER wrapper - sequence analysis with profile HMMs"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sci-biology/hmmer:2"
 
diff --git a/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660-r1.ebuild b/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660-r1.ebuild
index 4dd5c3cb354e..0ba710626f5b 100644
--- a/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660-r1.ebuild
+++ b/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="InterProScan motif detection add-on package"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/IPRSCAN-4.3.1.650"
 PATCHES=( "${FILESDIR}"/${PN}-4.3.1.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-mse/embassy-mse-3.0.0.660-r1.ebuild b/sci-biology/embassy-mse/embassy-mse-3.0.0.660-r1.ebuild
index 9b71d99d9e5b..32a91d8b75ba 100644
--- a/sci-biology/embassy-mse/embassy-mse-3.0.0.660-r1.ebuild
+++ b/sci-biology/embassy-mse/embassy-mse-3.0.0.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="MSE - Multiple Sequence Screen Editor"
 
 inherit autotools emboss-r3 flag-o-matic
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660-r1.ebuild b/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660-r1.ebuild
index 90833621fa75..2adbcda3d6dc 100644
--- a/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660-r1.ebuild
+++ b/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.660-r1.ebuild
@@ -9,7 +9,7 @@ inherit autotools emboss-r3 flag-o-matic
 
 LICENSE+=" free-noncomm"
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/PHYLIPNEW-3.69.650"
 PATCHES=(
diff --git a/sci-biology/embassy-signature/embassy-signature-0.1.660-r1.ebuild b/sci-biology/embassy-signature/embassy-signature-0.1.660-r1.ebuild
index 6f04a1432d9b..61c7792dcd21 100644
--- a/sci-biology/embassy-signature/embassy-signature-0.1.660-r1.ebuild
+++ b/sci-biology/embassy-signature/embassy-signature-0.1.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Protein signature add-on package"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/SIGNATURE-0.1.650"
 PATCHES=( "${FILESDIR}"/${PN}-0.1.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-structure/embassy-structure-0.1.660-r1.ebuild b/sci-biology/embassy-structure/embassy-structure-0.1.660-r1.ebuild
index ba0b94964d2f..022213a391cd 100644
--- a/sci-biology/embassy-structure/embassy-structure-0.1.660-r1.ebuild
+++ b/sci-biology/embassy-structure/embassy-structure-0.1.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Protein structure add-on package"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/STRUCTURE-0.1.650"
 PATCHES=( "${FILESDIR}"/${PN}-0.1.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-topo/embassy-topo-2.0.660-r1.ebuild b/sci-biology/embassy-topo/embassy-topo-2.0.660-r1.ebuild
index 583d93297669..d6cbcd3b920b 100644
--- a/sci-biology/embassy-topo/embassy-topo-2.0.660-r1.ebuild
+++ b/sci-biology/embassy-topo/embassy-topo-2.0.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Transmembrane protein display"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/TOPO-2.0.650"
 PATCHES=( "${FILESDIR}"/${PN}-2.0.650_fix-build-system.patch )
diff --git a/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660-r1.ebuild b/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660-r1.ebuild
index 241194af375e..d7cee6658cf9 100644
--- a/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660-r1.ebuild
+++ b/sci-biology/embassy-vienna/embassy-vienna-1.7.2.660-r1.ebuild
@@ -7,7 +7,7 @@ EBO_DESCRIPTION="Vienna RNA package - RNA folding"
 
 inherit autotools emboss-r3
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/VIENNA-1.7.2.650"
 PATCHES=(
diff --git a/sci-biology/embassy/embassy-6.6.0-r3.ebuild b/sci-biology/embassy/embassy-6.6.0-r3.ebuild
index 63feacc58663..ec357be2f02f 100644
--- a/sci-biology/embassy/embassy-6.6.0-r3.ebuild
+++ b/sci-biology/embassy/embassy-6.6.0-r3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://emboss.sourceforge.net/embassy/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=sci-biology/embassy-cbstools-1.0.0.660
diff --git a/sci-biology/emboss/emboss-6.6.0-r3.ebuild b/sci-biology/emboss/emboss-6.6.0-r3.ebuild
index 5a43c0ff89ef..6f9af21e908a 100644
--- a/sci-biology/emboss/emboss-6.6.0-r3.ebuild
+++ b/sci-biology/emboss/emboss-6.6.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 S="${WORKDIR}/${P^^}"
 
 LICENSE+=" Apache-2.0 GPL-3+ CC-BY-3.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/sci-biology/fasta/fasta-36.3.8h-r1.ebuild b/sci-biology/fasta/fasta-36.3.8h-r1.ebuild
index b811765e502e..3c3f5ebd009a 100644
--- a/sci-biology/fasta/fasta-36.3.8h-r1.ebuild
+++ b/sci-biology/fasta/fasta-36.3.8h-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}36-${MY_PV}"
 
 LICENSE="fasta"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
 IUSE="debug cpu_flags_x86_sse2"
 
 src_prepare() {
diff --git a/sci-biology/fasta/fasta-36.3.8i-r1.ebuild b/sci-biology/fasta/fasta-36.3.8i-r1.ebuild
index 6fa29e9baed1..3c5343e1f042 100644
--- a/sci-biology/fasta/fasta-36.3.8i-r1.ebuild
+++ b/sci-biology/fasta/fasta-36.3.8i-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}36-${MY_PV}"
 
 LICENSE="fasta"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
 IUSE="debug cpu_flags_x86_sse2"
 
 PATCHES=(
diff --git a/sci-biology/fasta/fasta-36.3.8i.ebuild b/sci-biology/fasta/fasta-36.3.8i.ebuild
index 6363b4b56f2d..9e377150e889 100644
--- a/sci-biology/fasta/fasta-36.3.8i.ebuild
+++ b/sci-biology/fasta/fasta-36.3.8i.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}36-${MY_PV}"
 
 LICENSE="fasta"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
 IUSE="debug cpu_flags_x86_sse2"
 
 src_prepare() {
diff --git a/sci-biology/finchtv/finchtv-1.3.1-r3.ebuild b/sci-biology/finchtv/finchtv-1.3.1-r3.ebuild
index d3634ac607b1..717948f8459f 100644
--- a/sci-biology/finchtv/finchtv-1.3.1-r3.ebuild
+++ b/sci-biology/finchtv/finchtv-1.3.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.geospiza.com/finchtv/download/programs/linux/${MY_P}.tar.gz"
 
 LICENSE="finchtv"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-biology/hmmer/hmmer-3.1_beta2-r1.ebuild b/sci-biology/hmmer/hmmer-3.1_beta2-r1.ebuild
index 1bf4096bd67f..cbb524dc3454 100644
--- a/sci-biology/hmmer/hmmer-3.1_beta2-r1.ebuild
+++ b/sci-biology/hmmer/hmmer-3.1_beta2-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_ppc_altivec cpu_flags_x86_sse gsl mpi test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-biology/kallisto/kallisto-0.46.2-r1.ebuild b/sci-biology/kallisto/kallisto-0.46.2-r1.ebuild
index 4183647c8f6c..32a97d6d39df 100644
--- a/sci-biology/kallisto/kallisto-0.46.2-r1.ebuild
+++ b/sci-biology/kallisto/kallisto-0.46.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pachterlab/kallisto.git"
 else
 	SRC_URI="https://github.com/pachterlab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/sci-biology/mafft/mafft-7.490.ebuild b/sci-biology/mafft/mafft-7.490.ebuild
index a5ff0a5764d6..6a77001b1904 100644
--- a/sci-biology/mafft/mafft-7.490.ebuild
+++ b/sci-biology/mafft/mafft-7.490.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}${EXTENSIONS}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/sci-biology/mafft/mafft-7.525.ebuild b/sci-biology/mafft/mafft-7.525.ebuild
index ba7e47368792..5be0faf00dd7 100644
--- a/sci-biology/mafft/mafft-7.525.ebuild
+++ b/sci-biology/mafft/mafft-7.525.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}${EXTENSIONS}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.525-c23.patch
diff --git a/sci-biology/maq/maq-0.7.1-r4.ebuild b/sci-biology/maq/maq-0.7.1-r4.ebuild
index 071640746e9a..63c8ae46d650 100644
--- a/sci-biology/maq/maq-0.7.1-r4.ebuild
+++ b/sci-biology/maq/maq-0.7.1-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="virtual/zlib:="
 DEPEND="${RDEPEND}"
diff --git a/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild b/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
index e53c22a59efc..90f8f1d407b5 100644
--- a/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
+++ b/sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug mpi readline"
 
 DEPEND="
diff --git a/sci-biology/mrbayes/mrbayes-3.2.7.ebuild b/sci-biology/mrbayes/mrbayes-3.2.7.ebuild
index a06087c511c5..9f3f61c7af89 100644
--- a/sci-biology/mrbayes/mrbayes-3.2.7.ebuild
+++ b/sci-biology/mrbayes/mrbayes-3.2.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/NBISweden/MrBayes/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug mpi readline"
 # --with-readline was given, but MPI support requires readline to be disabled.
 REQUIRED_USE="mpi? ( !readline )"
diff --git a/sci-biology/phylip/phylip-3.698.ebuild b/sci-biology/phylip/phylip-3.698.ebuild
index bb295ca95ca1..8c425b1d5add 100644
--- a/sci-biology/phylip/phylip-3.698.ebuild
+++ b/sci-biology/phylip/phylip-3.698.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://evolution.gs.washington.edu/${PN}/download/${P}.zip"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 # 'mix' tool collides with dev-lang/elixir, bug #537514
 RDEPEND="
diff --git a/sci-biology/primer3/primer3-2.3.7-r1.ebuild b/sci-biology/primer3/primer3-2.3.7-r1.ebuild
index 545479b1e158..833db50b0ca3 100644
--- a/sci-biology/primer3/primer3-2.3.7-r1.ebuild
+++ b/sci-biology/primer3/primer3-2.3.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/sci-biology/prints/prints-39.0-r2.ebuild b/sci-biology/prints/prints-39.0-r2.ebuild
index 9fb721842798..ee8a307e0cdb 100644
--- a/sci-biology/prints/prints-39.0-r2.ebuild
+++ b/sci-biology/prints/prints-39.0-r2.ebuild
@@ -13,7 +13,7 @@ LICENSE="public-domain"
 SLOT="0"
 # Minimal build keeps only the indexed files (if applicable) and the
 # documentation. The non-indexed database is not installed.
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="emboss minimal"
 
 BDEPEND="emboss? ( sci-biology/emboss )"
diff --git a/sci-biology/probcons/probcons-1.12-r1.ebuild b/sci-biology/probcons/probcons-1.12-r1.ebuild
index 3f0f2670b7b0..0a1d9b2c1efb 100644
--- a/sci-biology/probcons/probcons-1.12-r1.ebuild
+++ b/sci-biology/probcons/probcons-1.12-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 # Gnuplot is explicitly runtime-only, it's run using system()
 RDEPEND="
diff --git a/sci-biology/profphd/profphd-1.0.40.ebuild b/sci-biology/profphd/profphd-1.0.40.ebuild
index 4f9a16a9fe9d..af3d03321616 100644
--- a/sci-biology/profphd/profphd-1.0.40.ebuild
+++ b/sci-biology/profphd/profphd-1.0.40.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://rostlab.org/profphd/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="
diff --git a/sci-biology/prosite/prosite-2017.02-r1.ebuild b/sci-biology/prosite/prosite-2017.02-r1.ebuild
index a5efbed1626b..e64701106888 100644
--- a/sci-biology/prosite/prosite-2017.02-r1.ebuild
+++ b/sci-biology/prosite/prosite-2017.02-r1.ebuild
@@ -12,7 +12,7 @@ LICENSE="swiss-prot"
 SLOT="0"
 # Minimal build keeps only the indexed files (if applicable).
 # The non-indexed database is not installed.
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="emboss minimal"
 
 BDEPEND="emboss? ( sci-biology/emboss )"
diff --git a/sci-biology/rebase/rebase-1901-r2.ebuild b/sci-biology/rebase/rebase-1901-r2.ebuild
index bd5af08c4e1f..f2a3d9c9988f 100644
--- a/sci-biology/rebase/rebase-1901-r2.ebuild
+++ b/sci-biology/rebase/rebase-1901-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="emboss minimal"
 RESTRICT="binchecks strip"
 
diff --git a/sci-biology/samtools/samtools-1.20.ebuild b/sci-biology/samtools/samtools-1.20.ebuild
index 5e6c295bfb57..a8ef4fe964ff 100644
--- a/sci-biology/samtools/samtools-1.20.ebuild
+++ b/sci-biology/samtools/samtools-1.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sci-biology/samtools/samtools-1.21.ebuild b/sci-biology/samtools/samtools-1.21.ebuild
index 8f07dd8cd7e5..f11e9e81198b 100644
--- a/sci-biology/samtools/samtools-1.21.ebuild
+++ b/sci-biology/samtools/samtools-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sci-biology/samtools/samtools-1.22.1.ebuild b/sci-biology/samtools/samtools-1.22.1.ebuild
index 8f07dd8cd7e5..f11e9e81198b 100644
--- a/sci-biology/samtools/samtools-1.22.1.ebuild
+++ b/sci-biology/samtools/samtools-1.22.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sci-biology/samtools/samtools-1.22.ebuild b/sci-biology/samtools/samtools-1.22.ebuild
index 8f07dd8cd7e5..f11e9e81198b 100644
--- a/sci-biology/samtools/samtools-1.22.ebuild
+++ b/sci-biology/samtools/samtools-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sci-biology/seqan/seqan-3.1.0.ebuild b/sci-biology/seqan/seqan-3.1.0.ebuild
index 0370a4acf4f0..b5a97f2052eb 100644
--- a/sci-biology/seqan/seqan-3.1.0.ebuild
+++ b/sci-biology/seqan/seqan-3.1.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/seqan3-${PV}-Source"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_sse4_2"
 REQUIRED_USE="cpu_flags_x86_sse4_2"
 
diff --git a/sci-biology/stride/stride-20011129-r1.ebuild b/sci-biology/stride/stride-20011129-r1.ebuild
index 13bfc8e29073..a2cda0fa34e3 100644
--- a/sci-biology/stride/stride-20011129-r1.ebuild
+++ b/sci-biology/stride/stride-20011129-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="STRIDE"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 RESTRICT="mirror bindist"
 
 S="${WORKDIR}"
diff --git a/sci-biology/stride/stride-20060723.ebuild b/sci-biology/stride/stride-20060723.ebuild
index 45c2f457468b..5938a8bfda5f 100644
--- a/sci-biology/stride/stride-20060723.ebuild
+++ b/sci-biology/stride/stride-20060723.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://webclu.bio.wzw.tum.de/stride/${PN}.tar.gz -> ${PN}-${UPSTREAM_V
 
 LICENSE="STRIDE"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 RESTRICT="mirror bindist"
 
 S="${WORKDIR}"
diff --git a/sci-biology/t-coffee/t-coffee-11.00-r3.ebuild b/sci-biology/t-coffee/t-coffee-11.00-r3.ebuild
index 89966a0580d2..94ed806184d3 100644
--- a/sci-biology/t-coffee/t-coffee-11.00-r3.ebuild
+++ b/sci-biology/t-coffee/t-coffee-11.00-r3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	sci-biology/clustalw
diff --git a/sci-biology/tree-puzzle/tree-puzzle-5.2-r1.ebuild b/sci-biology/tree-puzzle/tree-puzzle-5.2-r1.ebuild
index e6b7b6f4a903..f92bac116720 100644
--- a/sci-biology/tree-puzzle/tree-puzzle-5.2-r1.ebuild
+++ b/sci-biology/tree-puzzle/tree-puzzle-5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tree-puzzle.de/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mpi"
 RESTRICT="test"
 
diff --git a/sci-biology/uchime/uchime-4.2.40-r1.ebuild b/sci-biology/uchime/uchime-4.2.40-r1.ebuild
index 348d8106d270..4ef6189ea65b 100644
--- a/sci-biology/uchime/uchime-4.2.40-r1.ebuild
+++ b/sci-biology/uchime/uchime-4.2.40-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND=">=dev-build/cmake-3.31"
 
diff --git a/sci-biology/update-blastdb/update-blastdb-12.0.0.ebuild b/sci-biology/update-blastdb/update-blastdb-12.0.0.ebuild
index 293055ff1633..b53a64bbadda 100644
--- a/sci-biology/update-blastdb/update-blastdb-12.0.0.ebuild
+++ b/sci-biology/update-blastdb/update-blastdb-12.0.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sci-calculators/calcoo/calcoo-1.3.18-r2.ebuild b/sci-calculators/calcoo/calcoo-1.3.18-r2.ebuild
index 393a86de5ca1..e76fc87fed83 100644
--- a/sci-calculators/calcoo/calcoo-1.3.18-r2.ebuild
+++ b/sci-calculators/calcoo/calcoo-1.3.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/sci-calculators/galculator/galculator-2.1.4-r2.ebuild b/sci-calculators/galculator/galculator-2.1.4-r2.ebuild
index cb638127954e..63280a6218b8 100644
--- a/sci-calculators/galculator/galculator-2.1.4-r2.ebuild
+++ b/sci-calculators/galculator/galculator-2.1.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
index d237345158d7..30a93b7aafcf 100644
--- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jlec/hcalc/archive/refs/tags/${PV}.tar.gz -> ${P}.gh
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild
index 978dce5e40d8..8e01d5a4d20b 100644
--- a/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild
+++ b/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/sci-calculators/pcalc/pcalc-4.ebuild b/sci-calculators/pcalc/pcalc-4.ebuild
index 1bcab03f95e8..fb0d698e59d7 100644
--- a/sci-calculators/pcalc/pcalc-4.ebuild
+++ b/sci-calculators/pcalc/pcalc-4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="app-alternatives/lex"
 
diff --git a/sci-calculators/pcalc/pcalc-5.ebuild b/sci-calculators/pcalc/pcalc-5.ebuild
index baab316959c6..db26b2766c67 100644
--- a/sci-calculators/pcalc/pcalc-5.ebuild
+++ b/sci-calculators/pcalc/pcalc-5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 BDEPEND="app-alternatives/lex"
 
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-5.7.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-5.7.0.ebuild
index 82ab4737e55c..a9ff27d54782 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-5.7.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-5.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
 
 RDEPEND="dev-libs/glib:2
 	>=sci-libs/libqalculate-${PV}:=
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.0.ebuild
index 91844fafdd1a..eb88e65c3642 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-libs/glib:2
 	>=sci-libs/libqalculate-${PV}:=
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.1.ebuild
index 91844fafdd1a..eb88e65c3642 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-libs/glib:2
 	>=sci-libs/libqalculate-${PV}:=
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.2.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.2.ebuild
index 91844fafdd1a..eb88e65c3642 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.2.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-5.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-libs/glib:2
 	>=sci-libs/libqalculate-${PV}:=
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0_p20241202.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0_p20241202.ebuild
index 29ddfe9faba7..35fbab257ced 100644
--- a/sci-calculators/speedcrunch/speedcrunch-0.12.0_p20241202.ebuild
+++ b/sci-calculators/speedcrunch/speedcrunch-0.12.0_p20241202.ebuild
@@ -14,7 +14,7 @@ CMAKE_USE_DIR="${S}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	dev-qt/qtbase:6[gui,widgets]
diff --git a/sci-calculators/tiemu/tiemu-3.03-r2.ebuild b/sci-calculators/tiemu/tiemu-3.03-r2.ebuild
index 6c97f027df6c..7218f5588f61 100644
--- a/sci-calculators/tiemu/tiemu-3.03-r2.ebuild
+++ b/sci-calculators/tiemu/tiemu-3.03-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://repo.calcforge.org/debian/source/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="dbus nls sdl threads xinerama"
 
 RDEPEND="
diff --git a/sci-calculators/tilp2/tilp2-1.18-r1.ebuild b/sci-calculators/tilp2/tilp2-1.18-r1.ebuild
index 065cac129370..f56e01058e75 100644
--- a/sci-calculators/tilp2/tilp2-1.18-r1.ebuild
+++ b/sci-calculators/tilp2/tilp2-1.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/sci-calculators/transcalc/transcalc-0.14-r3.ebuild b/sci-calculators/transcalc/transcalc-0.14-r3.ebuild
index cf095ae6a15c..ef1faf80e923 100644
--- a/sci-calculators/transcalc/transcalc-0.14-r3.ebuild
+++ b/sci-calculators/transcalc/transcalc-0.14-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://transcalc.sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/sci-calculators/transcalc/transcalc-0.14.1.ebuild b/sci-calculators/transcalc/transcalc-0.14.1.ebuild
index 740af2f44262..2b250d46ef83 100644
--- a/sci-calculators/transcalc/transcalc-0.14.1.ebuild
+++ b/sci-calculators/transcalc/transcalc-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/oss-abandonware/sci-calculators/transcalc/-/archive/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/sci-calculators/units/units-2.24.ebuild b/sci-calculators/units/units-2.24.ebuild
index 02f2ed25b350..bbef606fcd64 100644
--- a/sci-calculators/units/units-2.24.ebuild
+++ b/sci-calculators/units/units-2.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="+units-cur"
 REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-calculators/wcalc/wcalc-2.5.ebuild b/sci-calculators/wcalc/wcalc-2.5.ebuild
index aafa6ea6617a..68c455a3859c 100644
--- a/sci-calculators/wcalc/wcalc-2.5.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/w-calc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
 IUSE="readline"
 
 RDEPEND="
diff --git a/sci-chemistry/MDAnalysis/MDAnalysis-2.9.0.ebuild b/sci-chemistry/MDAnalysis/MDAnalysis-2.9.0.ebuild
index 9e652df57daf..b88dc133f036 100644
--- a/sci-chemistry/MDAnalysis/MDAnalysis-2.9.0.ebuild
+++ b/sci-chemistry/MDAnalysis/MDAnalysis-2.9.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="~amd64"
 
 # TODO: fix this
 # ImportError: MDAnalysis not installed properly. This can happen if your C extensions have not been built.
diff --git a/sci-chemistry/avogadro2/avogadro2-1.101.0.ebuild b/sci-chemistry/avogadro2/avogadro2-1.101.0.ebuild
index 1067bc1660d7..31c90a59a6bb 100644
--- a/sci-chemistry/avogadro2/avogadro2-1.101.0.ebuild
+++ b/sci-chemistry/avogadro2/avogadro2-1.101.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc vtk"
 
 RDEPEND="
diff --git a/sci-chemistry/avogadro2/avogadro2-1.102.1.ebuild b/sci-chemistry/avogadro2/avogadro2-1.102.1.ebuild
index 688272c71d74..7a05a19e2a26 100644
--- a/sci-chemistry/avogadro2/avogadro2-1.102.1.ebuild
+++ b/sci-chemistry/avogadro2/avogadro2-1.102.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4-r2.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4-r2.ebuild
index 4ea06af7f3d8..1d96423e269c 100644
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4-r2.ebuild
+++ b/sci-chemistry/cara-bin/cara-bin-1.8.4-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.nmr.ch"
 
 LICENSE="CARA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	!prefix? (
diff --git a/sci-chemistry/clashlist/clashlist-3.17-r1.ebuild b/sci-chemistry/clashlist/clashlist-3.17-r1.ebuild
index c12d54790aff..93a119fb6439 100644
--- a/sci-chemistry/clashlist/clashlist-3.17-r1.ebuild
+++ b/sci-chemistry/clashlist/clashlist-3.17-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/molprobity-${PV}.tgz"
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=sci-chemistry/cluster-1.3.081231-r1
diff --git a/sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild b/sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild
index 16ac8ce40728..d48243b944d8 100644
--- a/sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild
+++ b/sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}1.3src
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-ldflags.patch
diff --git a/sci-chemistry/cluster/cluster-1.3.081231-r2.ebuild b/sci-chemistry/cluster/cluster-1.3.081231-r2.ebuild
index 3064f911fd89..50bc89dc75f4 100644
--- a/sci-chemistry/cluster/cluster-1.3.081231-r2.ebuild
+++ b/sci-chemistry/cluster/cluster-1.3.081231-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}1.3src
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-ldflags.patch
diff --git a/sci-chemistry/dssp/dssp-2.2.1-r3.ebuild b/sci-chemistry/dssp/dssp-2.2.1-r3.ebuild
index d2652592ff6e..2aa55a52cf95 100644
--- a/sci-chemistry/dssp/dssp-2.2.1-r3.ebuild
+++ b/sci-chemistry/dssp/dssp-2.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cmbi.ru.nl/pub/molbio/software/dssp-2/${P}.tgz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-libs/boost:=[bzip2,zlib]"
 DEPEND="${RDEPEND}"
diff --git a/sci-chemistry/easychem/easychem-0.6-r2.ebuild b/sci-chemistry/easychem/easychem-0.6-r2.ebuild
index dabd4d0dee87..a4655e28aea5 100644
--- a/sci-chemistry/easychem/easychem-0.6-r2.ebuild
+++ b/sci-chemistry/easychem/easychem-0.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/easychem/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/sci-chemistry/gromacs/gromacs-2023.5.ebuild b/sci-chemistry/gromacs/gromacs-2023.5.ebuild
index 4c74edb98dca..405f6ed0d6e2 100644
--- a/sci-chemistry/gromacs/gromacs-2023.5.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2023.5.ebuild
@@ -26,7 +26,7 @@ else
 		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
 	# since 2022 arm support was dropped (but not arm64)
-	KEYWORDS="amd64 -arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="amd64 -arm arm64 ~x86 ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/gromacs/gromacs-2024.6.ebuild b/sci-chemistry/gromacs/gromacs-2024.6.ebuild
index 166c99a239a8..0224c088e4b5 100644
--- a/sci-chemistry/gromacs/gromacs-2024.6.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2024.6.ebuild
@@ -26,7 +26,7 @@ else
 		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
 	# since 2022 arm support was dropped (but not arm64)
-	KEYWORDS="amd64 -arm arm64 ~riscv -x86 ~amd64-linux -x86-linux ~x64-macos"
+	KEYWORDS="amd64 -arm arm64 ~riscv -x86 ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/gromacs/gromacs-2025.3.ebuild b/sci-chemistry/gromacs/gromacs-2025.3.ebuild
index 22492aa5e430..17f4c9ff483c 100644
--- a/sci-chemistry/gromacs/gromacs-2025.3.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2025.3.ebuild
@@ -27,7 +27,7 @@ else
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
 	# since 2022 arm support was dropped (but not arm64)
 	# since 2025 x86-32 support was dropped
-	KEYWORDS="amd64 -arm arm64 ~riscv -x86 ~amd64-linux -x86-linux ~x64-macos"
+	KEYWORDS="amd64 -arm arm64 ~riscv -x86 ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/gromacs/gromacs-2025.4.ebuild b/sci-chemistry/gromacs/gromacs-2025.4.ebuild
index 3ec2e6737603..2a646c82847f 100644
--- a/sci-chemistry/gromacs/gromacs-2025.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2025.4.ebuild
@@ -27,7 +27,7 @@ else
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
 	# since 2022 arm support was dropped (but not arm64)
 	# since 2025 x86-32 support was dropped
-	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~amd64-linux -x86-linux ~x64-macos"
+	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/gromacs/gromacs-2025.9999.ebuild b/sci-chemistry/gromacs/gromacs-2025.9999.ebuild
index 3ec2e6737603..2a646c82847f 100644
--- a/sci-chemistry/gromacs/gromacs-2025.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2025.9999.ebuild
@@ -27,7 +27,7 @@ else
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
 	# since 2022 arm support was dropped (but not arm64)
 	# since 2025 x86-32 support was dropped
-	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~amd64-linux -x86-linux ~x64-macos"
+	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/gromacs/gromacs-2026.9999.ebuild b/sci-chemistry/gromacs/gromacs-2026.9999.ebuild
index 39d1b28d5525..1cdfe3442bfa 100644
--- a/sci-chemistry/gromacs/gromacs-2026.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2026.9999.ebuild
@@ -27,7 +27,7 @@ else
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
 	# since 2022 arm support was dropped (but not arm64)
 	# since 2025 x86-32 support was dropped
-	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~amd64-linux -x86-linux ~x64-macos"
+	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/gromacs/gromacs-2026_beta.ebuild b/sci-chemistry/gromacs/gromacs-2026_beta.ebuild
index 39d1b28d5525..1cdfe3442bfa 100644
--- a/sci-chemistry/gromacs/gromacs-2026_beta.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2026_beta.ebuild
@@ -27,7 +27,7 @@ else
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
 	# since 2022 arm support was dropped (but not arm64)
 	# since 2025 x86-32 support was dropped
-	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~amd64-linux -x86-linux ~x64-macos"
+	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 39d1b28d5525..1cdfe3442bfa 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -27,7 +27,7 @@ else
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
 	# since 2022 arm support was dropped (but not arm64)
 	# since 2025 x86-32 support was dropped
-	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~amd64-linux -x86-linux ~x64-macos"
+	KEYWORDS="~amd64 -arm ~arm64 ~riscv -x86 ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/ksdssp/ksdssp-040728-r1.ebuild b/sci-chemistry/ksdssp/ksdssp-040728-r1.ebuild
index 118f15c3c2d6..0b787554f7ed 100644
--- a/sci-chemistry/ksdssp/ksdssp-040728-r1.ebuild
+++ b/sci-chemistry/ksdssp/ksdssp-040728-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.shar"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sci-libs/libpdb++"
 DEPEND="${RDEPEND}"
diff --git a/sci-chemistry/mdtraj/mdtraj-1.10.3.ebuild b/sci-chemistry/mdtraj/mdtraj-1.10.3.ebuild
index 6a7c706a5ab2..8800d03f4805 100644
--- a/sci-chemistry/mdtraj/mdtraj-1.10.3.ebuild
+++ b/sci-chemistry/mdtraj/mdtraj-1.10.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.g
 LICENSE="LGPL-2.1+"
 
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
index ed84f5e1f229..65272b35cf77 100644
--- a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
+++ b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.earth.ox.ac.uk/pub/keith/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r10.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r10.ebuild
index f80fe103893f..045af390992a 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r10.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r10.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	|| (
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
index e5db4c43dd0d..508f37f78209 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	|| (
diff --git a/sci-chemistry/molsketch/molsketch-0.8.3.ebuild b/sci-chemistry/molsketch/molsketch-0.8.3.ebuild
index 305ab25e38f4..50ba01864559 100644
--- a/sci-chemistry/molsketch/molsketch-0.8.3.ebuild
+++ b/sci-chemistry/molsketch/molsketch-0.8.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="openbabel"
 
 DEPEND="
diff --git a/sci-chemistry/molsketch/molsketch-0.8.4.ebuild b/sci-chemistry/molsketch/molsketch-0.8.4.ebuild
index 305ab25e38f4..50ba01864559 100644
--- a/sci-chemistry/molsketch/molsketch-0.8.4.ebuild
+++ b/sci-chemistry/molsketch/molsketch-0.8.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="openbabel"
 
 DEPEND="
diff --git a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
index a0478e93e178..1994e41d15c5 100644
--- a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
+++ b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="MSMS"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="fetch"
 
 S="${WORKDIR}"
diff --git a/sci-chemistry/mustang/mustang-3.2.2.ebuild b/sci-chemistry/mustang/mustang-3.2.2.ebuild
index 8498b362b7bd..99b831fda7e2 100644
--- a/sci-chemistry/mustang/mustang-3.2.2.ebuild
+++ b/sci-chemistry/mustang/mustang-3.2.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.2.1-gcc-4.7.patch )
 
diff --git a/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r2.ebuild b/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r2.ebuild
index 9cf2783b1c88..68911e4bf286 100644
--- a/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r2.ebuild
+++ b/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r2.ebuild
@@ -25,7 +25,7 @@ else
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${MY_P}"
 	fi
-	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r4.ebuild b/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r4.ebuild
index 3cdff229163a..490497e7522d 100644
--- a/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r4.ebuild
+++ b/sci-chemistry/openbabel/openbabel-3.1.1_p20241221-r4.ebuild
@@ -26,7 +26,7 @@ else
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${MY_P}"
 	fi
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-chemistry/openbabel/openbabel-9999.ebuild b/sci-chemistry/openbabel/openbabel-9999.ebuild
index 28faa9fa1bf0..064a3f75bd14 100644
--- a/sci-chemistry/openbabel/openbabel-9999.ebuild
+++ b/sci-chemistry/openbabel/openbabel-9999.ebuild
@@ -26,7 +26,7 @@ else
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${MY_P}"
 	fi
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-chemistry/pdbcat/pdbcat-1.3-r1.ebuild b/sci-chemistry/pdbcat/pdbcat-1.3-r1.ebuild
index 7dbc33d2452b..c07ab32f95f6 100644
--- a/sci-chemistry/pdbcat/pdbcat-1.3-r1.ebuild
+++ b/sci-chemistry/pdbcat/pdbcat-1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ks.uiuc.edu/Development/MDTools/${PN}/files/${P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND=">=dev-build/cmake-3.31"
 
diff --git a/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild b/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
index cd155ac0f067..fe20291abf7e 100644
--- a/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
+++ b/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${PN}.${PV}.perl.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/sci-chemistry/pdbmat/pdbmat-3.89-r1.ebuild b/sci-chemistry/pdbmat/pdbmat-3.89-r1.ebuild
index 4f475ed55bc7..500893811395 100644
--- a/sci-chemistry/pdbmat/pdbmat-3.89-r1.ebuild
+++ b/sci-chemistry/pdbmat/pdbmat-3.89-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/Source_ENM2011
 
 LICENSE="CeCILL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 BDEPEND=">=dev-build/cmake-3.31"
diff --git a/sci-chemistry/probe/probe-2.13.110909.ebuild b/sci-chemistry/probe/probe-2.13.110909.ebuild
index 8952bea3d39d..feb69db12cec 100644
--- a/sci-chemistry/probe/probe-2.13.110909.ebuild
+++ b/sci-chemistry/probe/probe-2.13.110909.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/probe/${MY_P}.src.z
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x64-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/sci-chemistry/propka/propka-3.5.1.ebuild b/sci-chemistry/propka/propka-3.5.1.ebuild
index c15200815306..a896324a4d3a 100644
--- a/sci-chemistry/propka/propka-3.5.1.ebuild
+++ b/sci-chemistry/propka/propka-3.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jensengroup/propka/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
 
diff --git a/sci-chemistry/pymol/pymol-3.1.0-r1.ebuild b/sci-chemistry/pymol/pymol-3.1.0-r1.ebuild
index 02476251b5f1..63e4db5f0465 100644
--- a/sci-chemistry/pymol/pymol-3.1.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-3.1.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-open-source-${PV}
 
 LICENSE="BitstreamVera BSD freedist HPND MIT-0 OFL-1.0 public-domain UoI-NCSA" #844991
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="+netcdf web"
 
 DEPEND="
diff --git a/sci-chemistry/raster3d/raster3d-3.0.6-r1.ebuild b/sci-chemistry/raster3d/raster3d-3.0.6-r1.ebuild
index d51de4772631..7cc100f6265f 100644
--- a/sci-chemistry/raster3d/raster3d-3.0.6-r1.ebuild
+++ b/sci-chemistry/raster3d/raster3d-3.0.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.bmsc.washington.edu/${PN}/${MY_P}.tar.gz -> ${MY_P}.tar"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gd tiff"
 
 RDEPEND="
diff --git a/sci-chemistry/suitename/suitename-0.3.070628.ebuild b/sci-chemistry/suitename/suitename-0.3.070628.ebuild
index 2243ccf61e55..093b81550da7 100644
--- a/sci-chemistry/suitename/suitename-0.3.070628.ebuild
+++ b/sci-chemistry/suitename/suitename-0.3.070628.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.t
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-chemistry/surf/surf-1.0.ebuild b/sci-chemistry/surf/surf-1.0.ebuild
index e23c02d7351e..4113c7a1d0ed 100644
--- a/sci-chemistry/surf/surf-1.0.ebuild
+++ b/sci-chemistry/surf/surf-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ks.uiuc.edu/Research/vmd/extsrcs/surf.tar.Z -> ${P}.tar.Z"
 
 LICENSE="SURF"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="!www-client/surf"
 
diff --git a/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild b/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
index fe012719670a..4149ed4f3cba 100644
--- a/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
+++ b/sci-chemistry/theseus/theseus-3.3.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}_src
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/sci-chemistry/threeV/threeV-1.2-r2.ebuild b/sci-chemistry/threeV/threeV-1.2-r2.ebuild
index 961b882887f2..084ddb5ad0ad 100644
--- a/sci-chemistry/threeV/threeV-1.2-r2.ebuild
+++ b/sci-chemistry/threeV/threeV-1.2-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/3v-${PV}/src
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PDEPEND="sci-chemistry/msms-bin"
 #	sci-chemistry/usf-rave"
diff --git a/sci-chemistry/tinker/tinker-8.2.1-r1.ebuild b/sci-chemistry/tinker/tinker-8.2.1-r1.ebuild
index 8689a962c2fd..feb65912d0bf 100644
--- a/sci-chemistry/tinker/tinker-8.2.1-r1.ebuild
+++ b/sci-chemistry/tinker/tinker-8.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dasher.wustl.edu/${PN}/downloads/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Tinker"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 RESTRICT="mirror"
 
diff --git a/sci-chemistry/tm-align/tm-align-20150914-r1.ebuild b/sci-chemistry/tm-align/tm-align-20150914-r1.ebuild
index 1dd858d1b60e..3c1703b2e69d 100644
--- a/sci-chemistry/tm-align/tm-align-20150914-r1.ebuild
+++ b/sci-chemistry/tm-align/tm-align-20150914-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools${PV}.tar.gz"
 
 LICENSE="tm-align"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="custom-cflags"
 
 BDEPEND=">=dev-build/cmake-3.28"
diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha57-r4.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r4.ebuild
index 04807d2e51a2..a918e7d07c51 100644
--- a/sci-chemistry/vmd/vmd-1.9.4_alpha57-r4.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r4.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="vmd"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sci-chemistry/votca/votca-2022.1-r1.ebuild b/sci-chemistry/votca/votca-2022.1-r1.ebuild
index 88d3c6a469fb..e71b05957714 100644
--- a/sci-chemistry/votca/votca-2022.1-r1.ebuild
+++ b/sci-chemistry/votca/votca-2022.1-r1.ebuild
@@ -16,7 +16,7 @@ else
 		MY_PV="${PV}"
 	fi
 	SRC_URI="https://github.com/votca/votca/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/votca-${MY_PV}"
 fi
 
diff --git a/sci-chemistry/votca/votca-9999.ebuild b/sci-chemistry/votca/votca-9999.ebuild
index 88d3c6a469fb..e71b05957714 100644
--- a/sci-chemistry/votca/votca-9999.ebuild
+++ b/sci-chemistry/votca/votca-9999.ebuild
@@ -16,7 +16,7 @@ else
 		MY_PV="${PV}"
 	fi
 	SRC_URI="https://github.com/votca/votca/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/votca-${MY_PV}"
 fi
 
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild
index b186d1f80669..df1e678281f6 100644
--- a/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc examples fasttree fatlines judy lzma packed tcl"
 
 RDEPEND="
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild
index 81dc6df0bd21..c98bdd9fb806 100644
--- a/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-gtk3-${PV}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc examples fasttree judy lzma packed tcl"
 
 RDEPEND="
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.121.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.121.ebuild
index 96fbfc7198cf..c2b601f8a17f 100644
--- a/sci-electronics/gtkwave/gtkwave-3.3.121.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.121.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-gtk3-${PV}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc examples fasttree judy lzma packed tcl"
 
 RDEPEND="
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.125.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.125.ebuild
index 4327cbfdf3d0..bdbcdafa5b8d 100644
--- a/sci-electronics/gtkwave/gtkwave-3.3.125.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.125.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+ MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="fasttree judy lzma tcl wayland X"
 
 RDEPEND="
diff --git a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
index 37c8476bd8c1..f6c47291517d 100644
--- a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
+++ b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
index dd460de1633c..56d9d254b6ed 100644
--- a/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
+++ b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="+data"
 
 RDEPEND="sci-libs/netcdf:=
diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild
index 334da7ca6c97..9af2e0c8e2a8 100644
--- a/sci-libs/adolc/adolc-2.7.2.ebuild
+++ b/sci-libs/adolc/adolc-2.7.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
diff --git a/sci-libs/adolc/adolc-9999.ebuild b/sci-libs/adolc/adolc-9999.ebuild
index e1a91e15ab7d..fb5191c1fd6f 100644
--- a/sci-libs/adolc/adolc-9999.ebuild
+++ b/sci-libs/adolc/adolc-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2"
 else
 	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
diff --git a/sci-libs/alglib/alglib-3.20.0.ebuild b/sci-libs/alglib/alglib-3.20.0.ebuild
index 37ab04d69a7c..67388b9d5192 100644
--- a/sci-libs/alglib/alglib-3.20.0.ebuild
+++ b/sci-libs/alglib/alglib-3.20.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-cpp
 
 LICENSE="GPL-2+"
 SLOT="0/${ALGLIB_SOVER}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild
index 6d1d7187d30b..f6f0398d0036 100644
--- a/sci-libs/amd/amd-2.4.6-r1.ebuild
+++ b/sci-libs/amd/amd-2.4.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/amd/amd-3.0.3.ebuild b/sci-libs/amd/amd-3.0.3.ebuild
index e71c356904de..07bbb79d35b4 100644
--- a/sci-libs/amd/amd-3.0.3.ebuild
+++ b/sci-libs/amd/amd-3.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc fortran test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/arborx/arborx-1.4.1-r1.ebuild b/sci-libs/arborx/arborx-1.4.1-r1.ebuild
index 7046713d6397..062b94eb159d 100644
--- a/sci-libs/arborx/arborx-1.4.1-r1.ebuild
+++ b/sci-libs/arborx/arborx-1.4.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/arborx/ArborX"
 
 SRC_URI="https://github.com/${PN}/ArborX/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/sci-libs/arborx/arborx-1.6.ebuild b/sci-libs/arborx/arborx-1.6.ebuild
index 7046713d6397..062b94eb159d 100644
--- a/sci-libs/arborx/arborx-1.6.ebuild
+++ b/sci-libs/arborx/arborx-1.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/arborx/ArborX"
 
 SRC_URI="https://github.com/${PN}/ArborX/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/sci-libs/arborx/arborx-2.0.ebuild b/sci-libs/arborx/arborx-2.0.ebuild
index 7046713d6397..062b94eb159d 100644
--- a/sci-libs/arborx/arborx-2.0.ebuild
+++ b/sci-libs/arborx/arborx-2.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/arborx/ArborX"
 
 SRC_URI="https://github.com/${PN}/ArborX/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/sci-libs/armadillo/armadillo-14.6.1.ebuild b/sci-libs/armadillo/armadillo-14.6.1.ebuild
index 2de81c98e2b4..47618e4259ef 100644
--- a/sci-libs/armadillo/armadillo-14.6.1.ebuild
+++ b/sci-libs/armadillo/armadillo-14.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/arma/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0/14"
-KEYWORDS="amd64 ~arm ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc64 ~riscv ~x86"
 IUSE="arpack blas doc examples lapack mkl superlu test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( arpack lapack superlu )"
diff --git a/sci-libs/armadillo/armadillo-15.0.3.ebuild b/sci-libs/armadillo/armadillo-15.0.3.ebuild
index c686389531ce..f5beecc62bf8 100644
--- a/sci-libs/armadillo/armadillo-15.0.3.ebuild
+++ b/sci-libs/armadillo/armadillo-15.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/arma/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86"
 IUSE="arpack blas doc examples lapack mkl superlu test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( arpack lapack superlu )"
diff --git a/sci-libs/arpack/arpack-3.9.1.ebuild b/sci-libs/arpack/arpack-3.9.1.ebuild
index 66631f31c328..ca8b03036436 100644
--- a/sci-libs/arpack/arpack-3.9.1.ebuild
+++ b/sci-libs/arpack/arpack-3.9.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 	S="${WORKDIR}/${PN}-ng-${PV}"
 fi
 
diff --git a/sci-libs/arpack/arpack-9999.ebuild b/sci-libs/arpack/arpack-9999.ebuild
index fe6e1f3d2ed3..64eb36577fa9 100644
--- a/sci-libs/arpack/arpack-9999.ebuild
+++ b/sci-libs/arpack/arpack-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-ng-${PV}"
 fi
 
diff --git a/sci-libs/arprec/arprec-2.2.19-r1.ebuild b/sci-libs/arprec/arprec-2.2.19-r1.ebuild
index dc6ff68e1078..dc4ef87c5d2d 100644
--- a/sci-libs/arprec/arprec-2.2.19-r1.ebuild
+++ b/sci-libs/arprec/arprec-2.2.19-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran qd static-libs"
 
 DEPEND="qd? ( sci-libs/qd[fortran=] )"
diff --git a/sci-libs/atlas/atlas-3.10.2-r1.ebuild b/sci-libs/atlas/atlas-3.10.2-r1.ebuild
index 1d8a2f4ec8b5..9e2f108c2d25 100644
--- a/sci-libs/atlas/atlas-3.10.2-r1.ebuild
+++ b/sci-libs/atlas/atlas-3.10.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/ATLAS"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc fortran generic lapack static-libs threads"
 
 PATCHES=(
diff --git a/sci-libs/atlas/atlas-3.10.3.ebuild b/sci-libs/atlas/atlas-3.10.3.ebuild
index bfc8649524d5..e61e62043130 100644
--- a/sci-libs/atlas/atlas-3.10.3.ebuild
+++ b/sci-libs/atlas/atlas-3.10.3.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/ATLAS"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc fortran generic lapack static-libs threads"
 
 PATCHES=(
diff --git a/sci-libs/atlas/atlas-3.11.41.ebuild b/sci-libs/atlas/atlas-3.11.41.ebuild
index 11c0dcbca6b9..d618e5d433fc 100644
--- a/sci-libs/atlas/atlas-3.11.41.ebuild
+++ b/sci-libs/atlas/atlas-3.11.41.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/ATLAS"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc fortran generic lapack static-libs threads"
 
 PATCHES=(
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.101.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.101.0.ebuild
index 59fd5a6fae8e..ce4a2a207b3c 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.101.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.101.0.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="archive doc hdf5 qt6 spglib static-libs test vtk"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.102.1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.102.1.ebuild
index cbc941fd69cf..e4fd6a5eaef6 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.102.1.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.102.1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="archive doc hdf5 python qt6 spglib static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/sci-libs/bliss/bliss-0.77-r1.ebuild b/sci-libs/bliss/bliss-0.77-r1.ebuild
index 19c3cb3354c7..1c7aa11b8eb3 100644
--- a/sci-libs/bliss/bliss-0.77-r1.ebuild
+++ b/sci-libs/bliss/bliss-0.77-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://users.aalto.fi/~tjunttil/bliss/index.html"
 
 LICENSE="LGPL-3"
 SLOT="0/1"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="gmp"
 
 RDEPEND="gmp? ( dev-libs/gmp:0= )"
diff --git a/sci-libs/bliss/bliss-0.77.ebuild b/sci-libs/bliss/bliss-0.77.ebuild
index 1d14bb380cb3..eb0197e1eee7 100644
--- a/sci-libs/bliss/bliss-0.77.ebuild
+++ b/sci-libs/bliss/bliss-0.77.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://users.aalto.fi/~tjunttil/bliss/index.html"
 
 LICENSE="LGPL-3"
 SLOT="0/1"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="gmp"
 
 RDEPEND="gmp? ( dev-libs/gmp:0= )"
diff --git a/sci-libs/brial/brial-1.2.12-r1.ebuild b/sci-libs/brial/brial-1.2.12-r1.ebuild
index bccf88a7bfcd..b15eaeea6bb5 100644
--- a/sci-libs/brial/brial-1.2.12-r1.ebuild
+++ b/sci-libs/brial/brial-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2+, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
 IUSE="png"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/brial/brial-1.2.12.ebuild b/sci-libs/brial/brial-1.2.12.ebuild
index 949a5d87445f..4ca29ef40b5f 100644
--- a/sci-libs/brial/brial-1.2.12.ebuild
+++ b/sci-libs/brial/brial-1.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2+, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~x64-macos"
 IUSE="png"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 2f7bc2897098..8d7ae40cbcb9 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="sci-libs/suitesparseconfig"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/btf/btf-2.0.3.ebuild b/sci-libs/btf/btf-2.0.3.ebuild
index f3d679bc9c50..90c81d82ed94 100644
--- a/sci-libs/btf/btf-2.0.3.ebuild
+++ b/sci-libs/btf/btf-2.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/buddy/buddy-2.4-r1.ebuild b/sci-libs/buddy/buddy-2.4-r1.ebuild
index 35d5251e3f4c..15c0cf42fab8 100644
--- a/sci-libs/buddy/buddy-2.4-r1.ebuild
+++ b/sci-libs/buddy/buddy-2.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="buddy"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples"
 
 DOCS=( doc/tech.txt )
diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild
index 76363e8f516e..d483dac57b76 100644
--- a/sci-libs/camd/camd-2.4.6-r1.ebuild
+++ b/sci-libs/camd/camd-2.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/camd/camd-3.0.3.ebuild b/sci-libs/camd/camd-3.0.3.ebuild
index 75df91e1a8e4..21d5a30a4a67 100644
--- a/sci-libs/camd/camd-3.0.3.ebuild
+++ b/sci-libs/camd/camd-3.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild
index 3ea175a98181..9fecf7dfdcd0 100644
--- a/sci-libs/ccfits/ccfits-2.5.ebuild
+++ b/sci-libs/ccfits/ccfits-2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=sci-libs/cfitsio-3.080"
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index 459faeca23a1..bae6b7d44766 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/ccolamd/ccolamd-3.0.3.ebuild b/sci-libs/ccolamd/ccolamd-3.0.3.ebuild
index 5f8485ea2978..aee25e4b1a0b 100644
--- a/sci-libs/ccolamd/ccolamd-3.0.3.ebuild
+++ b/sci-libs/ccolamd/ccolamd-3.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/cddlib/cddlib-094m-r2.ebuild b/sci-libs/cddlib/cddlib-094m-r2.ebuild
index 389961a42c59..c55862ef3f9b 100644
--- a/sci-libs/cddlib/cddlib-094m-r2.ebuild
+++ b/sci-libs/cddlib/cddlib-094m-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86"
 IUSE="doc examples static-libs tools"
 
 DEPEND="dev-libs/gmp:0"
diff --git a/sci-libs/cdf/cdf-3.9.0.ebuild b/sci-libs/cdf/cdf-3.9.0.ebuild
index 9c0cc7667b48..43b9b1b43a9a 100644
--- a/sci-libs/cdf/cdf-3.9.0.ebuild
+++ b/sci-libs/cdf/cdf-3.9.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}-dist"
 
 LICENSE="CDF"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc examples java ncurses static-libs"
 RESTRICT="bindist"
 
diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild b/sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild
index 0266f174e0e4..00558f9c45ae 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz"
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
index 252c02ba10d1..765e8b9f4ac1 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz"
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 )"
 SLOT="0/1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="examples cuda gflags lapack +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
diff --git a/sci-libs/cfitsio/cfitsio-4.6.3.ebuild b/sci-libs/cfitsio/cfitsio-4.6.3.ebuild
index c20e38d983c8..d1e3dd8f2413 100644
--- a/sci-libs/cfitsio/cfitsio-4.6.3.ebuild
+++ b/sci-libs/cfitsio/cfitsio-4.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/10-r1"
-KEYWORDS="~alpha amd64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="bzip2 curl test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
index 4caf7d901289..18a238ea2773 100644
--- a/sci-libs/cgcode/cgcode-1.0-r2.ebuild
+++ b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="virtual/blas"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild b/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild
index 39fb7c61d4a2..109cf1dc8594 100644
--- a/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild
+++ b/sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/CGNS-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0/4"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
 
 RDEPEND="
diff --git a/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild b/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild
index 005290743d5d..2ba39ce71d45 100644
--- a/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild
+++ b/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/CGNS-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
 
 RDEPEND="
diff --git a/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild b/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild
index c72425b12744..8aa6cd794d4c 100644
--- a/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild
+++ b/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/CGNS-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
 
 RDEPEND="
diff --git a/sci-libs/cgnslib/cgnslib-4.5.0.ebuild b/sci-libs/cgnslib/cgnslib-4.5.0.ebuild
index f0b768df97c0..20cb8ab3403a 100644
--- a/sci-libs/cgnslib/cgnslib-4.5.0.ebuild
+++ b/sci-libs/cgnslib/cgnslib-4.5.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/CGNS-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
 
 RDEPEND="
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index 57f650d63d42..a8a60e52059a 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild b/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild
index 11abf0ce20c9..5730171eeff9 100644
--- a/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cholmod/cholmod-4.0.3.ebuild b/sci-libs/cholmod/cholmod-4.0.3.ebuild
index bae640c29fae..062fd9373aa1 100644
--- a/sci-libs/cholmod/cholmod-4.0.3.ebuild
+++ b/sci-libs/cholmod/cholmod-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+cholesky cuda doc openmp +matrixops +modify +partition +supernodal test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild
index 92712ac85a99..7f3296d009ab 100644
--- a/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild
+++ b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RESTRICT="binchecks strip"
 
diff --git a/sci-libs/clblas/clblas-2.12-r2.ebuild b/sci-libs/clblas/clblas-2.12-r2.ebuild
index f5bd23bc31b8..b02a50ef6345 100644
--- a/sci-libs/clblas/clblas-2.12-r2.ebuild
+++ b/sci-libs/clblas/clblas-2.12-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MYPN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/2" # soname version
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="+client examples ktest performance test"
 # the testsuite is hopelessly broken and upstream is pretty much dead
 RESTRICT="test"
diff --git a/sci-libs/clblast/clblast-1.5.2-r1.ebuild b/sci-libs/clblast/clblast-1.5.2-r1.ebuild
index ae12ba33513e..c762f83c6443 100644
--- a/sci-libs/clblast/clblast-1.5.2-r1.ebuild
+++ b/sci-libs/clblast/clblast-1.5.2-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MYPN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86"
 # Cuda is still beta, default to opencl
 IUSE="client cuda examples +opencl test"
 REQUIRED_USE="
diff --git a/sci-libs/clblast/clblast-1.5.2.ebuild b/sci-libs/clblast/clblast-1.5.2.ebuild
index 59f05f82ded7..f2b6e3024b9a 100644
--- a/sci-libs/clblast/clblast-1.5.2.ebuild
+++ b/sci-libs/clblast/clblast-1.5.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MYPN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 # Cuda is still beta, default to opencl
 IUSE="client cuda examples +opencl test"
 REQUIRED_USE="
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 52e47f336db5..8c5d23a1cc04 100644
--- a/sci-libs/cln/cln-1.3.6.ebuild
+++ b/sci-libs/cln/cln-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cln/cln-1.3.7.ebuild b/sci-libs/cln/cln-1.3.7.ebuild
index 9efc54887a82..8b1cdbf743c2 100644
--- a/sci-libs/cln/cln-1.3.7.ebuild
+++ b/sci-libs/cln/cln-1.3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cmpfit/cmpfit-1.4.ebuild b/sci-libs/cmpfit/cmpfit-1.4.ebuild
index 486044b29632..760c939e7e62 100644
--- a/sci-libs/cmpfit/cmpfit-1.4.ebuild
+++ b/sci-libs/cmpfit/cmpfit-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pages.physics.wisc.edu/~craigm/idl/down/${P}.tar.gz"
 
 LICENSE="public-domain minpack"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DOCS=( README DISCLAIMER )
 
diff --git a/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild b/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
index 3a7e7ae257e8..7990f129db7a 100644
--- a/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
+++ b/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/ThirdParty-ASL-releases-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-getrusage.patch"
diff --git a/sci-libs/coinasl/coinasl-2.1.0.ebuild b/sci-libs/coinasl/coinasl-2.1.0.ebuild
index feef2a3e8299..de627e257594 100644
--- a/sci-libs/coinasl/coinasl-2.1.0.ebuild
+++ b/sci-libs/coinasl/coinasl-2.1.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/ThirdParty-ASL-releases-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 src_unpack() {
 	default
diff --git a/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild b/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild
index 97a0d723632a..f93a7c3ce3c0 100644
--- a/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild
+++ b/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/CHiPPS-ALPS-releases-${PV}/Alps"
 
 LICENSE="EPL-1.0"
 SLOT="0" # formerly 0/3, upstream went from so.3 to so.0
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
index 84b5772c1004..ef0440f8bf59 100644
--- a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
+++ b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/Bcp-releases-${PV}/Bcp"
 
 LICENSE="CPL-1.0"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild b/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild
index e38fe634ef0a..6694773c0a97 100644
--- a/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild
+++ b/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/CHiPPS-BiCePS-releases-${PV}/Bcps"
 
 LICENSE="EPL-1.0"
 SLOT="0" # formerly 0/1, upstream went from so.1 to so.0
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild b/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild
index babf843fc556..b8059b07aa52 100644
--- a/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild
+++ b/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/CHiPPS-BLIS-releases-${PV}/Blis"
 
 LICENSE="EPL-1.0"
 SLOT="0" # formerly 0/1, upstream went from so.1 to so.0
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild b/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild
index 22064e140cf8..74947f795312 100644
--- a/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild
+++ b/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/Bonmin-releases-${PV}/Bonmin"
 
 LICENSE="EPL-1.0"
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-cbc/coinor-cbc-2.10.12.ebuild b/sci-libs/coinor-cbc/coinor-cbc-2.10.12.ebuild
index 2ecd3acc5a88..c16aafb21e07 100644
--- a/sci-libs/coinor-cbc/coinor-cbc-2.10.12.ebuild
+++ b/sci-libs/coinor-cbc/coinor-cbc-2.10.12.ebuild
@@ -14,7 +14,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/3"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild b/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild
index 00f1ec0b0c13..84fdeb9e669b 100644
--- a/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild
+++ b/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild
@@ -14,7 +14,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/3"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild b/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild
index 04e61728764d..2d4d83b987d5 100644
--- a/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild
+++ b/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/1"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-cgl/coinor-cgl-0.60.9.ebuild b/sci-libs/coinor-cgl/coinor-cgl-0.60.9.ebuild
index 830c9488ef77..f95e61290e30 100644
--- a/sci-libs/coinor-cgl/coinor-cgl-0.60.9.ebuild
+++ b/sci-libs/coinor-cgl/coinor-cgl-0.60.9.ebuild
@@ -14,7 +14,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/1"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.10.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.10.ebuild
index 89b9d683a4f0..835f1cdf95a9 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.17.10.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.10.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
 
 LICENSE="EPL-1.0"
 SLOT="0/1" # major soname component
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="examples glpk metis mpi mumps sparse static-libs test"
 REQUIRED_USE="mpi? ( mumps )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
index faf13095e74b..2d6f3654b7f5 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
 
 LICENSE="EPL-1.0"
 SLOT="0/1" # major soname component
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="examples glpk metis mpi mumps sparse static-libs test"
 REQUIRED_USE="mpi? ( mumps )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
index c58ce4d26447..0888bf4c426a 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/1"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples glpk metis mumps sparse static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild
index b1e7029b5883..ec3bd428771e 100644
--- a/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild
+++ b/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/Couenne-releases-${PV}/Couenne"
 
 LICENSE="EPL-1.0"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild b/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild
index 89c14acd5dff..f6edabb3ebb2 100644
--- a/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild
+++ b/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.coin-or.org/download/source/${MY_PN}/${MY_P}.tgz -> ${P}.ta
 
 LICENSE="EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples openmp"
 
 RDEPEND="virtual/blas
diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild
index dc17e23f1a48..20541aa013dd 100644
--- a/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild
+++ b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/Dip-releases-${PV}/Dip"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-dylp/coinor-dylp-1.10.4-r1.ebuild b/sci-libs/coinor-dylp/coinor-dylp-1.10.4-r1.ebuild
index 35272e786648..b4274b31b605 100644
--- a/sci-libs/coinor-dylp/coinor-dylp-1.10.4-r1.ebuild
+++ b/sci-libs/coinor-dylp/coinor-dylp-1.10.4-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/1"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild b/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild
index 08dd09ec0b49..520d766f9f22 100644
--- a/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild
+++ b/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/FlopCpp-releases-${PV}/FlopCpp"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild b/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild
index d97c7a8d10f6..ad5c83848d66 100644
--- a/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild
+++ b/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/CoinMP-releases-${PV}/CoinMP"
 
 LICENSE="CPL-1.0"
 SLOT="0/1"
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 
 RDEPEND="
 	sci-libs/coinor-cbc:=
diff --git a/sci-libs/coinor-netlib/coinor-netlib-1.2.9.ebuild b/sci-libs/coinor-netlib/coinor-netlib-1.2.9.ebuild
index a90f44470498..759a6d50c399 100644
--- a/sci-libs/coinor-netlib/coinor-netlib-1.2.9.ebuild
+++ b/sci-libs/coinor-netlib/coinor-netlib-1.2.9.ebuild
@@ -10,4 +10,4 @@ S="${WORKDIR}/Data-Netlib-releases-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
diff --git a/sci-libs/coinor-osi/coinor-osi-0.108.11.ebuild b/sci-libs/coinor-osi/coinor-osi-0.108.11.ebuild
index bda906a2bb64..73dd5f233925 100644
--- a/sci-libs/coinor-osi/coinor-osi-0.108.11.ebuild
+++ b/sci-libs/coinor-osi/coinor-osi-0.108.11.ebuild
@@ -14,7 +14,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/1"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild b/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild
index 18e7b9c1f4b1..86fa7d421850 100644
--- a/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild
+++ b/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild
@@ -14,7 +14,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/1"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 
 # No USE=glpk because upstream only supports an ancient version of it. The
 # following issues were all closed by... documenting that it doesn't work:
diff --git a/sci-libs/coinor-sample/coinor-sample-1.2.12.ebuild b/sci-libs/coinor-sample/coinor-sample-1.2.12.ebuild
index e4c0bfe9b8f0..58427d420598 100644
--- a/sci-libs/coinor-sample/coinor-sample-1.2.12.ebuild
+++ b/sci-libs/coinor-sample/coinor-sample-1.2.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/coin-or-tools/Data-Sample/"
 SRC_URI="https://github.com/coin-or-tools/${MY_PN}/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-releases-${PV}"
diff --git a/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild b/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild
index 9434313abe95..5ad248472788 100644
--- a/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild
+++ b/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/Smi-releases-${PV}/Smi"
 
 LICENSE="CPL-1.0"
 SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild b/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild
index 2d7ceecd23b2..c3950572c5b6 100644
--- a/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild
+++ b/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/SYMPHONY-releases-${PV}/SYMPHONY"
 
 LICENSE="EPL-1.0"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc glpk test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-utils/coinor-utils-2.11.12.ebuild b/sci-libs/coinor-utils/coinor-utils-2.11.12.ebuild
index 28d072db49d3..0677f8235ace 100644
--- a/sci-libs/coinor-utils/coinor-utils-2.11.12.ebuild
+++ b/sci-libs/coinor-utils/coinor-utils-2.11.12.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
 # major soname component
 SLOT="0/3"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="bzip2 doc glpk blas lapack static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild b/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild
index a053f92ccb77..149c753a0276 100644
--- a/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild
+++ b/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/3"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="bzip2 doc glpk blas lapack static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild b/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild
index ceb92245d568..a34d659f8056 100644
--- a/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild
+++ b/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild
@@ -16,7 +16,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/3"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="bzip2 doc glpk blas lapack static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
index 459d7cb9393f..eaeec8171d1b 100644
--- a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
+++ b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="EPL-1.0"
 # major soname component
 SLOT="0/1"
 
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index 6bd351359b0b..719b4993cff9 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
diff --git a/sci-libs/colamd/colamd-3.0.3.ebuild b/sci-libs/colamd/colamd-3.0.3.ebuild
index b0b9cdb61e3a..047249a003e4 100644
--- a/sci-libs/colamd/colamd-3.0.3.ebuild
+++ b/sci-libs/colamd/colamd-3.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index 457f1aa5f33c..d9811760126a 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="openmp"
 
 S="${WORKDIR}/${MYPN}-${PV}"
diff --git a/sci-libs/cqrlib/cqrlib-1.1.4.ebuild b/sci-libs/cqrlib/cqrlib-1.1.4.ebuild
index 86556f4e6198..5ecae1971434 100644
--- a/sci-libs/cqrlib/cqrlib-1.1.4.ebuild
+++ b/sci-libs/cqrlib/cqrlib-1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/yayahjb/${PN}/archive/${MY_P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/cvector"
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 42076c0e3842..ecf03396bd83 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/cxsparse/cxsparse-4.0.3.ebuild b/sci-libs/cxsparse/cxsparse-4.0.3.ebuild
index afd86a8e149e..18eaf91c7428 100644
--- a/sci-libs/cxsparse/cxsparse-4.0.3.ebuild
+++ b/sci-libs/cxsparse/cxsparse-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/dealii/dealii-9.6.2-r2.ebuild b/sci-libs/dealii/dealii-9.6.2-r2.ebuild
index 033eaf153aaf..66566d3afae3 100644
--- a/sci-libs/dealii/dealii-9.6.2-r2.ebuild
+++ b/sci-libs/dealii/dealii-9.6.2-r2.ebuild
@@ -20,7 +20,7 @@ else
 			https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz
 			verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz.asc )
 			)"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sci-libs/dealii/dealii-9.7.0.ebuild b/sci-libs/dealii/dealii-9.7.0.ebuild
index 9c843ba3ce04..712aa4132bc9 100644
--- a/sci-libs/dealii/dealii-9.7.0.ebuild
+++ b/sci-libs/dealii/dealii-9.7.0.ebuild
@@ -16,7 +16,7 @@ else
 		doc? (
 			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
 			)"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sci-libs/dealii/dealii-9.7.1.ebuild b/sci-libs/dealii/dealii-9.7.1.ebuild
index 58ea44984a08..081013b5501d 100644
--- a/sci-libs/dealii/dealii-9.7.1.ebuild
+++ b/sci-libs/dealii/dealii-9.7.1.ebuild
@@ -18,7 +18,7 @@ else
 		doc? (
 			https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz
 			)"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 9c843ba3ce04..712aa4132bc9 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -16,7 +16,7 @@ else
 		doc? (
 			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
 			)"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sci-libs/djbfft/djbfft-0.76-r3.ebuild b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
index aa4549a854c5..50157bb12a06 100644
--- a/sci-libs/djbfft/djbfft-0.76-r3.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/djbfft/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc3.patch
diff --git a/sci-libs/dlib/dlib-19.24.2.ebuild b/sci-libs/dlib/dlib-19.24.2.ebuild
index eb0b0fea40a1..805e3f37f132 100644
--- a/sci-libs/dlib/dlib-19.24.2.ebuild
+++ b/sci-libs/dlib/dlib-19.24.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
 REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/dlib/dlib-19.24.8.ebuild b/sci-libs/dlib/dlib-19.24.8.ebuild
index c755f7445ced..61bda8bb8ab8 100644
--- a/sci-libs/dlib/dlib-19.24.8.ebuild
+++ b/sci-libs/dlib/dlib-19.24.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cblas cuda debug examples ffmpeg gif jpeg lapack mkl png python sqlite test webp X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
 REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/dmlc-core/dmlc-core-0.5.ebuild b/sci-libs/dmlc-core/dmlc-core-0.5.ebuild
index 7ae899dcbb27..66f2bfd6dc1c 100644
--- a/sci-libs/dmlc-core/dmlc-core-0.5.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0.5.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/dmlc/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild
index cfc14ac37ce4..4c3199548d23 100644
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild
@@ -16,7 +16,7 @@ else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/dmlc/dmlc-core/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sci-libs/dsdp/dsdp-5.8-r4.ebuild b/sci-libs/dsdp/dsdp-5.8-r4.ebuild
index a39834e34d5d..a34d56cb20c8 100644
--- a/sci-libs/dsdp/dsdp-5.8-r4.ebuild
+++ b/sci-libs/dsdp/dsdp-5.8-r4.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="virtual/lapack"
diff --git a/sci-libs/fetk/fetk-1.5.ebuild b/sci-libs/fetk/fetk-1.5.ebuild
index 63f07a95b4fa..4de6e9199c4b 100644
--- a/sci-libs/fetk/fetk-1.5.ebuild
+++ b/sci-libs/fetk/fetk-1.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://fetk.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	~dev-libs/maloc-${PV}
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
index ddc6ed71e358..d906697ba56c 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~x64-macos"
 IUSE="openmp"
 
 # Our autotools patch hacks in PKG_CHECK_MODULES calls.
diff --git a/sci-libs/fftw/fftw-3.3.10-r1.ebuild b/sci-libs/fftw/fftw-3.3.10-r1.ebuild
index c451b72651cf..ecbb2bda871b 100644
--- a/sci-libs/fftw/fftw-3.3.10-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index c32de7cd4af4..1657c08d90bc 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 10f0992f1d67..77fb9689abc1 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-libs/flann/flann-1.9.2_p20221027-r1.ebuild b/sci-libs/flann/flann-1.9.2_p20221027-r1.ebuild
index 5d5299131b05..6f90c133c03a 100644
--- a/sci-libs/flann/flann-1.9.2_p20221027-r1.ebuild
+++ b/sci-libs/flann/flann-1.9.2_p20221027-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~x86"
 IUSE="cuda doc examples mpi octave openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/flann/flann-1.9.2_p20221027.ebuild b/sci-libs/flann/flann-1.9.2_p20221027.ebuild
index a683eaeb0953..3f2cbb4e7e69 100644
--- a/sci-libs/flann/flann-1.9.2_p20221027.ebuild
+++ b/sci-libs/flann/flann-1.9.2_p20221027.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~x86"
 IUSE="cuda doc examples mpi octave openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/galib/galib-2.4.7-r2.ebuild b/sci-libs/galib/galib-2.4.7-r2.ebuild
index a4bd3d281306..7c4e83983700 100644
--- a/sci-libs/galib/galib-2.4.7-r2.ebuild
+++ b/sci-libs/galib/galib-2.4.7-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}${MY_PV}"
 
 LICENSE="BSD examples? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
 PATCHES=( "${WORKDIR}"/patches )
diff --git a/sci-libs/gamer/gamer-1.5-r2.ebuild b/sci-libs/gamer/gamer-1.5-r2.ebuild
index 29179b74bea1..fe1ee685a674 100644
--- a/sci-libs/gamer/gamer-1.5-r2.ebuild
+++ b/sci-libs/gamer/gamer-1.5-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/maloc-1.4"
diff --git a/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
index 106917e74514..e7fd46a0708d 100644
--- a/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
+++ b/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/gaul/${P}-0.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="slang"
 
 RDEPEND="slang? ( sys-libs/slang:= )"
diff --git a/sci-libs/gdal/gdal-3.9.3-r1.ebuild b/sci-libs/gdal/gdal-3.9.3-r1.ebuild
index ea4c1c87db26..f8b795e84a6f 100644
--- a/sci-libs/gdal/gdal-3.9.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.9.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/35" # subslot is libgdal.so.<SONAME>
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lerc lzma mysql netcdf odbc ogdi opencl oracle parquet pdf png postgres python spatialite sqlite test webp xls zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/geos/geos-3.12.1.ebuild b/sci-libs/geos/geos-3.12.1.ebuild
index 9f9dc8bfd5c1..89c527cd89cb 100644
--- a/sci-libs/geos/geos-3.12.1.ebuild
+++ b/sci-libs/geos/geos-3.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/geos/geos-3.13.0.ebuild b/sci-libs/geos/geos-3.13.0.ebuild
index b19ed357ef1d..7d905c8635e0 100644
--- a/sci-libs/geos/geos-3.13.0.ebuild
+++ b/sci-libs/geos/geos-3.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/geos/geos-3.13.1.ebuild b/sci-libs/geos/geos-3.13.1.ebuild
index aaea85b90527..be54c196264b 100644
--- a/sci-libs/geos/geos-3.13.1.ebuild
+++ b/sci-libs/geos/geos-3.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/geos/geos-3.14.0.ebuild b/sci-libs/geos/geos-3.14.0.ebuild
index aaea85b90527..be54c196264b 100644
--- a/sci-libs/geos/geos-3.14.0.ebuild
+++ b/sci-libs/geos/geos-3.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/gerris/gerris-20131206-r1.ebuild b/sci-libs/gerris/gerris-20131206-r1.ebuild
index cf42447323e6..c9539610c0c7 100644
--- a/sci-libs/gerris/gerris-20131206-r1.ebuild
+++ b/sci-libs/gerris/gerris-20131206-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples mpi static-libs"
 
 # all these deps could be optional
diff --git a/sci-libs/getdata/getdata-0.11.0-r2.ebuild b/sci-libs/getdata/getdata-0.11.0-r2.ebuild
index 124d9278735a..4d147bdbbc34 100644
--- a/sci-libs/getdata/getdata-0.11.0-r2.ebuild
+++ b/sci-libs/getdata/getdata-0.11.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz
 
 SLOT="0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 cxx debug flac fortran lzma perl static-libs"
 
 DEPEND="
diff --git a/sci-libs/getdata/getdata-0.11.0.ebuild b/sci-libs/getdata/getdata-0.11.0.ebuild
index 8aa7b4621951..85b560eb86e4 100644
--- a/sci-libs/getdata/getdata-0.11.0.ebuild
+++ b/sci-libs/getdata/getdata-0.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz
 
 SLOT="0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 cxx debug flac fortran lzma perl static-libs"
 
 DEPEND="
diff --git a/sci-libs/givaro/givaro-4.2.1.ebuild b/sci-libs/givaro/givaro-4.2.1.ebuild
index 9d193164e05a..bfc86478efce 100644
--- a/sci-libs/givaro/givaro-4.2.1.ebuild
+++ b/sci-libs/givaro/givaro-4.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar
 
 LICENSE="CeCILL-B"
 SLOT="0/9" # soname major
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/gsl/gsl-2.7.1-r2.ebuild b/sci-libs/gsl/gsl-2.7.1-r2.ebuild
index 1edfad191c8e..64ea6d133b18 100644
--- a/sci-libs/gsl/gsl-2.7.1-r2.ebuild
+++ b/sci-libs/gsl/gsl-2.7.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-3+"
 # Usually 0/${PV} but check
 SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/gsl-2.7.1-r3.ebuild b/sci-libs/gsl/gsl-2.7.1-r3.ebuild
index 4fa476c99656..4f9dc22ceff0 100644
--- a/sci-libs/gsl/gsl-2.7.1-r3.ebuild
+++ b/sci-libs/gsl/gsl-2.7.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-3+"
 # Usually 0/${PV} but check
 SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 85120051465d..bf5d333f75e3 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="test" # bug #277165
 
diff --git a/sci-libs/hdf/hdf-4.2.15-r2.ebuild b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
index 1a0a94923f66..ce6a151b645a 100644
--- a/sci-libs/hdf/hdf-4.2.15-r2.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild
index 123abccfba31..d39ded3b0019 100644
--- a/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
 REQUIRED_USE="
 	!unsupported? (
diff --git a/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild b/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild
index aa3625dcc547..15a7cca3ca1b 100644
--- a/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.14.4_p3-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="NCSA-HDF"
 SLOT="0/311"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="cxx debug examples fortran +hl mpi szip test threads unsupported zlib"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/sci-libs/hdf5/hdf5-1.14.6-r1.ebuild b/sci-libs/hdf5/hdf5-1.14.6-r1.ebuild
index 10862df4b473..3dc7f42cfd0a 100644
--- a/sci-libs/hdf5/hdf5-1.14.6-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.14.6-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="NCSA-HDF"
 SLOT="0/310-cmake"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cxx debug fortran +hl mpi szip test threads unsupported zlib"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/sci-libs/hdf5/hdf5-1.14.6-r2.ebuild b/sci-libs/hdf5/hdf5-1.14.6-r2.ebuild
index 120ee756340d..7e942ddb1e0e 100644
--- a/sci-libs/hdf5/hdf5-1.14.6-r2.ebuild
+++ b/sci-libs/hdf5/hdf5-1.14.6-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="NCSA-HDF"
 SLOT="0/310-cmake"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="cxx debug fortran +hl mpi szip test threads unsupported zlib"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/sci-libs/htslib/htslib-1.20.ebuild b/sci-libs/htslib/htslib-1.20.ebuild
index 6c334cbda148..43627c7821af 100644
--- a/sci-libs/htslib/htslib-1.20.ebuild
+++ b/sci-libs/htslib/htslib-1.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/3"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="+bzip2 curl +lzma"
 
 RDEPEND="
diff --git a/sci-libs/htslib/htslib-1.21.ebuild b/sci-libs/htslib/htslib-1.21.ebuild
index 9e0c78a7c17d..42242497987e 100644
--- a/sci-libs/htslib/htslib-1.21.ebuild
+++ b/sci-libs/htslib/htslib-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bzip2 curl +lzma"
 
 RDEPEND="
diff --git a/sci-libs/htslib/htslib-1.22.1.ebuild b/sci-libs/htslib/htslib-1.22.1.ebuild
index 8ba1fdd3d961..158a4e8e7a45 100644
--- a/sci-libs/htslib/htslib-1.22.1.ebuild
+++ b/sci-libs/htslib/htslib-1.22.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bzip2 curl +lzma"
 
 RDEPEND="
diff --git a/sci-libs/htslib/htslib-1.22.ebuild b/sci-libs/htslib/htslib-1.22.ebuild
index 8ba1fdd3d961..158a4e8e7a45 100644
--- a/sci-libs/htslib/htslib-1.22.ebuild
+++ b/sci-libs/htslib/htslib-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bzip2 curl +lzma"
 
 RDEPEND="
diff --git a/sci-libs/hypre/hypre-2.32.0.ebuild b/sci-libs/hypre/hypre-2.32.0.ebuild
index c3bef9bc2d8b..89ba612306a1 100644
--- a/sci-libs/hypre/hypre-2.32.0.ebuild
+++ b/sci-libs/hypre/hypre-2.32.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug examples fortran int64 openmp mpi"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/idlcoyote/idlcoyote-20161220-r1.ebuild b/sci-libs/idlcoyote/idlcoyote-20161220-r1.ebuild
index 53cc4aff4637..9de3c0678337 100644
--- a/sci-libs/idlcoyote/idlcoyote-20161220-r1.ebuild
+++ b/sci-libs/idlcoyote/idlcoyote-20161220-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != 99999999 ]]; then
 	SRC_URI="http://www.idlcoyote.com/programs/zip_files/coyoteprograms.zip -> ${P}.zip"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/coyote"
 	BDEPEND="app-arch/unzip"
 else
diff --git a/sci-libs/idlcoyote/idlcoyote-99999999.ebuild b/sci-libs/idlcoyote/idlcoyote-99999999.ebuild
index 53cc4aff4637..9de3c0678337 100644
--- a/sci-libs/idlcoyote/idlcoyote-99999999.ebuild
+++ b/sci-libs/idlcoyote/idlcoyote-99999999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != 99999999 ]]; then
 	SRC_URI="http://www.idlcoyote.com/programs/zip_files/coyoteprograms.zip -> ${P}.zip"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/coyote"
 	BDEPEND="app-arch/unzip"
 else
diff --git a/sci-libs/idlmarkwardt/idlmarkwardt-20160319-r1.ebuild b/sci-libs/idlmarkwardt/idlmarkwardt-20160319-r1.ebuild
index 34606d4e1be8..1c161e0e8fe6 100644
--- a/sci-libs/idlmarkwardt/idlmarkwardt-20160319-r1.ebuild
+++ b/sci-libs/idlmarkwardt/idlmarkwardt-20160319-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Markwardt"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-lang/gdl"
 
diff --git a/sci-libs/iml/iml-1.0.5-r1.ebuild b/sci-libs/iml/iml-1.0.5-r1.ebuild
index 94dfc5229ec5..66feec1547e4 100644
--- a/sci-libs/iml/iml-1.0.5-r1.ebuild
+++ b/sci-libs/iml/iml-1.0.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2"
 # COPYING is GPL-2, but the files under src/ all have a BSD header
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 
 DEPEND="virtual/cblas"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/inchi/inchi-1.06-r1.ebuild b/sci-libs/inchi/inchi-1.06-r1.ebuild
index 8b8040286b7a..57f85b0c510d 100644
--- a/sci-libs/inchi/inchi-1.06-r1.ebuild
+++ b/sci-libs/inchi/inchi-1.06-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/INCHI-1-SRC"
 
 LICENSE="IUPAC-InChi"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ppc64 ~x86"
 IUSE="doc"
 
 BDEPEND="app-arch/unzip"
diff --git a/sci-libs/ipopt/ipopt-3.14.4-r1.ebuild b/sci-libs/ipopt/ipopt-3.14.4-r1.ebuild
index 9005696f3cee..8835115f6863 100644
--- a/sci-libs/ipopt/ipopt-3.14.4-r1.ebuild
+++ b/sci-libs/ipopt/ipopt-3.14.4-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/Ipopt-releases-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="+asl +lapack mpi mumps static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/itpp/itpp-4.3.1-r2.ebuild b/sci-libs/itpp/itpp-4.3.1-r2.ebuild
index 0c03676c5c08..d9769a6504f9 100644
--- a/sci-libs/itpp/itpp-4.3.1-r2.ebuild
+++ b/sci-libs/itpp/itpp-4.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND="sci-libs/fftw:3.0=
diff --git a/sci-libs/jama/jama-1.2.5-r1.ebuild b/sci-libs/jama/jama-1.2.5-r1.ebuild
index f2dafa318d92..fbce2884eb19 100644
--- a/sci-libs/jama/jama-1.2.5-r1.ebuild
+++ b/sci-libs/jama/jama-1.2.5-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="sci-libs/tnt"
diff --git a/sci-libs/jkqtplotter/jkqtplotter-5.0.0_pre20251013-r1.ebuild b/sci-libs/jkqtplotter/jkqtplotter-5.0.0_pre20251013-r1.ebuild
index d4b9e83979cc..bd5e60885cf6 100644
--- a/sci-libs/jkqtplotter/jkqtplotter-5.0.0_pre20251013-r1.ebuild
+++ b/sci-libs/jkqtplotter/jkqtplotter-5.0.0_pre20251013-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/jkriege2/${MY_PN}.git"
 else
 	SRC_URI="https://github.com/jkriege2/JKQtPlotter/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${HASH_COMMIT}"
 fi
 
diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild
index fafef9cee8dd..37e7c25731e7 100644
--- a/sci-libs/klu/klu-1.3.9-r2.ebuild
+++ b/sci-libs/klu/klu-1.3.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 BDEPEND="
diff --git a/sci-libs/klu/klu-2.0.3.ebuild b/sci-libs/klu/klu-2.0.3.ebuild
index 3aca27a557ad..bbffb493faa6 100644
--- a/sci-libs/klu/klu-2.0.3.ebuild
+++ b/sci-libs/klu/klu-2.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/lapack/lapack-3.12.0-r1.ebuild b/sci-libs/lapack/lapack-3.12.0-r1.ebuild
index 06bc8cf59e02..9a7545485c4b 100644
--- a/sci-libs/lapack/lapack-3.12.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.12.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 # TODO: static-libs 64bit-index
 IUSE="lapacke deprecated doc eselect-ldso test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/lapack/lapack-3.12.1-r1.ebuild b/sci-libs/lapack/lapack-3.12.1-r1.ebuild
index da22957e819c..a037b53e99b7 100644
--- a/sci-libs/lapack/lapack-3.12.1-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.12.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="lapacke deprecated doc eselect-ldso index64 test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/lapack/lapack-3.12.1-r2.ebuild b/sci-libs/lapack/lapack-3.12.1-r2.ebuild
index 4df2508d3c3d..01e29be43276 100644
--- a/sci-libs/lapack/lapack-3.12.1-r2.ebuild
+++ b/sci-libs/lapack/lapack-3.12.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="flexiblas lapacke deprecated doc eselect-ldso index64 test"
 REQUIRED_USE="flexiblas? ( deprecated !eselect-ldso )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild
index 6cb4ceafd590..49b40abe4d0e 100644
--- a/sci-libs/ldl/ldl-2.2.6.ebuild
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ldl/ldl-3.0.3.ebuild b/sci-libs/ldl/ldl-3.0.3.ebuild
index 1a14fd80a7c5..974db174c30f 100644
--- a/sci-libs/ldl/ldl-3.0.3.ebuild
+++ b/sci-libs/ldl/ldl-3.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/lemon/lemon-1.3.1-r2.ebuild b/sci-libs/lemon/lemon-1.3.1-r2.ebuild
index 15fae94bf9e3..e920a68a2326 100644
--- a/sci-libs/lemon/lemon-1.3.1-r2.ebuild
+++ b/sci-libs/lemon/lemon-1.3.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://lemon.cs.elte.hu/pub/sources/${P}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="+coin doc glpk static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/levmar/levmar-2.6-r1.ebuild b/sci-libs/levmar/levmar-2.6-r1.ebuild
index 08ffdc464a99..fb08ec4c6bcb 100644
--- a/sci-libs/levmar/levmar-2.6-r1.ebuild
+++ b/sci-libs/levmar/levmar-2.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ics.forth.gr/~lourakis/levmar/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libaec/libaec-1.1.4.ebuild b/sci-libs/libaec/libaec-1.1.4.ebuild
index c91bd0781d3d..070fd197300b 100644
--- a/sci-libs/libaec/libaec-1.1.4.ebuild
+++ b/sci-libs/libaec/libaec-1.1.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+szip test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libcerf/libcerf-1.17.ebuild b/sci-libs/libcerf/libcerf-1.17.ebuild
index ad055ef75dc5..fb1b5c5caf44 100644
--- a/sci-libs/libcerf/libcerf-1.17.ebuild
+++ b/sci-libs/libcerf/libcerf-1.17.ebuild
@@ -13,4 +13,4 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
diff --git a/sci-libs/libcerf/libcerf-2.5.ebuild b/sci-libs/libcerf/libcerf-2.5.ebuild
index 5eef8177ea35..f21db39d657b 100644
--- a/sci-libs/libcerf/libcerf-2.5.ebuild
+++ b/sci-libs/libcerf/libcerf-2.5.ebuild
@@ -13,4 +13,4 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
diff --git a/sci-libs/libdap/libdap-3.20.9-r1.ebuild b/sci-libs/libdap/libdap-3.20.9-r1.ebuild
index d6eee568b616..682ddcff8498 100644
--- a/sci-libs/libdap/libdap-3.20.9-r1.ebuild
+++ b/sci-libs/libdap/libdap-3.20.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.opendap.org/pub/source/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 URI )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libdap/libdap-3.21.1.ebuild b/sci-libs/libdap/libdap-3.21.1.ebuild
index d0df8d0d03c8..79b90a26de59 100644
--- a/sci-libs/libdap/libdap-3.21.1.ebuild
+++ b/sci-libs/libdap/libdap-3.21.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.opendap.org/pub/source/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 URI )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libecpint/libecpint-1.0.6-r1.ebuild b/sci-libs/libecpint/libecpint-1.0.6-r1.ebuild
index 6f56bf9ddced..8a4123be9ad7 100644
--- a/sci-libs/libecpint/libecpint-1.0.6-r1.ebuild
+++ b/sci-libs/libecpint/libecpint-1.0.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild b/sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild
index 23fb0ef4f630..933bc8acb1c8 100644
--- a/sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild
+++ b/sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/libExcelFormat"
 
 LICENSE="CPOL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${P}-Wliteral-suffix.patch )
 
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild
index fbdaedd4d0d3..6f31d1093aed 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.7.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~x64-macos"
 IUSE="doc jpeg +tiff zlib"
 
 DEPEND=">=sci-libs/proj-6.0.0:=
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.3.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.3.ebuild
index 18774730287e..70aa47cf5284 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.7.3.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
 # TODO: add tiff when resolved: https://github.com/OSGeo/libgeotiff/issues/125
 IUSE="doc jpeg zlib"
 
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.4.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.4.ebuild
index 925084f820f0..457267aacb90 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.7.4.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.7.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~x64-macos"
 # TODO: add tiff when resolved: https://github.com/OSGeo/libgeotiff/issues/125
 IUSE="jpeg zlib"
 
diff --git a/sci-libs/libint/libint-1.1.6.ebuild b/sci-libs/libint/libint-1.1.6.ebuild
index 46357d7c10ee..83dfe99cd15e 100644
--- a/sci-libs/libint/libint-1.1.6.ebuild
+++ b/sci-libs/libint/libint-1.1.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-release-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
 
diff --git a/sci-libs/libint/libint-2.11.0.ebuild b/sci-libs/libint/libint-2.11.0.ebuild
index 6e8b1bb03ecd..62bcf8d985da 100644
--- a/sci-libs/libint/libint-2.11.0.ebuild
+++ b/sci-libs/libint/libint-2.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-libs/libint/libint-2.9.0.ebuild b/sci-libs/libint/libint-2.9.0.ebuild
index 6e8b1bb03ecd..62bcf8d985da 100644
--- a/sci-libs/libint/libint-2.9.0.ebuild
+++ b/sci-libs/libint/libint-2.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild
index c590ea70af79..7c83345953a8 100644
--- a/sci-libs/libnova/libnova-0.16.0.ebuild
+++ b/sci-libs/libnova/libnova-0.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0/0.16"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 ~riscv ~x86"
 IUSE="doc examples"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild b/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild
index d0237a668033..c77f9de2d308 100644
--- a/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild
+++ b/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc tools"
 
 BDEPEND="
diff --git a/sci-libs/libpdb++/libpdb++-040728-r2.ebuild b/sci-libs/libpdb++/libpdb++-040728-r2.ebuild
index 16b25e83c4af..5f8fa3595581 100644
--- a/sci-libs/libpdb++/libpdb++-040728-r2.ebuild
+++ b/sci-libs/libpdb++/libpdb++-040728-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 BDEPEND="app-arch/sharutils"
diff --git a/sci-libs/libpdb/libpdb-991112-r2.ebuild b/sci-libs/libpdb/libpdb-991112-r2.ebuild
index efaba36468dc..8f2b51898d2b 100644
--- a/sci-libs/libpdb/libpdb-991112-r2.ebuild
+++ b/sci-libs/libpdb/libpdb-991112-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 BDEPEND="app-arch/sharutils"
diff --git a/sci-libs/libqalculate/libqalculate-5.7.0.ebuild b/sci-libs/libqalculate/libqalculate-5.7.0.ebuild
index f9ce26d81cc4..67973e542b35 100644
--- a/sci-libs/libqalculate/libqalculate-5.7.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-5.7.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/"${PN}-${MY_PV}"
 LICENSE="GPL-2+"
 # SONAME changes pretty often on bumps. Check!
 SLOT="0/23.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="+curl icu gnuplot +hardened readline test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libqalculate/libqalculate-5.8.0.ebuild b/sci-libs/libqalculate/libqalculate-5.8.0.ebuild
index 753047964758..7725c44fb131 100644
--- a/sci-libs/libqalculate/libqalculate-5.8.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-5.8.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/"${PN}-${MY_PV}"
 LICENSE="GPL-2+"
 # SONAME changes pretty often on bumps. Check!
 SLOT="0/23.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+curl icu gnuplot +hardened readline test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libqalculate/libqalculate-5.8.1.ebuild b/sci-libs/libqalculate/libqalculate-5.8.1.ebuild
index 65a77038b120..0d21169bab74 100644
--- a/sci-libs/libqalculate/libqalculate-5.8.1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-5.8.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/"${PN}-${MY_PV}"
 LICENSE="GPL-2+"
 # SONAME changes pretty often on bumps. Check!
 SLOT="0/23.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+curl icu gnuplot +hardened readline test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libqalculate/libqalculate-5.8.2.ebuild b/sci-libs/libqalculate/libqalculate-5.8.2.ebuild
index 65a77038b120..0d21169bab74 100644
--- a/sci-libs/libqalculate/libqalculate-5.8.2.ebuild
+++ b/sci-libs/libqalculate/libqalculate-5.8.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/"${PN}-${MY_PV}"
 LICENSE="GPL-2+"
 # SONAME changes pretty often on bumps. Check!
 SLOT="0/23.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+curl icu gnuplot +hardened readline test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libsvm/libsvm-3.30.ebuild b/sci-libs/libsvm/libsvm-3.30.ebuild
index d1fdc3096fce..de90ac29b475 100644
--- a/sci-libs/libsvm/libsvm-3.30.ebuild
+++ b/sci-libs/libsvm/libsvm-3.30.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV/0}"
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="java openmp python tools"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/libticables2/libticables2-1.3.5-r1.ebuild b/sci-libs/libticables2/libticables2-1.3.5-r1.ebuild
index f71abc217606..9f5b42fb4f7e 100644
--- a/sci-libs/libticables2/libticables2-1.3.5-r1.ebuild
+++ b/sci-libs/libticables2/libticables2-1.3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug doc nls static-libs usb"
 
 RDEPEND="
diff --git a/sci-libs/libticalcs2/libticalcs2-1.1.9-r1.ebuild b/sci-libs/libticalcs2/libticalcs2-1.1.9-r1.ebuild
index 8c63dfed0262..c241b5cadd9c 100644
--- a/sci-libs/libticalcs2/libticalcs2-1.1.9-r1.ebuild
+++ b/sci-libs/libticalcs2/libticalcs2-1.1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc nls static-libs"
 
 RDEPEND="
diff --git a/sci-libs/libticonv/libticonv-1.1.5-r1.ebuild b/sci-libs/libticonv/libticonv-1.1.5-r1.ebuild
index 28a04dada505..14561b4c4057 100644
--- a/sci-libs/libticonv/libticonv-1.1.5-r1.ebuild
+++ b/sci-libs/libticonv/libticonv-1.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc iconv static-libs"
 
 DEPEND="dev-libs/glib:2"
diff --git a/sci-libs/libtifiles2/libtifiles2-1.1.7-r1.ebuild b/sci-libs/libtifiles2/libtifiles2-1.1.7-r1.ebuild
index c1ac4f11883b..6359b0284ace 100644
--- a/sci-libs/libtifiles2/libtifiles2-1.1.7-r1.ebuild
+++ b/sci-libs/libtifiles2/libtifiles2-1.1.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/tilp/tilp2-linux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc nls static-libs"
 
 RDEPEND="
diff --git a/sci-libs/libxc/libxc-5.1.7.ebuild b/sci-libs/libxc/libxc-5.1.7.ebuild
index 883a843a3e26..dc49c7177051 100644
--- a/sci-libs/libxc/libxc-5.1.7.ebuild
+++ b/sci-libs/libxc/libxc-5.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="fortran test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/linbox/linbox-1.7.0-r1.ebuild b/sci-libs/linbox/linbox-1.7.0-r1.ebuild
index 72ae1084b2cd..a2399155e6b8 100644
--- a/sci-libs/linbox/linbox-1.7.0-r1.ebuild
+++ b/sci-libs/linbox/linbox-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 # headers all say LGPL-2.1
 LICENSE="GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~x64-macos"
 IUSE="doc opencl openmp"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/sci-libs/linbox/linbox-1.7.1.ebuild b/sci-libs/linbox/linbox-1.7.1.ebuild
index 997009b87b80..ac9944fa4a1c 100644
--- a/sci-libs/linbox/linbox-1.7.1.ebuild
+++ b/sci-libs/linbox/linbox-1.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 # headers all say LGPL-2.1
 LICENSE="GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
 IUSE="doc opencl openmp"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/sci-libs/linbox/linbox-1.7.1_pre20250703.ebuild b/sci-libs/linbox/linbox-1.7.1_pre20250703.ebuild
index ea0a4f7f0eb8..00c419791780 100644
--- a/sci-libs/linbox/linbox-1.7.1_pre20250703.ebuild
+++ b/sci-libs/linbox/linbox-1.7.1_pre20250703.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${GH_COMMIT}"
 # headers all say LGPL-2.1
 LICENSE="GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
 IUSE="doc opencl openmp"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/sci-libs/lis/lis-1.6.5-r1.ebuild b/sci-libs/lis/lis-1.6.5-r1.ebuild
index 97ffc239f6f6..459d49a69487 100644
--- a/sci-libs/lis/lis-1.6.5-r1.ebuild
+++ b/sci-libs/lis/lis-1.6.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ssisc.org/lis/dl/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse2 doc fortran mpi openmp quad saamg static-libs"
 
 RDEPEND="mpi? ( virtual/mpi )"
diff --git a/sci-libs/lis/lis-2.1.3.ebuild b/sci-libs/lis/lis-2.1.3.ebuild
index fb4b08bdb429..514af3ecc5c5 100644
--- a/sci-libs/lis/lis-2.1.3.ebuild
+++ b/sci-libs/lis/lis-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ssisc.org/lis/dl/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse2 doc fortran mpi openmp quad saamg static-libs"
 
 RDEPEND="mpi? ( virtual/mpi )"
diff --git a/sci-libs/lrslib/lrslib-071b-r1.ebuild b/sci-libs/lrslib/lrslib-071b-r1.ebuild
index 32486e5db22d..cbac2b327e67 100644
--- a/sci-libs/lrslib/lrslib-071b-r1.ebuild
+++ b/sci-libs/lrslib/lrslib-071b-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
 # COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version."
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~amd64-linux"
+KEYWORDS="amd64 ~arm ~riscv"
 IUSE="gmp mpi"
 
 BDEPEND=""
diff --git a/sci-libs/lrslib/lrslib-073.ebuild b/sci-libs/lrslib/lrslib-073.ebuild
index cfe1404b0cd6..5bb3f05ee7c9 100644
--- a/sci-libs/lrslib/lrslib-073.ebuild
+++ b/sci-libs/lrslib/lrslib-073.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
 # COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version."
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~amd64-linux"
+KEYWORDS="amd64 ~arm ~riscv"
 IUSE="gmp mpi"
 
 RDEPEND="
diff --git a/sci-libs/m4ri/m4ri-20240729.ebuild b/sci-libs/m4ri/m4ri-20240729.ebuild
index 3eea5b164e97..1ef6e6fb8028 100644
--- a/sci-libs/m4ri/m4ri-20240729.ebuild
+++ b/sci-libs/m4ri/m4ri-20240729.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/m4ri/m4ri-20250128-r1.ebuild b/sci-libs/m4ri/m4ri-20250128-r1.ebuild
index 74e0dfc439eb..a71006d68a4f 100644
--- a/sci-libs/m4ri/m4ri-20250128-r1.ebuild
+++ b/sci-libs/m4ri/m4ri-20250128-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/malb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/1" # libm4ri.so major version
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/m4rie/m4rie-20250103-r1.ebuild b/sci-libs/m4rie/m4rie-20250103-r1.ebuild
index ec8640d02a9d..28d78c3df331 100644
--- a/sci-libs/m4rie/m4rie-20250103-r1.ebuild
+++ b/sci-libs/m4rie/m4rie-20250103-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND=">=sci-libs/m4ri-20240729"
diff --git a/sci-libs/m4rie/m4rie-20250103-r2.ebuild b/sci-libs/m4rie/m4rie-20250103-r2.ebuild
index ecfd772b1b63..6ef05418b0b2 100644
--- a/sci-libs/m4rie/m4rie-20250103-r2.ebuild
+++ b/sci-libs/m4rie/m4rie-20250103-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND=">sci-libs/m4ri-20240729:="
diff --git a/sci-libs/m4rie/m4rie-20250128.ebuild b/sci-libs/m4rie/m4rie-20250128.ebuild
index 74e27c309f74..97b97608acbf 100644
--- a/sci-libs/m4rie/m4rie-20250128.ebuild
+++ b/sci-libs/m4rie/m4rie-20250128.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/malb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND=">=sci-libs/m4ri-20240729-r0:="
diff --git a/sci-libs/mathgl/mathgl-8.0.3.ebuild b/sci-libs/mathgl/mathgl-8.0.3.ebuild
index 263144a91de7..079cb92bf8d4 100644
--- a/sci-libs/mathgl/mathgl-8.0.3.ebuild
+++ b/sci-libs/mathgl/mathgl-8.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0/7.5.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf
 	png qt6 threads wxwidgets zlib"
 
diff --git a/sci-libs/matio/matio-1.5.23.ebuild b/sci-libs/matio/matio-1.5.23.ebuild
index bb213823af3b..eec0803dabd6 100644
--- a/sci-libs/matio/matio-1.5.23.ebuild
+++ b/sci-libs/matio/matio-1.5.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/11" # subslot = soname version
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc examples hdf5 sparse"
 
 RDEPEND="
diff --git a/sci-libs/matio/matio-1.5.28.ebuild b/sci-libs/matio/matio-1.5.28.ebuild
index 4742d9fec384..8d9051ddfbe2 100644
--- a/sci-libs/matio/matio-1.5.28.ebuild
+++ b/sci-libs/matio/matio-1.5.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/13" # subslot = soname version
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc examples hdf5 sparse"
 
 RDEPEND="
diff --git a/sci-libs/mc/mc-1.5-r1.ebuild b/sci-libs/mc/mc-1.5-r1.ebuild
index c7f303666e58..a0f6862d133a 100644
--- a/sci-libs/mc/mc-1.5-r1.ebuild
+++ b/sci-libs/mc/mc-1.5-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="debug doc"
 
 RDEPEND="
diff --git a/sci-libs/metis/metis-5.2.1-r2.ebuild b/sci-libs/metis/metis-5.2.1-r2.ebuild
index 08535100a1c3..786265be1fe2 100644
--- a/sci-libs/metis/metis-5.2.1-r2.ebuild
+++ b/sci-libs/metis/metis-5.2.1-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/METIS-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="double-precision examples int64 openmp"
 
 PATCHES=(
diff --git a/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild b/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild
index f187918574e5..1644ecef2d44 100644
--- a/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild
+++ b/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-1.5.4"
 # are LGPL-2.1+
 LICENSE="GPL-3 LGPL-3 LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-libs/mumps/mumps-5.3.5-r1.ebuild b/sci-libs/mumps/mumps-5.3.5-r1.ebuild
index 8df93f5e4e8c..eaa1a821f052 100644
--- a/sci-libs/mumps/mumps-5.3.5-r1.ebuild
+++ b/sci-libs/mumps/mumps-5.3.5-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE="doc examples metis mpi +scotch static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild
index 04c76791f47d..576b7337ce2f 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.unidata.ucar.edu/downloads/netcdf/ftp/${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="examples"
 
 RDEPEND=">=sci-libs/netcdf-4.2:0="
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild
index dddb7002fbd6..dc2ef3bdc6c5 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.unidata.ucar.edu/netcdf-cxx/${PV}/${PN}4-${PV}.tar.gz
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="examples"
 # 6 out of 9 fail, reported upstream
 #RESTRICT="test"
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
index 559d4d5483dc..a83b1dd26d68 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="examples"
 # 6 out of 9 fail, reported upstream
 RESTRICT="test"
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild
index 011dff676f10..237ab757c2fd 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.unidata.ucar.edu/netcdf-fortran/${PV}/${P}.tar.gz ->
 
 LICENSE="UCAR-Unidata"
 SLOT="0/7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples static-libs"
 
 RDEPEND="sci-libs/netcdf"
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild
index fc08cfb95414..dadbefd9b439 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Unidata/netcdf-fortran/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="UCAR-Unidata"
 SLOT="0/7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples static-libs"
 
 RDEPEND="sci-libs/netcdf"
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild
index 9b44a0997205..192e3a55f4ba 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.unidata.ucar.edu/netcdf-fortran/${PV}/${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="0/7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild
index 5a4e3e1916ef..caae36bb30c5 100644
--- a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV}
 LICENSE="UCAR-Unidata"
 # SONAME of libnetcdf.so
 SLOT="0/19"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/netcdf/netcdf-4.9.2.ebuild b/sci-libs/netcdf/netcdf-4.9.2.ebuild
index b7567da5b015..4e0e10487733 100644
--- a/sci-libs/netcdf/netcdf-4.9.2.ebuild
+++ b/sci-libs/netcdf/netcdf-4.9.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV}
 LICENSE="UCAR-Unidata"
 # SONAME of libnetcdf.so
 SLOT="0/19"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 -riscv ~x86"
 IUSE="+dap doc examples hdf +hdf5 mpi szip test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/netcdf/netcdf-4.9.3-r2.ebuild b/sci-libs/netcdf/netcdf-4.9.3-r2.ebuild
index 6132b20eb41b..b5c9d7841e0e 100644
--- a/sci-libs/netcdf/netcdf-4.9.3-r2.ebuild
+++ b/sci-libs/netcdf/netcdf-4.9.3-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV}
 LICENSE="UCAR-Unidata"
 # SONAME of libnetcdf.so
 SLOT="0/22"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/nlopt/nlopt-2.10.0-r1.ebuild b/sci-libs/nlopt/nlopt-2.10.0-r1.ebuild
index b51447850769..5e2d1391dba4 100644
--- a/sci-libs/nlopt/nlopt-2.10.0-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.10.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="guile octave python test"
 REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild
index eb57a5b3d68b..e140cb5899fa 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt"
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv ~x86"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/oc/oc-2.0-r1.ebuild b/sci-libs/oc/oc-2.0-r1.ebuild
index 7928f0b41d15..2a8d3fa2adb2 100644
--- a/sci-libs/oc/oc-2.0-r1.ebuild
+++ b/sci-libs/oc/oc-2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://opendap.org/pub/OC/source/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 # tests need network
 RESTRICT="test"
diff --git a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
index 7c9b1707b510..56b56e8c051b 100644
--- a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/sci-libs/openblas/openblas-0.3.29.ebuild b/sci-libs/openblas/openblas-0.3.29.ebuild
index a6ffcc7671e8..96b848b3dc1b 100644
--- a/sci-libs/openblas/openblas-0.3.29.ebuild
+++ b/sci-libs/openblas/openblas-0.3.29.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~x64-macos"
 IUSE="dynamic eselect-ldso index64 openmp pthread relapack test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/openblas/openblas-0.3.30-r5.ebuild b/sci-libs/openblas/openblas-0.3.30-r5.ebuild
index ec3f26c2ff3a..4baed9345a25 100644
--- a/sci-libs/openblas/openblas-0.3.30-r5.ebuild
+++ b/sci-libs/openblas/openblas-0.3.30-r5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos"
 IUSE="cpudetection eselect-ldso index64 openmp pthread relapack test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!cpudetection? ( bindist ) !test? ( test )"
diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild
index db3f6006edc5..45c8c1d754d5 100644
--- a/sci-libs/openlibm/openlibm-0.8.3.ebuild
+++ b/sci-libs/openlibm/openlibm-0.8.3.ebuild
@@ -13,7 +13,7 @@ IUSE="static-libs"
 LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
 # See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
 SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-stack-protection.patch
diff --git a/sci-libs/parmetis/parmetis-4.0.3_p20230326-r1.ebuild b/sci-libs/parmetis/parmetis-4.0.3_p20230326-r1.ebuild
index 712c6585ee2e..c817ebf2cf85 100644
--- a/sci-libs/parmetis/parmetis-4.0.3_p20230326-r1.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3_p20230326-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/ParMETIS-${COMMIT}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
 IUSE="examples openmp pcre"
 RESTRICT="mirror bindist"
 
diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild
index ad6337f2a1d9..103d2830d65f 100644
--- a/sci-libs/pastix/pastix-6.0.3.ebuild
+++ b/sci-libs/pastix/pastix-6.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://files.inria.fr/pastix/releases/v$(ver_cut 1)/${P}.tar.gz"
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cuda examples +fortran int64 metis mpi +python +scotch starpu test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild
index 4685cad039c0..05aa0891947b 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="doc motif static-libs tk"
 
 RDEPEND="
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r9.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r9.ebuild
index 582f074b2472..02cdff880dad 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r9.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="doc motif static-libs tk"
 
 RDEPEND="
diff --git a/sci-libs/plplot/plplot-5.15.0_p15-r1.ebuild b/sci-libs/plplot/plplot-5.15.0_p15-r1.ebuild
index 40e3bc4305f2..a88f1ac09863 100644
--- a/sci-libs/plplot/plplot-5.15.0_p15-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0_p15-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P/_p*}"
 
 LICENSE="LGPL-2"
 SLOT="0/14" # SONAME of libplplot.so
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf
 	png python qhull shapefile svg tcl test threads tk truetype wxwidgets X"
diff --git a/sci-libs/primegen/primegen-0.97-r3.ebuild b/sci-libs/primegen/primegen-0.97-r3.ebuild
index 743c5440098e..932b3e20144f 100644
--- a/sci-libs/primegen/primegen-0.97-r3.ebuild
+++ b/sci-libs/primegen/primegen-0.97-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/primegen/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-man.patch
diff --git a/sci-libs/profnet/profnet-1.0.22.ebuild b/sci-libs/profnet/profnet-1.0.22.ebuild
index dfc60db98e74..a82ed08c0be7 100644
--- a/sci-libs/profnet/profnet-1.0.22.ebuild
+++ b/sci-libs/profnet/profnet-1.0.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://rostlab.org/profnet/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/libunwind"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild b/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
index 33cde935a96c..760508f64e07 100644
--- a/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
+++ b/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://rostlab.org/profphd-utils/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/sci-libs/proj/proj-9.4.1.ebuild b/sci-libs/proj/proj-9.4.1.ebuild
index 48b5fa0acdec..ee0636aa7c6f 100644
--- a/sci-libs/proj/proj-9.4.1.ebuild
+++ b/sci-libs/proj/proj-9.4.1.ebuild
@@ -22,7 +22,7 @@ else
 		https://download.osgeo.org/proj/${P}.tar.gz
 		https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz
 	"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/sci-libs/proj/proj-9.6.2.ebuild b/sci-libs/proj/proj-9.6.2.ebuild
index 306b255cd7d3..0af315478798 100644
--- a/sci-libs/proj/proj-9.6.2.ebuild
+++ b/sci-libs/proj/proj-9.6.2.ebuild
@@ -22,7 +22,7 @@ else
 		https://download.osgeo.org/proj/${P}.tar.gz
 		https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sci-libs/proj/proj-9.7.0.ebuild b/sci-libs/proj/proj-9.7.0.ebuild
index 496bb4c5e69e..34315083c214 100644
--- a/sci-libs/proj/proj-9.7.0.ebuild
+++ b/sci-libs/proj/proj-9.7.0.ebuild
@@ -22,7 +22,7 @@ else
 		https://download.osgeo.org/proj/${P}.tar.gz
 		https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sci-libs/proj/proj-9999.ebuild b/sci-libs/proj/proj-9999.ebuild
index 6b2abe6588ed..60951bf72e7e 100644
--- a/sci-libs/proj/proj-9999.ebuild
+++ b/sci-libs/proj/proj-9999.ebuild
@@ -22,7 +22,7 @@ else
 		https://download.osgeo.org/proj/${P}.tar.gz
 		https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sci-libs/punc/punc-1.5-r1.ebuild b/sci-libs/punc/punc-1.5-r1.ebuild
index cec749996b82..e278c1acc85b 100644
--- a/sci-libs/punc/punc-1.5-r1.ebuild
+++ b/sci-libs/punc/punc-1.5-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="debug doc mpi"
 
 RDEPEND="
diff --git a/sci-libs/qd/qd-2.3.24.ebuild b/sci-libs/qd/qd-2.3.24.ebuild
index 74e14e92bd61..22544c2ca37c 100644
--- a/sci-libs/qd/qd-2.3.24.ebuild
+++ b/sci-libs/qd/qd-2.3.24.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
 SRC_URI="https://www.davidhbailey.com/dhbsoftware/${P}.tar.gz"
 LICENSE="LBNLBSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran"
 
 src_configure() {
diff --git a/sci-libs/qfits/qfits-6.2.0-r1.ebuild b/sci-libs/qfits/qfits-6.2.0-r1.ebuild
index 99af0c8cacb7..16a846eca854 100644
--- a/sci-libs/qfits/qfits-6.2.0-r1.ebuild
+++ b/sci-libs/qfits/qfits-6.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.hq.eso.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
index 07f47c111f63..5efeb7f954b9 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="virtual/lapack"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild b/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild
index c965dbf3a46d..d842857dfd7f 100644
--- a/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild
+++ b/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/scotch/scotch-7.0.1-r1.ebuild b/sci-libs/scotch/scotch-7.0.1-r1.ebuild
index 2e8b2543cb5e..9d70e7c9b410 100644
--- a/sci-libs/scotch/scotch-7.0.1-r1.ebuild
+++ b/sci-libs/scotch/scotch-7.0.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc int64 mpi static-libs test tools +threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/scotch/scotch-7.0.8.ebuild b/sci-libs/scotch/scotch-7.0.8.ebuild
index 2a3c68052468..220c981d7463 100644
--- a/sci-libs/scotch/scotch-7.0.8.ebuild
+++ b/sci-libs/scotch/scotch-7.0.8.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc int64 mpi static-libs test tools +threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/shapelib/shapelib-1.6.0.ebuild b/sci-libs/shapelib/shapelib-1.6.0.ebuild
index 5817f09926a9..be4831792b27 100644
--- a/sci-libs/shapelib/shapelib-1.6.0.ebuild
+++ b/sci-libs/shapelib/shapelib-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/4"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/sci-libs/spqr/spqr-2.0.9-r4.ebuild b/sci-libs/spqr/spqr-2.0.9-r4.ebuild
index f30766f0a1db..83dc25f9c3c9 100644
--- a/sci-libs/spqr/spqr-2.0.9-r4.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc partition tbb"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/spqr/spqr-3.0.3.ebuild b/sci-libs/spqr/spqr-3.0.3.ebuild
index 53812a43e57a..27d1fec07706 100644
--- a/sci-libs/spqr/spqr-3.0.3.ebuild
+++ b/sci-libs/spqr/spqr-3.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/spr/spr-3.3.2-r2.ebuild b/sci-libs/spr/spr-3.3.2-r2.ebuild
index 519166e048fa..dc980c4bc817 100644
--- a/sci-libs/spr/spr-3.3.2-r2.ebuild
+++ b/sci-libs/spr/spr-3.3.2-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P^^}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="root static-libs"
 
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index 3996e95fe79c..411c7c26b63a 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index 836909a898fb..4b71210c33ab 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # SuiteSparse_config directory".
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-7.0.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-7.0.0.ebuild
index 026138061a20..92520e6f90cc 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-7.0.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-7.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="BSD"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="openmp"
 
 # BLAS availability is checked for at configuration time and will fail if it is not present.
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
index 53665c56e14f..d4d70de36a9d 100644
--- a/sci-libs/sundials/sundials-5.8.0.ebuild
+++ b/sci-libs/sundials/sundials-5.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/sundials/sundials-6.2.0.ebuild b/sci-libs/sundials/sundials-6.2.0.ebuild
index d7351c6df946..3aee1d5438c4 100644
--- a/sci-libs/sundials/sundials-6.2.0.ebuild
+++ b/sci-libs/sundials/sundials-6.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/sundials/sundials-6.5.0.ebuild b/sci-libs/sundials/sundials-6.5.0.ebuild
index d98b371af267..10458c916a9e 100644
--- a/sci-libs/sundials/sundials-6.5.0.ebuild
+++ b/sci-libs/sundials/sundials-6.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/sundials/sundials-7.0.0.ebuild b/sci-libs/sundials/sundials-7.0.0.ebuild
index e3baf22eb43e..5fed6275845c 100644
--- a/sci-libs/sundials/sundials-7.0.0.ebuild
+++ b/sci-libs/sundials/sundials-7.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/sundials/sundials-7.1.1.ebuild b/sci-libs/sundials/sundials-7.1.1.ebuild
index 3b46e35d136d..30474cddcdea 100644
--- a/sci-libs/sundials/sundials-7.1.1.ebuild
+++ b/sci-libs/sundials/sundials-7.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/sundials/sundials-7.3.0.ebuild b/sci-libs/sundials/sundials-7.3.0.ebuild
index 4777204f2779..f3a0cb847535 100644
--- a/sci-libs/sundials/sundials-7.3.0.ebuild
+++ b/sci-libs/sundials/sundials-7.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/sundials/sundials-7.5.0.ebuild b/sci-libs/sundials/sundials-7.5.0.ebuild
index 37f5b7d517c0..778f55a55763 100644
--- a/sci-libs/sundials/sundials-7.5.0.ebuild
+++ b/sci-libs/sundials/sundials-7.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/superlu/superlu-4.3-r2.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index e8887bb82b09..ecaa474b45a1 100644
--- a/sci-libs/superlu/superlu-4.3-r2.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/superlu/superlu-4.3-r4.ebuild b/sci-libs/superlu/superlu-4.3-r4.ebuild
index 3d6ee03311d3..ccbb4ad4f8f3 100644
--- a/sci-libs/superlu/superlu-4.3-r4.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/superlu/superlu-5.3.0.ebuild b/sci-libs/superlu/superlu-5.3.0.ebuild
index 9505abe780ea..bcffdc44f40f 100644
--- a/sci-libs/superlu/superlu-5.3.0.ebuild
+++ b/sci-libs/superlu/superlu-5.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiaoyeli/superlu/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/superlu/superlu-7.0.1.ebuild b/sci-libs/superlu/superlu-7.0.1.ebuild
index 6c528bf2c3fb..daa7ebf248c1 100644
--- a/sci-libs/superlu/superlu-7.0.1.ebuild
+++ b/sci-libs/superlu/superlu-7.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiaoyeli/superlu/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild
index adfa9a6f3431..ef4606e910f9 100644
--- a/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild
+++ b/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://portal.nersc.gov/project/sparse/superlu/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${SOVERSION}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc examples int64 openmp static-libs test threads"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( openmp threads )"
diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild
index d5986d830d63..be603412f76e 100644
--- a/sci-libs/szip/szip-2.1.1.ebuild
+++ b/sci-libs/szip/szip-2.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar.
 
 LICENSE="szip"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/tamu_anova/tamu_anova-0.2-r1.ebuild b/sci-libs/tamu_anova/tamu_anova-0.2-r1.ebuild
index 36f86cfa54bf..490fee9da718 100644
--- a/sci-libs/tamu_anova/tamu_anova-0.2-r1.ebuild
+++ b/sci-libs/tamu_anova/tamu_anova-0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cdn-fastly.deb.debian.org/debian/pool/main/t/tamuanova/tamuanova
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sci-libs/gsl:0="
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/taucs/taucs-2.2-r1.ebuild b/sci-libs/taucs/taucs-2.2-r1.ebuild
index 5d5cecde57a0..a4c1819261f3 100644
--- a/sci-libs/taucs/taucs-2.2-r1.ebuild
+++ b/sci-libs/taucs/taucs-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tau.ac.il/~stoledo/${PN}/${PV}/${PN}.tgz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/sci-libs/taucs/taucs-2.2.1.ebuild b/sci-libs/taucs/taucs-2.2.1.ebuild
index c8bc53a1478d..79fee5e52a92 100644
--- a/sci-libs/taucs/taucs-2.2.1.ebuild
+++ b/sci-libs/taucs/taucs-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sivantoledo/taucs/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/sci-libs/tnt/tnt-3.0.12.ebuild b/sci-libs/tnt/tnt-3.0.12.ebuild
index 591cc6535bd5..fae2b2367d38 100644
--- a/sci-libs/tnt/tnt-3.0.12.ebuild
+++ b/sci-libs/tnt/tnt-3.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://math.nist.gov/tnt/${MY_P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/sci-libs/trilinos/trilinos-14.4.0-r1.ebuild b/sci-libs/trilinos/trilinos-14.4.0-r1.ebuild
index b761f5333592..35b29abf3c6a 100644
--- a/sci-libs/trilinos/trilinos-14.4.0-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-14.4.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="
 	adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
diff --git a/sci-libs/trilinos/trilinos-15.1.1-r1.ebuild b/sci-libs/trilinos/trilinos-15.1.1-r1.ebuild
index 207cd19bcbfb..1f62985d2b93 100644
--- a/sci-libs/trilinos/trilinos-15.1.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-15.1.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="
 	adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
diff --git a/sci-libs/trilinos/trilinos-16.1.0-r2.ebuild b/sci-libs/trilinos/trilinos-16.1.0-r2.ebuild
index e4aea44f2fc9..f69fa5a120b3 100644
--- a/sci-libs/trilinos/trilinos-16.1.0-r2.ebuild
+++ b/sci-libs/trilinos/trilinos-16.1.0-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="
 	adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
diff --git a/sci-libs/trilinos/trilinos-16.1.0-r3.ebuild b/sci-libs/trilinos/trilinos-16.1.0-r3.ebuild
index 7c3a69093fba..ef5b243f6d78 100644
--- a/sci-libs/trilinos/trilinos-16.1.0-r3.ebuild
+++ b/sci-libs/trilinos/trilinos-16.1.0-r3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="
 	adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
diff --git a/sci-libs/udunits/udunits-2.2.28.ebuild b/sci-libs/udunits/udunits-2.2.28.ebuild
index 3dbebc08a08f..ceb08387b12b 100644
--- a/sci-libs/udunits/udunits-2.2.28.ebuild
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
 
 LICENSE="UCAR-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 
 RDEPEND="dev-libs/expat"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
index a0ba5a3ec2ce..d3e2e3ec812f 100644
--- a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
+++ b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="static-libs"
 
 src_compile() {
diff --git a/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild b/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild
index 1720b0f5e251..f38b9398a443 100644
--- a/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+cholmod doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index f4b6700f6350..e800ba92b64f 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+cholmod doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/umfpack/umfpack-6.1.0.ebuild b/sci-libs/umfpack/umfpack-6.1.0.ebuild
index ef5598cf60b0..184446b76c51 100644
--- a/sci-libs/umfpack/umfpack-6.1.0.ebuild
+++ b/sci-libs/umfpack/umfpack-6.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v$
 
 LICENSE="GPL-2+"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/vtk/vtk-9.4.2-r2.ebuild b/sci-libs/vtk/vtk-9.4.2-r2.ebuild
index 8b41399cd7ae..8d3e4b54fb96 100644
--- a/sci-libs/vtk/vtk-9.4.2-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.4.2-r2.ebuild
@@ -39,7 +39,7 @@ S="${WORKDIR}/VTK-${PV}"
 
 LICENSE="BSD LGPL-2"
 SLOT="0/${MY_PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 # TODO: Like to simplify these. Mostly the flags related to Groups.
 IUSE="all-modules boost +cgns cuda debug doc examples ffmpeg gdal gles2-only imaging
diff --git a/sci-libs/vtk/vtk-9.5.2.ebuild b/sci-libs/vtk/vtk-9.5.2.ebuild
index 5734483adfbc..63f680c9fb25 100644
--- a/sci-libs/vtk/vtk-9.5.2.ebuild
+++ b/sci-libs/vtk/vtk-9.5.2.ebuild
@@ -40,7 +40,7 @@ S="${WORKDIR}/VTK-${PV}"
 
 LICENSE="BSD LGPL-2"
 SLOT="0/${MY_PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 # TODO: Like to simplify these. Mostly the flags related to Groups.
 IUSE="all-modules boost +cgns cuda debug doc examples ffmpeg gdal gles2-only imaging
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r5.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r5.ebuild
index a14889d08d6b..e0a999220c39 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r5.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="VTK"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/xylib/xylib-1.6-r2.ebuild b/sci-libs/xylib/xylib-1.6-r2.ebuild
index 0a4db421324b..b6f533ef162a 100644
--- a/sci-libs/xylib/xylib-1.6-r2.ebuild
+++ b/sci-libs/xylib/xylib-1.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wojdyr/xylib/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 gui zlib"
 
 RDEPEND="
diff --git a/sci-mathematics/4ti2/4ti2-1.6.10.ebuild b/sci-mathematics/4ti2/4ti2-1.6.10.ebuild
index 15e60acb13a7..e6a18a37cf3f 100644
--- a/sci-mathematics/4ti2/4ti2-1.6.10.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.6.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/4ti2/4ti2/releases/download/Release_${PV//./_}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86"
 
 RDEPEND="
 	sci-mathematics/glpk:=[gmp]
diff --git a/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild b/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
index 826246629ec6..1880f7c76cd7 100644
--- a/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86"
 
 RDEPEND="
 	sci-mathematics/glpk:=[gmp]
diff --git a/sci-mathematics/arb/arb-2.23.0.ebuild b/sci-mathematics/arb/arb-2.23.0.ebuild
index c83f121700f5..3ebc0f5fad41 100644
--- a/sci-mathematics/arb/arb-2.23.0.ebuild
+++ b/sci-mathematics/arb/arb-2.23.0.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-mathematics/calc/calc-2.13.0.1.ebuild b/sci-mathematics/calc/calc-2.13.0.1.ebuild
index fc5ddd2bf3f5..808d5e3fed4f 100644
--- a/sci-mathematics/calc/calc-2.13.0.1.ebuild
+++ b/sci-mathematics/calc/calc-2.13.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	sys-libs/ncurses:0=
diff --git a/sci-mathematics/cgal/cgal-5.6.1.ebuild b/sci-mathematics/cgal/cgal-5.6.1.ebuild
index 96331fb26580..a151858daed4 100644
--- a/sci-mathematics/cgal/cgal-5.6.1.ebuild
+++ b/sci-mathematics/cgal/cgal-5.6.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/sci-mathematics/cgal/cgal-5.6.ebuild b/sci-mathematics/cgal/cgal-5.6.ebuild
index fa8a60e37526..6a85585bc3d4 100644
--- a/sci-mathematics/cgal/cgal-5.6.ebuild
+++ b/sci-mathematics/cgal/cgal-5.6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/sci-mathematics/cgal/cgal-6.0.1.ebuild b/sci-mathematics/cgal/cgal-6.0.1.ebuild
index 7bbc08f3ae97..bd9374daed57 100644
--- a/sci-mathematics/cgal/cgal-6.0.1.ebuild
+++ b/sci-mathematics/cgal/cgal-6.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/cgal/cgal-6.0.ebuild b/sci-mathematics/cgal/cgal-6.0.ebuild
index dfaa83e12fd9..5aeba7418f4e 100644
--- a/sci-mathematics/cgal/cgal-6.0.ebuild
+++ b/sci-mathematics/cgal/cgal-6.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/sci-mathematics/cgal/cgal-6.1.ebuild b/sci-mathematics/cgal/cgal-6.1.ebuild
index 94857ca5cd71..d394d0abe284 100644
--- a/sci-mathematics/cgal/cgal-6.1.ebuild
+++ b/sci-mathematics/cgal/cgal-6.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P^^}"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/dataplot/dataplot-20131220.ebuild b/sci-mathematics/dataplot/dataplot-20131220.ebuild
index ddad933a3c40..f7b33e66447f 100644
--- a/sci-mathematics/dataplot/dataplot-20131220.ebuild
+++ b/sci-mathematics/dataplot/dataplot-20131220.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples gd opengl X"
 
 REQUIRED_USE="opengl? ( X )"
diff --git a/sci-mathematics/dsfmt/dsfmt-2.2.4.ebuild b/sci-mathematics/dsfmt/dsfmt-2.2.4.ebuild
index fb35881b936e..d7ee4fbdc6c5 100644
--- a/sci-mathematics/dsfmt/dsfmt-2.2.4.ebuild
+++ b/sci-mathematics/dsfmt/dsfmt-2.2.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cc.patch
diff --git a/sci-mathematics/eclib/eclib-20250122.ebuild b/sci-mathematics/eclib/eclib-20250122.ebuild
index 8704f253f3ca..67f27fadf7a4 100644
--- a/sci-mathematics/eclib/eclib-20250122.ebuild
+++ b/sci-mathematics/eclib/eclib-20250122.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/${PV}/${P}.tar.b
 LICENSE="GPL-2+ LGPL-2.1+"
 
 SLOT="0/14"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="boost flint minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/eclib/eclib-20250627.ebuild b/sci-mathematics/eclib/eclib-20250627.ebuild
index e4401e9eab5c..f1f46ce9609a 100644
--- a/sci-mathematics/eclib/eclib-20250627.ebuild
+++ b/sci-mathematics/eclib/eclib-20250627.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/${PV}/${P}.tar.b
 LICENSE="GPL-2+ LGPL-2.1+"
 
 SLOT="0/14"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="boost flint minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/ent/ent-101202.ebuild b/sci-mathematics/ent/ent-101202.ebuild
index d69dd0083f7f..df2fabff70ad 100644
--- a/sci-mathematics/ent/ent-101202.ebuild
+++ b/sci-mathematics/ent/ent-101202.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/sci-mathematics/euler/euler-1.61.0-r1.ebuild b/sci-mathematics/euler/euler-1.61.0-r1.ebuild
index 2a65c72ae5cc..40be56508ddb 100644
--- a/sci-mathematics/euler/euler-1.61.0-r1.ebuild
+++ b/sci-mathematics/euler/euler-1.61.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://euler.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/euler/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc -sparc ~x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="x11-libs/gtk+:2"
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r6.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r6.ebuild
index bd8cc074708b..9046ed495b20 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r6.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="doc"
 
 # texlive-plaingeneric is needed for \usepackage{ulem} in
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r7.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r7.ebuild
index fa24bc6c8dfa..72a0fbbd9e0c 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r7.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="doc"
 
 # texlive-plaingeneric is needed for \usepackage{ulem} in
diff --git a/sci-mathematics/ginac/ginac-1.8.9.ebuild b/sci-mathematics/ginac/ginac-1.8.9.ebuild
index bd8cd4541e3c..929c7e6a19c8 100644
--- a/sci-mathematics/ginac/ginac-1.8.9.ebuild
+++ b/sci-mathematics/ginac/ginac-1.8.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.ginac.de/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc examples"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
diff --git a/sci-mathematics/glpk/glpk-5.0-r3.ebuild b/sci-mathematics/glpk/glpk-5.0-r3.ebuild
index 55607d1ebed2..f71ce53c8f24 100644
--- a/sci-mathematics/glpk/glpk-5.0-r3.ebuild
+++ b/sci-mathematics/glpk/glpk-5.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples gmp odbc mysql"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-mathematics/gmm/gmm-5.4.2.ebuild b/sci-mathematics/gmm/gmm-5.4.2.ebuild
index 1eb5ebd6d117..cf774e162d3b 100644
--- a/sci-mathematics/gmm/gmm-5.4.2.ebuild
+++ b/sci-mathematics/gmm/gmm-5.4.2.ebuild
@@ -9,5 +9,5 @@ HOMEPAGE="http://getfem.org/gmm.html"
 
 LICENSE="|| ( LGPL-3 LGPL-3-with-linking-exception )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~x86"
 IUSE=""
diff --git a/sci-mathematics/gretl/gretl-2021d.ebuild b/sci-mathematics/gretl/gretl-2021d.ebuild
index ca60b3f67725..ddde5369ce34 100644
--- a/sci-mathematics/gretl/gretl-2021d.ebuild
+++ b/sci-mathematics/gretl/gretl-2021d.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/40"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_avx emacs extras gnome gtk mpi nls odbc openmp python
 	readline cpu_flags_x86_sse2 R"
 
diff --git a/sci-mathematics/jags/jags-4.3.1-r1.ebuild b/sci-mathematics/jags/jags-4.3.1-r1.ebuild
index 4e6fddb2b4c8..c497f7195929 100644
--- a/sci-mathematics/jags/jags-4.3.1-r1.ebuild
+++ b/sci-mathematics/jags/jags-4.3.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-mathematics/lpsolve/lpsolve-5.5.2.11-r2.ebuild b/sci-mathematics/lpsolve/lpsolve-5.5.2.11-r2.ebuild
index 27af7e59e3b8..4560844a359f 100644
--- a/sci-mathematics/lpsolve/lpsolve-5.5.2.11-r2.ebuild
+++ b/sci-mathematics/lpsolve/lpsolve-5.5.2.11-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/lp_solve_$(ver_cut 1-2)
 
 LICENSE="LGPL-2.1"
 SLOT="0/55"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 DEPEND="sci-libs/colamd"
 RDEPEND="${DEPEND}"
diff --git a/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild b/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
index e906e8604965..c676647a4ee2 100644
--- a/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc gnuplot"
 
 DEPEND="
diff --git a/sci-mathematics/maxima/maxima-5.47.0-r2.ebuild b/sci-mathematics/maxima/maxima-5.47.0-r2.ebuild
index ade5b3db44fa..6fa9269a5769 100644
--- a/sci-mathematics/maxima/maxima-5.47.0-r2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.47.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 # say LLGPL version 2 or later which I have approximated by LLGPL-2.1.
 LICENSE="GPL-2 GPL-2+ LLGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
 
 IUSE="clisp clozurecl clozurecl64 cmucl ecl emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
diff --git a/sci-mathematics/maxima/maxima-5.48.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.48.1-r1.ebuild
index 71341590923c..6270e46fa88b 100644
--- a/sci-mathematics/maxima/maxima-5.48.1-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.48.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 # say LLGPL version 2 or later which I have approximated by LLGPL-2.1.
 LICENSE="GPL-2 GPL-2+ LLGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 
 IUSE="clisp clozurecl clozurecl64 cmucl ecl emacs gcl gmp gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
diff --git a/sci-mathematics/maxima/maxima-5.49.0.ebuild b/sci-mathematics/maxima/maxima-5.49.0.ebuild
index 71341590923c..6270e46fa88b 100644
--- a/sci-mathematics/maxima/maxima-5.49.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.49.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 # say LLGPL version 2 or later which I have approximated by LLGPL-2.1.
 LICENSE="GPL-2 GPL-2+ LLGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 
 IUSE="clisp clozurecl clozurecl64 cmucl ecl emacs gcl gmp gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
diff --git a/sci-mathematics/normaliz/normaliz-3.10.1.ebuild b/sci-mathematics/normaliz/normaliz-3.10.1.ebuild
index 2cf345d7f3a2..da247765914b 100644
--- a/sci-mathematics/normaliz/normaliz-3.10.1.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Normaliz/Normaliz/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="doc extras nauty openmp"
 
 RDEPEND="
diff --git a/sci-mathematics/normaliz/normaliz-3.10.5.ebuild b/sci-mathematics/normaliz/normaliz-3.10.5.ebuild
index aa4135843240..c7fc0c7e4dc8 100644
--- a/sci-mathematics/normaliz/normaliz-3.10.5.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.10.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Normaliz/Normaliz/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="doc extras nauty openmp"
 
 RDEPEND="
diff --git a/sci-mathematics/normaliz/normaliz-3.11.0.ebuild b/sci-mathematics/normaliz/normaliz-3.11.0.ebuild
index aa4135843240..c7fc0c7e4dc8 100644
--- a/sci-mathematics/normaliz/normaliz-3.11.0.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Normaliz/Normaliz/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="doc extras nauty openmp"
 
 RDEPEND="
diff --git a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
index 987b73b0907e..5c1352a2d2d8 100644
--- a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Normaliz/Normaliz/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="doc extras nauty openmp"
 
 RDEPEND="
diff --git a/sci-mathematics/octave/octave-9.2.0-r2.ebuild b/sci-mathematics/octave/octave-9.2.0-r2.ebuild
index cd6209c23af8..c1c05db298f0 100644
--- a/sci-mathematics/octave/octave-9.2.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-9.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 imagemagick java json klu portaudio postscript +qhull +qrupdate readline sndfile +sparse spqr ssl sundials zlib"
 
diff --git a/sci-mathematics/otter/otter-3.3-r4.ebuild b/sci-mathematics/otter/otter-3.3-r4.ebuild
index a5c3c969c8fa..231cb0bc5654 100644
--- a/sci-mathematics/otter/otter-3.3-r4.ebuild
+++ b/sci-mathematics/otter/otter-3.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.unm.edu/~mccune/otter/${P}.tar.gz"
 
 LICENSE="otter"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/sci-mathematics/pari-data/pari-data-20191216.ebuild b/sci-mathematics/pari-data/pari-data-20191216.ebuild
index f2676521d946..3d652926abc6 100644
--- a/sci-mathematics/pari-data/pari-data-20191216.ebuild
+++ b/sci-mathematics/pari-data/pari-data-20191216.ebuild
@@ -18,7 +18,7 @@ done
 S="${WORKDIR}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
 
 src_install() {
 	insinto /usr/share/pari
diff --git a/sci-mathematics/pari/pari-2.15.5.ebuild b/sci-mathematics/pari/pari-2.15.5.ebuild
index b523940fbc85..9cf01efc5825 100644
--- a/sci-mathematics/pari/pari-2.15.5.ebuild
+++ b/sci-mathematics/pari/pari-2.15.5.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="data doc examples fltk gmp test threads X"
 REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/pari/pari-2.17.1.ebuild b/sci-mathematics/pari/pari-2.17.1.ebuild
index 573281a37524..8a91812612b2 100644
--- a/sci-mathematics/pari/pari-2.17.1.ebuild
+++ b/sci-mathematics/pari/pari-2.17.1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/9"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="data doc examples fltk gmp test threads X"
 REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/pari/pari-2.17.2.ebuild b/sci-mathematics/pari/pari-2.17.2.ebuild
index 87d6c983af01..0fe1dabe11d2 100644
--- a/sci-mathematics/pari/pari-2.17.2.ebuild
+++ b/sci-mathematics/pari/pari-2.17.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="data doc examples fltk gmp test threads X"
 REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/polymake/polymake-4.13.ebuild b/sci-mathematics/polymake/polymake-4.13.ebuild
index e7f06938aa0e..98e9eccf83f2 100644
--- a/sci-mathematics/polymake/polymake-4.13.ebuild
+++ b/sci-mathematics/polymake/polymake-4.13.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2"
 # closer look at how (or even if) the corresponding code is being used.
 LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~amd64-linux"
+KEYWORDS="amd64 ~riscv"
 IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
 
 REQUIRED_USE="^^ ( bliss nauty )"
diff --git a/sci-mathematics/polymake/polymake-4.14.ebuild b/sci-mathematics/polymake/polymake-4.14.ebuild
index 522c10bb5da0..0435abcf55e3 100644
--- a/sci-mathematics/polymake/polymake-4.14.ebuild
+++ b/sci-mathematics/polymake/polymake-4.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2"
 # closer look at how (or even if) the corresponding code is being used.
 LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~amd64-linux"
+KEYWORDS="~amd64 ~riscv"
 IUSE="+bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
 
 REQUIRED_USE="^^ ( bliss nauty )"
diff --git a/sci-mathematics/polymake/polymake-4.15.ebuild b/sci-mathematics/polymake/polymake-4.15.ebuild
index c9149b52c447..9093944ff4c9 100644
--- a/sci-mathematics/polymake/polymake-4.15.ebuild
+++ b/sci-mathematics/polymake/polymake-4.15.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2"
 # closer look at how (or even if) the corresponding code is being used.
 LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~amd64-linux"
+KEYWORDS="amd64 ~riscv"
 IUSE="+bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
 
 REQUIRED_USE="^^ ( bliss nauty )"
diff --git a/sci-mathematics/prng/prng-3.0.2-r4.ebuild b/sci-mathematics/prng/prng-3.0.2-r4.ebuild
index dfcc63eed90a..77fbb36c54ed 100644
--- a/sci-mathematics/prng/prng-3.0.2-r4.ebuild
+++ b/sci-mathematics/prng/prng-3.0.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://statmath.wu.ac.at/prng/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT=0
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples static-libs"
 
 PATCHES=(
diff --git a/sci-mathematics/pspp/pspp-1.6.2-r3.ebuild b/sci-mathematics/pspp/pspp-1.6.2-r3.ebuild
index a468dadb580c..5f38ffeaf41d 100644
--- a/sci-mathematics/pspp/pspp-1.6.2-r3.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples gtk ncurses nls perl postgres"
 
 RDEPEND="
diff --git a/sci-mathematics/pspp/pspp-2.0.1-r1.ebuild b/sci-mathematics/pspp/pspp-2.0.1-r1.ebuild
index 184e99d3f0a6..7338a24a0fb2 100644
--- a/sci-mathematics/pspp/pspp-2.0.1-r1.ebuild
+++ b/sci-mathematics/pspp/pspp-2.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples gui ncurses nls perl postgres"
 
 RDEPEND="
diff --git a/sci-mathematics/rkward/rkward-0.8.2.ebuild b/sci-mathematics/rkward/rkward-0.8.2.ebuild
index 246ad828cc2d..dc6deaf603b3 100644
--- a/sci-mathematics/rkward/rkward-0.8.2.ebuild
+++ b/sci-mathematics/rkward/rkward-0.8.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://rkward.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~amd64-linux"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2+ LGPL-2"
diff --git a/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild b/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
index 918e8fcca42d..dbfdd7c79257 100644
--- a/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
+++ b/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://statmath.wu.ac.at/software/RngStreams/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples"
 
 my_src_configure() {
diff --git a/sci-mathematics/rw/rw-0.9.ebuild b/sci-mathematics/rw/rw-0.9.ebuild
index 91731047f0b5..296b4cf945a9 100644
--- a/sci-mathematics/rw/rw-0.9.ebuild
+++ b/sci-mathematics/rw/rw-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~x64-macos"
 
 # We have a file collision (librw.so) with xpaint, bug 560210.
 RDEPEND="!media-gfx/xpaint"
diff --git a/sci-mathematics/singular/singular-4.4.1-r1.ebuild b/sci-mathematics/singular/singular-4.4.1-r1.ebuild
index 50552c9c8306..cee0c0d0b995 100644
--- a/sci-mathematics/singular/singular-4.4.1-r1.ebuild
+++ b/sci-mathematics/singular/singular-4.4.1-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 # are no GPL-2-only files.
 LICENSE="BSD GPL-2 GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 IUSE="emacs examples polymake +readline"
 
 # The interactive help uses "info" from sys-apps/texinfo.
diff --git a/sci-mathematics/singular/singular-4.4.1.ebuild b/sci-mathematics/singular/singular-4.4.1.ebuild
index 0a1dc9c1333f..1514dc5f3d96 100644
--- a/sci-mathematics/singular/singular-4.4.1.ebuild
+++ b/sci-mathematics/singular/singular-4.4.1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 # are no GPL-2-only files.
 LICENSE="BSD GPL-2 GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
 IUSE="emacs examples polymake +readline"
 
 # The interactive help uses "info" from sys-apps/texinfo.
diff --git a/sci-mathematics/unuran/unuran-1.8.1.ebuild b/sci-mathematics/unuran/unuran-1.8.1.ebuild
index d53ac22a555e..e28adfbe05ac 100644
--- a/sci-mathematics/unuran/unuran-1.8.1.ebuild
+++ b/sci-mathematics/unuran/unuran-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://statmath.wu.ac.at/unuran/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples gsl prng +rngstreams"
 
 DEPEND="
diff --git a/sci-mathematics/unuran/unuran-1.9.0.ebuild b/sci-mathematics/unuran/unuran-1.9.0.ebuild
index 3cc0fe7faa9f..2ae7df2d359d 100644
--- a/sci-mathematics/unuran/unuran-1.9.0.ebuild
+++ b/sci-mathematics/unuran/unuran-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://statmath.wu.ac.at/unuran/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples gsl prng +rngstreams"
 
 DEPEND="
diff --git a/sci-misc/fitscut/fitscut-1.4.4-r1.ebuild b/sci-misc/fitscut/fitscut-1.4.4-r1.ebuild
index 1b88c8f32e5f..c4aa902bfdac 100644
--- a/sci-misc/fitscut/fitscut-1.4.4-r1.ebuild
+++ b/sci-misc/fitscut/fitscut-1.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	media-libs/libjpeg-turbo:=
diff --git a/sci-misc/fitsverify/fitsverify-4.20.ebuild b/sci-misc/fitsverify/fitsverify-4.20.ebuild
index c194846beabf..0f5e5f545299 100644
--- a/sci-misc/fitsverify/fitsverify-4.20.ebuild
+++ b/sci-misc/fitsverify/fitsverify-4.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sci-libs/cfitsio:0="
 DEPEND="${RDEPEND}"
diff --git a/sci-misc/h5utils/h5utils-1.13.1.ebuild b/sci-misc/h5utils/h5utils-1.13.1.ebuild
index 1300831c0269..7d33e735b714 100644
--- a/sci-misc/h5utils/h5utils-1.13.1.ebuild
+++ b/sci-misc/h5utils/h5utils-1.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NanoComp/h5utils/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="hdf octave"
 
 DEPEND="
diff --git a/sci-misc/nco/nco-5.1.3-r1.ebuild b/sci-misc/nco/nco-5.1.3-r1.ebuild
index 1350da622372..9c3c1e548d89 100644
--- a/sci-misc/nco/nco-5.1.3-r1.ebuild
+++ b/sci-misc/nco/nco-5.1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="dap gsl hdf5 ncap2 openmp test udunits"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-misc/ncview/ncview-2.1.8.ebuild b/sci-misc/ncview/ncview-2.1.8.ebuild
index f85dbe848aa1..5df8f0b5bbb0 100644
--- a/sci-misc/ncview/ncview-2.1.8.ebuild
+++ b/sci-misc/ncview/ncview-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://cirrus.ucsd.edu/pub/ncview/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	media-libs/libpng:0=
diff --git a/sci-ml/cudnn-frontend/cudnn-frontend-1.11.0.ebuild b/sci-ml/cudnn-frontend/cudnn-frontend-1.11.0.ebuild
index d75bfa8c4efb..3bdf08c87699 100644
--- a/sci-ml/cudnn-frontend/cudnn-frontend-1.11.0.ebuild
+++ b/sci-ml/cudnn-frontend/cudnn-frontend-1.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="~amd64"
 IUSE="samples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-ml/cudnn-frontend/cudnn-frontend-1.12.1.ebuild b/sci-ml/cudnn-frontend/cudnn-frontend-1.12.1.ebuild
index d75bfa8c4efb..3bdf08c87699 100644
--- a/sci-ml/cudnn-frontend/cudnn-frontend-1.12.1.ebuild
+++ b/sci-ml/cudnn-frontend/cudnn-frontend-1.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="~amd64"
 IUSE="samples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-physics/bullet/bullet-3.21.ebuild b/sci-physics/bullet/bullet-3.21.ebuild
index 9a61fccf6b25..964fa6041a4e 100644
--- a/sci-physics/bullet/bullet-3.21.ebuild
+++ b/sci-physics/bullet/bullet-3.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc double-precision examples extras openmp tbb test +threads"
 
 REQUIRED_USE="
diff --git a/sci-physics/bullet/bullet-3.22b.ebuild b/sci-physics/bullet/bullet-3.22b.ebuild
index dc16ccdb4491..cff5c5be159b 100644
--- a/sci-physics/bullet/bullet-3.22b.ebuild
+++ b/sci-physics/bullet/bullet-3.22b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bulletphysics/${PN}3/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc double-precision examples extras openmp tbb test +threads"
 
 REQUIRED_USE="
diff --git a/sci-physics/clhep/clhep-2.4.7.1-r1.ebuild b/sci-physics/clhep/clhep-2.4.7.1-r1.ebuild
index 3428e0846bd1..af61611f88f4 100644
--- a/sci-physics/clhep/clhep-2.4.7.1-r1.ebuild
+++ b/sci-physics/clhep/clhep-2.4.7.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PV}/CLHEP"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~x64-macos"
 
 IUSE="doc static-libs test threads"
 RESTRICT="!test? ( test )"
diff --git a/sci-physics/clhep/clhep-2.4.7.2.ebuild b/sci-physics/clhep/clhep-2.4.7.2.ebuild
index 6e143a343918..230868099ca1 100644
--- a/sci-physics/clhep/clhep-2.4.7.2.ebuild
+++ b/sci-physics/clhep/clhep-2.4.7.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/CLHEP-${MY_P}"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 IUSE="doc static-libs test threads"
 RESTRICT="!test? ( test )"
diff --git a/sci-physics/espresso/espresso-4.2.2.ebuild b/sci-physics/espresso/espresso-4.2.2.ebuild
index 6035862228ba..1a8667bcdc8e 100644
--- a/sci-physics/espresso/espresso-4.2.2.ebuild
+++ b/sci-physics/espresso/espresso-4.2.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}"
 fi
 
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index cc0a5e754d5a..795e61d1fd3a 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}"
 fi
 
diff --git a/sci-physics/fastjet/fastjet-3.4.3.ebuild b/sci-physics/fastjet/fastjet-3.4.3.ebuild
index d1211e191d28..c05a63517539 100644
--- a/sci-physics/fastjet/fastjet-3.4.3.ebuild
+++ b/sci-physics/fastjet/fastjet-3.4.3.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/fastjet"
 else
 	SRC_URI="https://fastjet.fr/repo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-physics/fastjet/fastjet-3.5.1-r2.ebuild b/sci-physics/fastjet/fastjet-3.5.1-r2.ebuild
index cb4421fca46a..4bbfb0f80d02 100644
--- a/sci-physics/fastjet/fastjet-3.5.1-r2.ebuild
+++ b/sci-physics/fastjet/fastjet-3.5.1-r2.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/fastjet"
 else
 	SRC_URI="https://fastjet.fr/repo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-physics/fastjet/fastjet-3.5.1.ebuild b/sci-physics/fastjet/fastjet-3.5.1.ebuild
index 086e3352290e..060605937049 100644
--- a/sci-physics/fastjet/fastjet-3.5.1.ebuild
+++ b/sci-physics/fastjet/fastjet-3.5.1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/fastjet"
 else
 	SRC_URI="https://fastjet.fr/repo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-physics/fastjet/fastjet-9999.ebuild b/sci-physics/fastjet/fastjet-9999.ebuild
index 947dc9757c8d..dae4ec8ac525 100644
--- a/sci-physics/fastjet/fastjet-9999.ebuild
+++ b/sci-physics/fastjet/fastjet-9999.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/fastjet"
 else
 	SRC_URI="https://fastjet.fr/repo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-physics/geant-data/geant-data-4.11.3.ebuild b/sci-physics/geant-data/geant-data-4.11.3.ebuild
index fde34b26f7cd..8cc5e6fc73d2 100644
--- a/sci-physics/geant-data/geant-data-4.11.3.ebuild
+++ b/sci-physics/geant-data/geant-data-4.11.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="geant4"
 
 SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 declare -A DATASETS
 
diff --git a/sci-physics/geant-data/geant-data-4.11.4.ebuild b/sci-physics/geant-data/geant-data-4.11.4.ebuild
index 40ffd84646da..1505d4cc1530 100644
--- a/sci-physics/geant-data/geant-data-4.11.4.ebuild
+++ b/sci-physics/geant-data/geant-data-4.11.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="geant4"
 
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 declare -A DATASETS
 
diff --git a/sci-physics/geant/geant-4.11.3.2-r2.ebuild b/sci-physics/geant/geant-4.11.3.2-r2.ebuild
index d1a2ee7a2c08..d8610df7919c 100644
--- a/sci-physics/geant/geant-4.11.3.2-r2.ebuild
+++ b/sci-physics/geant/geant-4.11.3.2-r2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="geant4"
 SLOT="4/$(ver_cut 1-4)"
 
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="+data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	qt6 raytracerx static-libs tbb threads trajectories vtk"
 
diff --git a/sci-physics/geant/geant-4.11.4.0.ebuild b/sci-physics/geant/geant-4.11.4.0.ebuild
index f06acadede91..4e23edb9b40d 100644
--- a/sci-physics/geant/geant-4.11.4.0.ebuild
+++ b/sci-physics/geant/geant-4.11.4.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="geant4"
 SLOT="4/$(ver_cut 1-4)"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="+data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	qt6 raytracerx static-libs tbb threads trajectories vtk"
 
diff --git a/sci-physics/hepmc/hepmc-2.06.11.ebuild b/sci-physics/hepmc/hepmc-2.06.11.ebuild
index b0d8503680db..872da021c9fb 100644
--- a/sci-physics/hepmc/hepmc-2.06.11.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="cm doc examples gev test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-physics/heppdt/heppdt-3.04.01-r2.ebuild b/sci-physics/heppdt/heppdt-3.04.01-r2.ebuild
index 8751a4c1512d..3c32b2a306e7 100644
--- a/sci-physics/heppdt/heppdt-3.04.01-r2.ebuild
+++ b/sci-physics/heppdt/heppdt-3.04.01-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/HepPDT-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples static-libs"
 
 src_prepare() {
diff --git a/sci-physics/herwig/herwig-6.5.21-r2.ebuild b/sci-physics/herwig/herwig-6.5.21-r2.ebuild
index ead2a6ad3021..276061b578d8 100644
--- a/sci-physics/herwig/herwig-6.5.21-r2.ebuild
+++ b/sci-physics/herwig/herwig-6.5.21-r2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 IUSE="doc static-libs"
 RESTRICT="mirror bindist"
diff --git a/sci-physics/looptools/looptools-2.15-r1.ebuild b/sci-physics/looptools/looptools-2.15-r1.ebuild
index bdfdf06bbed3..9e6b7471acf9 100644
--- a/sci-physics/looptools/looptools-2.15-r1.ebuild
+++ b/sci-physics/looptools/looptools-2.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.feynarts.de/looptools/${MY_P}.tar.gz"
 LICENSE="LGPL-3"
 
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/sci-physics/looptools/looptools-2.15.ebuild b/sci-physics/looptools/looptools-2.15.ebuild
index 2cd0f8957666..b60ae930f667 100644
--- a/sci-physics/looptools/looptools-2.15.ebuild
+++ b/sci-physics/looptools/looptools-2.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.feynarts.de/looptools/${MY_P}.tar.gz"
 LICENSE="LGPL-3"
 
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
diff --git a/sci-physics/looptools/looptools-2.16.ebuild b/sci-physics/looptools/looptools-2.16.ebuild
index f6c4fc6fab0b..d761a8223036 100644
--- a/sci-physics/looptools/looptools-2.16.ebuild
+++ b/sci-physics/looptools/looptools-2.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.feynarts.de/looptools/${MY_P}.tar.gz"
 LICENSE="LGPL-3"
 
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index 14188ab9f6df..ba5c26c40b9b 100644
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 
 SLOT="6"
 LICENSE="public-domain"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
diff --git a/sci-physics/pythia/pythia-8.2.45-r2.ebuild b/sci-physics/pythia/pythia-8.2.45-r2.ebuild
index ca14228e6288..453e094a15e0 100644
--- a/sci-physics/pythia/pythia-8.2.45-r2.ebuild
+++ b/sci-physics/pythia/pythia-8.2.45-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://pythia.org/download/${PN}${MV}/${MY_P}.tgz
 
 SLOT="8"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples fastjet +hepmc lhapdf root test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-physics/reduze/reduze-2.4-r1.ebuild b/sci-physics/reduze/reduze-2.4-r1.ebuild
index 3bc4fe709a76..b9f9cb0dc0c1 100644
--- a/sci-physics/reduze/reduze-2.4-r1.ebuild
+++ b/sci-physics/reduze/reduze-2.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://reduze.hepforge.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="berkdb doc examples mpi"
 
 RDEPEND="
diff --git a/sci-physics/siscone/siscone-3.0.6.ebuild b/sci-physics/siscone/siscone-3.0.6.ebuild
index e646896d056d..659a40bd2941 100644
--- a/sci-physics/siscone/siscone-3.0.6.ebuild
+++ b/sci-physics/siscone/siscone-3.0.6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/siscone"
 else
 	SRC_URI="https://siscone.hepforge.org/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-physics/siscone/siscone-3.1.0.ebuild b/sci-physics/siscone/siscone-3.1.0.ebuild
index e56900e4472e..fe5babd2ef20 100644
--- a/sci-physics/siscone/siscone-3.1.0.ebuild
+++ b/sci-physics/siscone/siscone-3.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/siscone"
 else
 	SRC_URI="https://siscone.hepforge.org/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-physics/siscone/siscone-3.1.2-r1.ebuild b/sci-physics/siscone/siscone-3.1.2-r1.ebuild
index e781b37201d2..32248d39800c 100644
--- a/sci-physics/siscone/siscone-3.1.2-r1.ebuild
+++ b/sci-physics/siscone/siscone-3.1.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/siscone"
 else
 	SRC_URI="https://siscone.hepforge.org/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-physics/siscone/siscone-3.1.2.ebuild b/sci-physics/siscone/siscone-3.1.2.ebuild
index e844c65b1deb..71c307e60109 100644
--- a/sci-physics/siscone/siscone-3.1.2.ebuild
+++ b/sci-physics/siscone/siscone-3.1.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/siscone"
 else
 	SRC_URI="https://siscone.hepforge.org/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-physics/siscone/siscone-9999.ebuild b/sci-physics/siscone/siscone-9999.ebuild
index e781b37201d2..32248d39800c 100644
--- a/sci-physics/siscone/siscone-9999.ebuild
+++ b/sci-physics/siscone/siscone-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/fastjet/siscone"
 else
 	SRC_URI="https://siscone.hepforge.org/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild b/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild
index 002832677e4f..1e9284df07a2 100644
--- a/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild
+++ b/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0/20"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="emacs fastjet hepmc lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-physics/xfoil/xfoil-6.99-r1.ebuild b/sci-physics/xfoil/xfoil-6.99-r1.ebuild
index 9628062e61ee..cbdee51c50c3 100644
--- a/sci-physics/xfoil/xfoil-6.99-r1.ebuild
+++ b/sci-physics/xfoil/xfoil-6.99-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN^}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples"
 
 RDEPEND="x11-libs/libX11"
diff --git a/sci-physics/yoda/yoda-1.9.5.ebuild b/sci-physics/yoda/yoda-1.9.5.ebuild
index e21cc066b474..3f12370c67d9 100644
--- a/sci-physics/yoda/yoda-1.9.5.ebuild
+++ b/sci-physics/yoda/yoda-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://yoda.hepforge.org/downloads?f=${P^^}.tar.bz2 -> ${P^^}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="root"
 
 RDEPEND="root? ( sci-physics/root:= )"
diff --git a/sci-visualization/epix/epix-1.2.19-r1.ebuild b/sci-visualization/epix/epix-1.2.19-r1.ebuild
index 0990b496a095..95f0d35b9b3c 100644
--- a/sci-visualization/epix/epix-1.2.19-r1.ebuild
+++ b/sci-visualization/epix/epix-1.2.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc emacs examples"
 
 DEPEND="
diff --git a/sci-visualization/epix/epix-1.2.19.ebuild b/sci-visualization/epix/epix-1.2.19.ebuild
index 68c038fba49f..18296e078024 100644
--- a/sci-visualization/epix/epix-1.2.19.ebuild
+++ b/sci-visualization/epix/epix-1.2.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc emacs examples"
 
 DEPEND="
diff --git a/sci-visualization/fig2sxd/fig2sxd-0.23.ebuild b/sci-visualization/fig2sxd/fig2sxd-0.23.ebuild
index f57d59c6fa05..6b8eca705799 100644
--- a/sci-visualization/fig2sxd/fig2sxd-0.23.ebuild
+++ b/sci-visualization/fig2sxd/fig2sxd-0.23.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-v${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="virtual/zlib:="
 RDEPEND="${DEPEND}"
diff --git a/sci-visualization/fityk/fityk-1.3.2-r1.ebuild b/sci-visualization/fityk/fityk-1.3.2-r1.ebuild
index 87c5635d5b3b..d18705f1f3be 100644
--- a/sci-visualization/fityk/fityk-1.3.2-r1.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnuplot nlopt readline wxwidgets"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild
index 8bcc2cc9695c..a8339d03c623 100644
--- a/sci-visualization/g3data/g3data-1.5.4.ebuild
+++ b/sci-visualization/g3data/g3data-1.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pn2200/g3data/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/sci-visualization/ggobi/ggobi-2.1.11-r1.ebuild b/sci-visualization/ggobi/ggobi-2.1.11-r1.ebuild
index 1e0a02fff80c..bda0ae45e96c 100644
--- a/sci-visualization/ggobi/ggobi-2.1.11-r1.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.bz2"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc minimal nls"
 
 RDEPEND="
diff --git a/sci-visualization/ggobi/ggobi-2.1.12-r1.ebuild b/sci-visualization/ggobi/ggobi-2.1.12-r1.ebuild
index bf986c035f98..ba63061f517e 100644
--- a/sci-visualization/ggobi/ggobi-2.1.12-r1.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ggobi/ggobi/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="doc minimal nls"
 
 RDEPEND="
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.10-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.10-r2.ebuild
index ec7a9548507e..ec959cd8a30d 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.10-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.10-r2.ebuild
@@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-visualization/gnuplot/gnuplot-6.0.2-r2.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.2-r2.ebuild
index 5cc284f190fc..4732bb60f5cc 100644
--- a/sci-visualization/gnuplot/gnuplot-6.0.2-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.0.2-r2.ebuild
@@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-visualization/gnuplot/gnuplot-6.0.3.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.3.ebuild
index 7fca838f7872..6ca6d8f1b72f 100644
--- a/sci-visualization/gnuplot/gnuplot-6.0.3.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.0.3.ebuild
@@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
index 2d63a907478c..2e98ea6a1285 100644
--- a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
@@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-visualization/grace/grace-5.1.25_p17.ebuild b/sci-visualization/grace/grace-5.1.25_p17.ebuild
index 6e02fb8268fd..1c3acaa07654 100644
--- a/sci-visualization/grace/grace-5.1.25_p17.ebuild
+++ b/sci-visualization/grace/grace-5.1.25_p17.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="fftw fortran jpeg netcdf png"
 
 DEPEND="
diff --git a/sci-visualization/grace/grace-5.1.25_p18.ebuild b/sci-visualization/grace/grace-5.1.25_p18.ebuild
index eddde9d4a090..c3bd76996d91 100644
--- a/sci-visualization/grace/grace-5.1.25_p18.ebuild
+++ b/sci-visualization/grace/grace-5.1.25_p18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="fftw fortran jpeg netcdf png"
 
 DEPEND="
diff --git a/sci-visualization/gwyddion/gwyddion-2.67-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.67-r1.ebuild
index e4cb48b3e859..c69abff262bd 100644
--- a/sci-visualization/gwyddion/gwyddion-2.67-r1.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.67-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
 
 RDEPEND="
diff --git a/sci-visualization/gwyddion/gwyddion-2.69.ebuild b/sci-visualization/gwyddion/gwyddion-2.69.ebuild
index b1608c67e30d..f3d890d3c54f 100644
--- a/sci-visualization/gwyddion/gwyddion-2.69.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.69.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
 
 RDEPEND="
diff --git a/sci-visualization/quickplot/quickplot-0.10.6-r1.ebuild b/sci-visualization/quickplot/quickplot-0.10.6-r1.ebuild
index 0e79911bee97..78fb8ea47e59 100644
--- a/sci-visualization/quickplot/quickplot-0.10.6-r1.ebuild
+++ b/sci-visualization/quickplot/quickplot-0.10.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 3679f193db3d..65ad58b2bcbb 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	media-libs/libsndfile:=
diff --git a/sci-visualization/veusz/veusz-4.0.ebuild b/sci-visualization/veusz/veusz-4.0.ebuild
index 312c961a9c8c..39c8d1c04c8d 100644
--- a/sci-visualization/veusz/veusz-4.0.ebuild
+++ b/sci-visualization/veusz/veusz-4.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://veusz.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}-fix/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="dbus hdf5"
 
 COMMON_DEPEND="
diff --git a/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild b/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild
index bd416d2b14ed..9845105b7850 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="x11-libs/libXpm"
diff --git a/sci-visualization/xd3d/xd3d-8.3.1-r3.ebuild b/sci-visualization/xd3d/xd3d-8.3.1-r3.ebuild
index 937207cb4ce7..9ca2c7fa1c18 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1-r3.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="x11-libs/libXpm"
diff --git a/sci-visualization/xgraph/xgraph-12.1-r5.ebuild b/sci-visualization/xgraph/xgraph-12.1-r5.ebuild
index 26cec0c6f0f9..85e915a20228 100644
--- a/sci-visualization/xgraph/xgraph-12.1-r5.ebuild
+++ b/sci-visualization/xgraph/xgraph-12.1-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.isi.edu/nsnam/dist/${P}.tar.gz
 
 LICENSE="xgraph"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86"
 IUSE="examples"
 
 RDEPEND="x11-libs/libSM
diff --git a/sci-visualization/xyscan/xyscan-4.6.6.ebuild b/sci-visualization/xyscan/xyscan-4.6.6.ebuild
index 1a1e97ef8a7a..6ee4d98f00ef 100644
--- a/sci-visualization/xyscan/xyscan-4.6.6.ebuild
+++ b/sci-visualization/xyscan/xyscan-4.6.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	app-text/poppler[qt6]
diff --git a/sec-keys/openpgp-keys-eschwartz/openpgp-keys-eschwartz-20250723-r1.ebuild b/sec-keys/openpgp-keys-eschwartz/openpgp-keys-eschwartz-20250723-r1.ebuild
index e43f7d7d5670..3bf454884f86 100644
--- a/sec-keys/openpgp-keys-eschwartz/openpgp-keys-eschwartz-20250723-r1.ebuild
+++ b/sec-keys/openpgp-keys-eschwartz/openpgp-keys-eschwartz-20250723-r1.ebuild
@@ -13,4 +13,4 @@ inherit sec-keys
 DESCRIPTION="OpenPGP keys used by Eli Schwartz"
 HOMEPAGE="https://github.com/eli-schwartz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
diff --git a/sec-keys/openpgp-keys-fefe/openpgp-keys-fefe-20250926.ebuild b/sec-keys/openpgp-keys-fefe/openpgp-keys-fefe-20250926.ebuild
index 984bb8799a3d..602878dda779 100644
--- a/sec-keys/openpgp-keys-fefe/openpgp-keys-fefe-20250926.ebuild
+++ b/sec-keys/openpgp-keys-fefe/openpgp-keys-fefe-20250926.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.fefe.de/felix@fefe.de.asc"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~sparc ~x86"
 
 S=${WORKDIR}
 
diff --git a/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20250806.ebuild b/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20250806.ebuild
index 5cf5f302e134..2f2195328efa 100644
--- a/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20250806.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20250806.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sec-keys/openpgp-keys-gnustep/openpgp-keys-gnustep-20251025.ebuild b/sec-keys/openpgp-keys-gnustep/openpgp-keys-gnustep-20251025.ebuild
index e8042e03aaa3..a2fda1416b74 100644
--- a/sec-keys/openpgp-keys-gnustep/openpgp-keys-gnustep-20251025.ebuild
+++ b/sec-keys/openpgp-keys-gnustep/openpgp-keys-gnustep-20251025.ebuild
@@ -12,4 +12,4 @@ inherit sec-keys
 DESCRIPTION="OpenPGP keys used by the GNUstep project"
 HOMEPAGE="https://www.gnustep.org/"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
diff --git a/sec-keys/openpgp-keys-jberkenbilt/openpgp-keys-jberkenbilt-1.ebuild b/sec-keys/openpgp-keys-jberkenbilt/openpgp-keys-jberkenbilt-1.ebuild
index c4ca86b23d42..39dad09d725c 100644
--- a/sec-keys/openpgp-keys-jberkenbilt/openpgp-keys-jberkenbilt-1.ebuild
+++ b/sec-keys/openpgp-keys-jberkenbilt/openpgp-keys-jberkenbilt-1.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	insinto /usr/share/openpgp-keys
diff --git a/sec-keys/openpgp-keys-jpakkane/openpgp-keys-jpakkane-20231105.ebuild b/sec-keys/openpgp-keys-jpakkane/openpgp-keys-jpakkane-20231105.ebuild
index 6001a124b2d8..4da84026bd54 100644
--- a/sec-keys/openpgp-keys-jpakkane/openpgp-keys-jpakkane-20231105.ebuild
+++ b/sec-keys/openpgp-keys-jpakkane/openpgp-keys-jpakkane-20231105.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_install() {
 	insinto /usr/share/openpgp-keys
diff --git a/sec-keys/openpgp-keys-spamassassin/openpgp-keys-spamassassin-20221226.ebuild b/sec-keys/openpgp-keys-spamassassin/openpgp-keys-spamassassin-20221226.ebuild
index 46d680b5e3ce..1a2f8ae84538 100644
--- a/sec-keys/openpgp-keys-spamassassin/openpgp-keys-spamassassin-20221226.ebuild
+++ b/sec-keys/openpgp-keys-spamassassin/openpgp-keys-spamassassin-20221226.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/ack/ack-3.7.0.ebuild b/sys-apps/ack/ack-3.7.0.ebuild
index 8f36190f2ce2..f19d8a985f25 100644
--- a/sys-apps/ack/ack-3.7.0.ebuild
+++ b/sys-apps/ack/ack-3.7.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~riscv x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/acl/acl-2.3.2-r1.ebuild b/sys-apps/acl/acl-2.3.2-r1.ebuild
index 1e1927ce3903..ea554f6c9d20 100644
--- a/sys-apps/acl/acl-2.3.2-r1.ebuild
+++ b/sys-apps/acl/acl-2.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/acl/acl-2.3.2-r2.ebuild b/sys-apps/acl/acl-2.3.2-r2.ebuild
index 3d7cb4f35d95..00fc58b29247 100644
--- a/sys-apps/acl/acl-2.3.2-r2.ebuild
+++ b/sys-apps/acl/acl-2.3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/attr/attr-2.5.2-r1.ebuild b/sys-apps/attr/attr-2.5.2-r1.ebuild
index 69f4fbf26b31..278d5f50bcd4 100644
--- a/sys-apps/attr/attr-2.5.2-r1.ebuild
+++ b/sys-apps/attr/attr-2.5.2-r1.ebuild
@@ -12,7 +12,7 @@ else
 	inherit libtool
 
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Extended attributes tools"
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 6973625cc4e6..acea5d8d4c7c 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -12,7 +12,7 @@ else
 	inherit libtool
 
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Extended attributes tools"
diff --git a/sys-apps/baobab/baobab-48.0.ebuild b/sys-apps/baobab/baobab-48.0.ebuild
index 2539ce772926..65435d6911f8 100644
--- a/sys-apps/baobab/baobab-48.0.ebuild
+++ b/sys-apps/baobab/baobab-48.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://apps.gnome.org/Baobab/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baobab/baobab-49.1.ebuild b/sys-apps/baobab/baobab-49.1.ebuild
index 83b638072b80..f2d8a6b00519 100644
--- a/sys-apps/baobab/baobab-49.1.ebuild
+++ b/sys-apps/baobab/baobab-49.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://apps.gnome.org/Baobab/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r3.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r3.ebuild
index c869cb3bcce2..405eab61eb83 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r3.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	app-crypt/p11-kit[trust(+)]
diff --git a/sys-apps/baselayout/baselayout-2.17.ebuild b/sys-apps/baselayout/baselayout-2.17.ebuild
index b0db0b7ed845..1e431f06cc00 100644
--- a/sys-apps/baselayout/baselayout-2.17.ebuild
+++ b/sys-apps/baselayout/baselayout-2.17.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout/baselayout-2.18.ebuild b/sys-apps/baselayout/baselayout-2.18.ebuild
index bc9194d14ecc..83d3cba5ce13 100644
--- a/sys-apps/baselayout/baselayout-2.18.ebuild
+++ b/sys-apps/baselayout/baselayout-2.18.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 789774349777..4ab0ff044982 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/busybox/busybox-1.36.1-r3.ebuild b/sys-apps/busybox/busybox-1.36.1-r3.ebuild
index a3a784ee22a7..d92573c92baf 100644
--- a/sys-apps/busybox/busybox-1.36.1-r3.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index a66117143343..ea2f501a10ec 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/coreutils/coreutils-9.7.ebuild b/sys-apps/coreutils/coreutils-9.7.ebuild
index 2097a5bf4e9c..907e629cd4d7 100644
--- a/sys-apps/coreutils/coreutils-9.7.ebuild
+++ b/sys-apps/coreutils/coreutils-9.7.ebuild
@@ -33,7 +33,7 @@ else
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/coreutils/coreutils-9.8-r1.ebuild b/sys-apps/coreutils/coreutils-9.8-r1.ebuild
index 776199959214..7b50ba8a47f4 100644
--- a/sys-apps/coreutils/coreutils-9.8-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.8-r1.ebuild
@@ -33,7 +33,7 @@ else
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/coreutils/coreutils-9.9.ebuild b/sys-apps/coreutils/coreutils-9.9.ebuild
index 37d407a6d66f..3be9c922435e 100644
--- a/sys-apps/coreutils/coreutils-9.9.ebuild
+++ b/sys-apps/coreutils/coreutils-9.9.ebuild
@@ -33,7 +33,7 @@ else
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild
index ab2136dcc0cf..7e40e04843b1 100644
--- a/sys-apps/coreutils/coreutils-9999.ebuild
+++ b/sys-apps/coreutils/coreutils-9999.ebuild
@@ -33,7 +33,7 @@ else
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/dbus/dbus-1.16.2.ebuild b/sys-apps/dbus/dbus-1.16.2.ebuild
index 2712cf4a34d7..48a65e9e6b5f 100644
--- a/sys-apps/dbus/dbus-1.16.2.ebuild
+++ b/sys-apps/dbus/dbus-1.16.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
 
 LICENSE="|| ( AFL-2.1 GPL-2+ ) Apache-2.0 BSD GPL-2+ LGPL-2.1+ MIT tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 # TODO: USE=daemon
 IUSE="debug doc elogind selinux static-libs systemd test valgrind X"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/debianutils/debianutils-5.14-r1.ebuild b/sys-apps/debianutils/debianutils-5.14-r1.ebuild
index a2114974bfae..d536f1187c48 100644
--- a/sys-apps/debianutils/debianutils-5.14-r1.ebuild
+++ b/sys-apps/debianutils/debianutils-5.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/e7/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild b/sys-apps/diffutils/diffutils-3.10.ebuild
index ac6665d4e91d..53956ebd344d 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/diffutils/diffutils-3.11-r2.ebuild b/sys-apps/diffutils/diffutils-3.11-r2.ebuild
index 0b030d88b0da..404c4b57f05a 100644
--- a/sys-apps/diffutils/diffutils-3.11-r2.ebuild
+++ b/sys-apps/diffutils/diffutils-3.11-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/diffutils/diffutils-3.12.ebuild b/sys-apps/diffutils/diffutils-3.12.ebuild
index 91e492223c03..bf2acdd138ee 100644
--- a/sys-apps/diffutils/diffutils-3.12.ebuild
+++ b/sys-apps/diffutils/diffutils-3.12.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/dog/dog-1.7-r6.ebuild b/sys-apps/dog/dog-1.7-r6.ebuild
index fd8966c58679..e5f0535655fb 100644
--- a/sys-apps/dog/dog-1.7-r6.ebuild
+++ b/sys-apps/dog/dog-1.7-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ppc64 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-check-ctime.diff
diff --git a/sys-apps/dstat/dstat-0.7.4-r4.ebuild b/sys-apps/dstat/dstat-0.7.4-r4.ebuild
index 486ed193f3e4..251d8f0cf0a5 100644
--- a/sys-apps/dstat/dstat-0.7.4-r4.ebuild
+++ b/sys-apps/dstat/dstat-0.7.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="doc examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-apps/ed/ed-1.21.1.ebuild b/sys-apps/ed/ed-1.21.1.ebuild
index 2de5d525e26e..83bbcaf70686 100644
--- a/sys-apps/ed/ed-1.21.1.ebuild
+++ b/sys-apps/ed/ed-1.21.1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 BDEPEND="
diff --git a/sys-apps/ed/ed-1.22.1.ebuild b/sys-apps/ed/ed-1.22.1.ebuild
index 83723c25e2ec..5cf234984985 100644
--- a/sys-apps/ed/ed-1.22.1.ebuild
+++ b/sys-apps/ed/ed-1.22.1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 BDEPEND="
diff --git a/sys-apps/ed/ed-1.22.2.ebuild b/sys-apps/ed/ed-1.22.2.ebuild
index 2de5d525e26e..83bbcaf70686 100644
--- a/sys-apps/ed/ed-1.22.2.ebuild
+++ b/sys-apps/ed/ed-1.22.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 BDEPEND="
diff --git a/sys-apps/ed/ed-1.22.ebuild b/sys-apps/ed/ed-1.22.ebuild
index 83723c25e2ec..5cf234984985 100644
--- a/sys-apps/ed/ed-1.22.ebuild
+++ b/sys-apps/ed/ed-1.22.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 BDEPEND="
diff --git a/sys-apps/fakeroot/fakeroot-1.32.2.ebuild b/sys-apps/fakeroot/fakeroot-1.32.2.ebuild
index 50433f19d9ab..f32a9c467615 100644
--- a/sys-apps/fakeroot/fakeroot-1.32.2.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.32.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="acl debug nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/fakeroot/fakeroot-1.33.ebuild b/sys-apps/fakeroot/fakeroot-1.33.ebuild
index 2edd7bf26b41..911e1cd9a51e 100644
--- a/sys-apps/fakeroot/fakeroot-1.33.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.33.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="acl debug nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/file/file-5.45-r4.ebuild b/sys-apps/file/file-5.45-r4.ebuild
index 0d70692edcb1..5341a7ec36b8 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/file/file-5.46-r2.ebuild b/sys-apps/file/file-5.46-r2.ebuild
index b5c9c747c083..27dfc304ec4d 100644
--- a/sys-apps/file/file-5.46-r2.ebuild
+++ b/sys-apps/file/file-5.46-r2.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/file/file-5.46-r3.ebuild b/sys-apps/file/file-5.46-r3.ebuild
index 4fa54787b749..f9eee4570b54 100644
--- a/sys-apps/file/file-5.46-r3.ebuild
+++ b/sys-apps/file/file-5.46-r3.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 42eb60f1aa4e..c80c7e578cd4 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/findutils/findutils-4.10.0.ebuild b/sys-apps/findutils/findutils-4.10.0.ebuild
index ea52537959c5..e356fa09d9d9 100644
--- a/sys-apps/findutils/findutils-4.10.0.ebuild
+++ b/sys-apps/findutils/findutils-4.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls selinux static test test-full"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/gawk/gawk-5.3.2.ebuild b/sys-apps/gawk/gawk-5.3.2.ebuild
index a781c276f6bd..9c6bc32f41c6 100644
--- a/sys-apps/gawk/gawk-5.3.2.ebuild
+++ b/sys-apps/gawk/gawk-5.3.2.ebuild
@@ -29,7 +29,7 @@ else
 	SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+ pma? ( AGPL-3+ )"
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
index ab9bf1de84da..81061672a4c3 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.7.4.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.7.4.ebuild
index 53990311d795..21f6dfb1a4b1 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-1.7.4.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-1.7.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index ae15749469e9..5aadee34e243 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
index 5e5635f393cb..35d3ac7f483e 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/grep/grep-3.11-r1.ebuild b/sys-apps/grep/grep-3.11-r1.ebuild
index 8f95dfaee9c0..edfa8ac27154 100644
--- a/sys-apps/grep/grep-3.11-r1.ebuild
+++ b/sys-apps/grep/grep-3.11-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/grep/grep-3.12.ebuild b/sys-apps/grep/grep-3.12.ebuild
index 3e00998a30e3..912c87db0f3f 100644
--- a/sys-apps/grep/grep-3.12.ebuild
+++ b/sys-apps/grep/grep-3.12.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 537f759276e1..00821a9b2ca8 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples uchardet X"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.23.0-r1.ebuild b/sys-apps/groff/groff-1.23.0-r1.ebuild
index 826e5dc27435..b15b9d89866d 100644
--- a/sys-apps/groff/groff-1.23.0-r1.ebuild
+++ b/sys-apps/groff/groff-1.23.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *_rc* ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-apps/groff/groff-1.23.0.ebuild b/sys-apps/groff/groff-1.23.0.ebuild
index ca076466446a..3a7cb6c323e0 100644
--- a/sys-apps/groff/groff-1.23.0.ebuild
+++ b/sys-apps/groff/groff-1.23.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *_rc* ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-apps/hdparm/hdparm-9.65-r2.ebuild b/sys-apps/hdparm/hdparm-9.65-r2.ebuild
index 5b29d17008df..4de04712ce27 100644
--- a/sys-apps/hdparm/hdparm-9.65-r2.ebuild
+++ b/sys-apps/hdparm/hdparm-9.65-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/hdparm/${P}.tar.gz"
 # GPL-2 only
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/help2man/help2man-1.49.3.ebuild b/sys-apps/help2man/help2man-1.49.3.ebuild
index d0072f31f141..3fe72340e18b 100644
--- a/sys-apps/help2man/help2man-1.49.3.ebuild
+++ b/sys-apps/help2man/help2man-1.49.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 # nls/FSFAP for bindtextdomain.c
 LICENSE="GPL-3+ nls? ( FSFAP )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwdata/hwdata-0.391.ebuild b/sys-apps/hwdata/hwdata-0.391.ebuild
index 76a36430c9d6..ed30a8507f5f 100644
--- a/sys-apps/hwdata/hwdata-0.391.ebuild
+++ b/sys-apps/hwdata/hwdata-0.391.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RESTRICT="test"
 
diff --git a/sys-apps/hwdata/hwdata-0.398.ebuild b/sys-apps/hwdata/hwdata-0.398.ebuild
index 76a36430c9d6..ed30a8507f5f 100644
--- a/sys-apps/hwdata/hwdata-0.398.ebuild
+++ b/sys-apps/hwdata/hwdata-0.398.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RESTRICT="test"
 
diff --git a/sys-apps/hwdata/hwdata-0.399.ebuild b/sys-apps/hwdata/hwdata-0.399.ebuild
index 76a36430c9d6..ed30a8507f5f 100644
--- a/sys-apps/hwdata/hwdata-0.399.ebuild
+++ b/sys-apps/hwdata/hwdata-0.399.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RESTRICT="test"
 
diff --git a/sys-apps/hwdata/hwdata-0.400.ebuild b/sys-apps/hwdata/hwdata-0.400.ebuild
index 76a36430c9d6..ed30a8507f5f 100644
--- a/sys-apps/hwdata/hwdata-0.400.ebuild
+++ b/sys-apps/hwdata/hwdata-0.400.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RESTRICT="test"
 
diff --git a/sys-apps/hwinfo/hwinfo-23.2-r1.ebuild b/sys-apps/hwinfo/hwinfo-23.2-r1.ebuild
index 7426bb0ccfdc..61ac799f3630 100644
--- a/sys-apps/hwinfo/hwinfo-23.2-r1.ebuild
+++ b/sys-apps/hwinfo/hwinfo-23.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~riscv x86"
 
 RDEPEND="amd64? ( dev-libs/libx86emu:= )
 	x86? ( dev-libs/libx86emu:= )"
diff --git a/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild b/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild
index 7ba4ef0999d1..cf7438c1aa1c 100644
--- a/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
index 0dca5c5efb61..69f61c8ebbfb 100644
--- a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="cairo +cpuid cuda debug doc l0 nvml +pci rocm static-libs svg udev valgrind xml X video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/hwloc/hwloc-2.6.0-r2.ebuild b/sys-apps/hwloc/hwloc-2.6.0-r2.ebuild
index ef247ed151d8..8a374b584164 100644
--- a/sys-apps/hwloc/hwloc-2.6.0-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/hwloc/hwloc-2.8.0-r2.ebuild b/sys-apps/hwloc/hwloc-2.8.0-r2.ebuild
index f573c18d520c..f9fc65acf13d 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/hwloc/hwloc-2.9.0-r1.ebuild b/sys-apps/hwloc/hwloc-2.9.0-r1.ebuild
index 03b363012d55..a304b20e52be 100644
--- a/sys-apps/hwloc/hwloc-2.9.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/hwloc/hwloc-2.9.1-r1.ebuild b/sys-apps/hwloc/hwloc-2.9.1-r1.ebuild
index b10ff5d3bd6c..ba9ee109d720 100644
--- a/sys-apps/hwloc/hwloc-2.9.1-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev valgrind xml X video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/hwloc/hwloc-2.9.2-r1.ebuild b/sys-apps/hwloc/hwloc-2.9.2-r1.ebuild
index 16aa331f78e9..62411c2c6785 100644
--- a/sys-apps/hwloc/hwloc-2.9.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev valgrind xml X video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/hwloc/hwloc-2.9.3-r2.ebuild b/sys-apps/hwloc/hwloc-2.9.3-r2.ebuild
index c853f347c7f4..9d76ef141c1d 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="cairo +cpuid cuda debug doc l0 nvml +pci rocm static-libs svg udev valgrind xml X video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index eba340191f3f..6990abd1f2a8 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/less/less-643-r2.ebuild b/sys-apps/less/less-643-r2.ebuild
index 99032f52a4f0..36db404f59ee 100644
--- a/sys-apps/less/less-643-r2.ebuild
+++ b/sys-apps/less/less-643-r2.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/sys-apps/less/less-668.ebuild b/sys-apps/less/less-668.ebuild
index 59f95e6974de..9c784a78b340 100644
--- a/sys-apps/less/less-668.ebuild
+++ b/sys-apps/less/less-668.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/sys-apps/less/less-679.ebuild b/sys-apps/less/less-679.ebuild
index f8df0c3db8a6..58676c766677 100644
--- a/sys-apps/less/less-679.ebuild
+++ b/sys-apps/less/less-679.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/sys-apps/less/less-685.ebuild b/sys-apps/less/less-685.ebuild
index 783f43788b77..b59ff65a4e32 100644
--- a/sys-apps/less/less-685.ebuild
+++ b/sys-apps/less/less-685.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild
index 883529ba3f9b..d724f788a795 100644
--- a/sys-apps/less/less-9999.ebuild
+++ b/sys-apps/less/less-9999.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
index b27458e9bbe9..5b10bf0c3b3b 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/5.0.0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="contrib selinux sensord static-libs test"
 
 COMMON_DEPS="
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild
index 02da22d04a59..3dd525e0b5c8 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"
diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index 74dace327c56..a1f16dbca738 100644
--- a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"
diff --git a/sys-apps/man-db/man-db-2.13.0.ebuild b/sys-apps/man-db/man-db-2.13.0.ebuild
index 86ad526cb189..9bf80f8a2fec 100644
--- a/sys-apps/man-db/man-db-2.13.0.ebuild
+++ b/sys-apps/man-db/man-db-2.13.0.ebuild
@@ -14,7 +14,7 @@ else
 	inherit libtool
 	# TODO: Change tarballs to gitlab too...?
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-2.13.1.ebuild b/sys-apps/man-db/man-db-2.13.1.ebuild
index 86ad526cb189..9bf80f8a2fec 100644
--- a/sys-apps/man-db/man-db-2.13.1.ebuild
+++ b/sys-apps/man-db/man-db-2.13.1.ebuild
@@ -14,7 +14,7 @@ else
 	inherit libtool
 	# TODO: Change tarballs to gitlab too...?
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index e241cf4a779e..005497dcb4bc 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -14,7 +14,7 @@ else
 	inherit libtool
 	# TODO: Change tarballs to gitlab too...?
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
index ff920bc24a62..d22c5206a867 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
 
 LICENSE="man-pages-posix-2013"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2017a-r1.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2017a-r1.ebuild
index 35cc56d0863f..d3406fba687f 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2017a-r1.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2017a-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
 
 LICENSE="freedist" # to be clarified, see bug 871636
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/sys-apps/man-pages/man-pages-6.05.01.ebuild b/sys-apps/man-pages/man-pages-6.05.01.ebuild
index 209c9b250b79..c338b04f970b 100644
--- a/sys-apps/man-pages/man-pages-6.05.01.ebuild
+++ b/sys-apps/man-pages/man-pages-6.05.01.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-6.06.ebuild b/sys-apps/man-pages/man-pages-6.06.ebuild
index d5ec4b906fd2..d12c33c6ad2f 100644
--- a/sys-apps/man-pages/man-pages-6.06.ebuild
+++ b/sys-apps/man-pages/man-pages-6.06.ebuild
@@ -50,7 +50,7 @@ else
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-6.10.ebuild b/sys-apps/man-pages/man-pages-6.10.ebuild
index 557b0753e769..3e45cc7f0408 100644
--- a/sys-apps/man-pages/man-pages-6.10.ebuild
+++ b/sys-apps/man-pages/man-pages-6.10.ebuild
@@ -52,7 +52,7 @@ else
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index 2e025b4606bf..386b9fcace6c 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -52,7 +52,7 @@ else
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild b/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild
index 7b8ceb3edaa1..6135470fea1a 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
 
diff --git a/sys-apps/mawk/mawk-1.3.4_p20250131.ebuild b/sys-apps/mawk/mawk-1.3.4_p20250131.ebuild
index 7b8ceb3edaa1..6135470fea1a 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20250131.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20250131.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
 
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild
index 927c952e265f..d2b0bdb0ace4 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="minimal"
 
 src_prepare() {
diff --git a/sys-apps/moreutils/moreutils-0.70.ebuild b/sys-apps/moreutils/moreutils-0.70.ebuild
index c7d62e578d3a..68aadfd3cc29 100644
--- a/sys-apps/moreutils/moreutils-0.70.ebuild
+++ b/sys-apps/moreutils/moreutils-0.70.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/most/most-5.2.0-r1.ebuild b/sys-apps/most/most-5.2.0-r1.ebuild
index 1188e05ac5ff..37afde5d2727 100644
--- a/sys-apps/most/most-5.2.0-r1.ebuild
+++ b/sys-apps/most/most-5.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND=">=sys-libs/slang-2.1.3"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/most/most-5.2.0.ebuild b/sys-apps/most/most-5.2.0.ebuild
index f01d9dfea7ba..40a4218fe483 100644
--- a/sys-apps/most/most-5.2.0.ebuild
+++ b/sys-apps/most/most-5.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=">=sys-libs/slang-2.1.3"
diff --git a/sys-apps/nawk/nawk-20230909-r1.ebuild b/sys-apps/nawk/nawk-20230909-r1.ebuild
index 7c7ca9a99798..bd1e828ab417 100644
--- a/sys-apps/nawk/nawk-20230909-r1.ebuild
+++ b/sys-apps/nawk/nawk-20230909-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/awk-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-alternatives/yacc
diff --git a/sys-apps/nawk/nawk-20250116.ebuild b/sys-apps/nawk/nawk-20250116.ebuild
index 81863e30509a..7227334a0b39 100644
--- a/sys-apps/nawk/nawk-20250116.ebuild
+++ b/sys-apps/nawk/nawk-20250116.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/awk-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-alternatives/yacc
diff --git a/sys-apps/net-tools/net-tools-2.10.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild
index 389c9a23bc1c..9f2752c51deb 100644
--- a/sys-apps/net-tools/net-tools-2.10.ebuild
+++ b/sys-apps/net-tools/net-tools-2.10.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index 58cf67b621a9..f16c8d762af5 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/nosig/nosig-2-r1.ebuild b/sys-apps/nosig/nosig-2-r1.ebuild
index be0a4488b836..addb16b112be 100644
--- a/sys-apps/nosig/nosig-2-r1.ebuild
+++ b/sys-apps/nosig/nosig-2-r1.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://github.com/vapier/nosig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/sys-apps/paxctl/paxctl-0.9.ebuild b/sys-apps/paxctl/paxctl-0.9.ebuild
index 43cf7701751c..ae06c6968915 100644
--- a/sys-apps/paxctl/paxctl-0.9.ebuild
+++ b/sys-apps/paxctl/paxctl-0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pax.grsecurity.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 BDEPEND=">=sys-devel/binutils-2.14.90.0.8-r1"
 
diff --git a/sys-apps/pciutils/pciutils-3.13.0.ebuild b/sys-apps/pciutils/pciutils-3.13.0.ebuild
index fc537466f537..56ac9874694f 100644
--- a/sys-apps/pciutils/pciutils-3.13.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="dns +kmod static-libs +udev zlib"
 REQUIRED_USE="static-libs? ( !udev )"
 
diff --git a/sys-apps/pciutils/pciutils-3.14.0.ebuild b/sys-apps/pciutils/pciutils-3.14.0.ebuild
index fc537466f537..56ac9874694f 100644
--- a/sys-apps/pciutils/pciutils-3.14.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="dns +kmod static-libs +udev zlib"
 REQUIRED_USE="static-libs? ( !udev )"
 
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild
index 7df46bf61c04..e06a0399a2a2 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz"
 # upstream.
 LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild
index 92aacb9049ef..bc378d25eb5d 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz"
 # upstream.
 LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
diff --git a/sys-apps/pv/pv-1.10.2.ebuild b/sys-apps/pv/pv-1.10.2.ebuild
index 5b9c4fb99318..5aaa0b42605a 100644
--- a/sys-apps/pv/pv-1.10.2.ebuild
+++ b/sys-apps/pv/pv-1.10.2.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://ivarch.com/s/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/pv/pv-1.10.3.ebuild b/sys-apps/pv/pv-1.10.3.ebuild
index 5b9c4fb99318..5aaa0b42605a 100644
--- a/sys-apps/pv/pv-1.10.3.ebuild
+++ b/sys-apps/pv/pv-1.10.3.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://ivarch.com/s/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/pv/pv-1.9.42.ebuild b/sys-apps/pv/pv-1.9.42.ebuild
index e9db3d5221a5..89ab0f493a37 100644
--- a/sys-apps/pv/pv-1.9.42.ebuild
+++ b/sys-apps/pv/pv-1.9.42.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://ivarch.com/s/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/pv/pv-9999.ebuild b/sys-apps/pv/pv-9999.ebuild
index 5b9c4fb99318..5aaa0b42605a 100644
--- a/sys-apps/pv/pv-9999.ebuild
+++ b/sys-apps/pv/pv-9999.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://ivarch.com/s/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/rename/rename-1.3-r3.ebuild b/sys-apps/rename/rename-1.3-r3.ebuild
index 836e1eb91b98..63cada42fca1 100644
--- a/sys-apps/rename/rename-1.3-r3.ebuild
+++ b/sys-apps/rename/rename-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}/sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-rename.patch
diff --git a/sys-apps/sdparm/sdparm-1.12-r1.ebuild b/sys-apps/sdparm/sdparm-1.12-r1.ebuild
index ecfe1959cc9d..837c494ead2e 100644
--- a/sys-apps/sdparm/sdparm-1.12-r1.ebuild
+++ b/sys-apps/sdparm/sdparm-1.12-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # Older releases contain a conflicting sas_disk_blink
 RDEPEND=">=sys-apps/sg3_utils-1.45:0="
diff --git a/sys-apps/sdparm/sdparm-1.12.ebuild b/sys-apps/sdparm/sdparm-1.12.ebuild
index a2a661b9ecfa..f26b565a7186 100644
--- a/sys-apps/sdparm/sdparm-1.12.ebuild
+++ b/sys-apps/sdparm/sdparm-1.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/smartmontools/smartmontools-7.4-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.4-r1.ebuild
index 4690f627b7db..f4e401715ba9 100644
--- a/sys-apps/smartmontools/smartmontools-7.4-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.4-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools subversion
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smartmontools/smartmontools-7.5-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.5-r1.ebuild
index 1355249222be..ace43a2b499b 100644
--- a/sys-apps/smartmontools/smartmontools-7.5-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.5-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools subversion
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index ce7381ca96cd..d5855edc248a 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools subversion
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31-r2.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31-r2.ebuild
index ca9916a49e85..91f39b52464e 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31-r2.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="netgroups selinux"
 
 DEPEND="
diff --git a/sys-apps/texinfo/texinfo-7.2-r3.ebuild b/sys-apps/texinfo/texinfo-7.2-r3.ebuild
index 6d77472aabef..5f35d393b1a8 100644
--- a/sys-apps/texinfo/texinfo-7.2-r3.ebuild
+++ b/sys-apps/texinfo/texinfo-7.2-r3.ebuild
@@ -27,7 +27,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 	REGEN_BDEPEND=""
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	REGEN_BDEPEND=""
 fi
 
diff --git a/sys-apps/texinfo/texinfo-7.2-r4.ebuild b/sys-apps/texinfo/texinfo-7.2-r4.ebuild
index 39e7cfaf6fe0..5beb2a5de968 100644
--- a/sys-apps/texinfo/texinfo-7.2-r4.ebuild
+++ b/sys-apps/texinfo/texinfo-7.2-r4.ebuild
@@ -27,7 +27,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 	REGEN_BDEPEND=""
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	REGEN_BDEPEND=""
 fi
 
diff --git a/sys-apps/texinfo/texinfo-9999.ebuild b/sys-apps/texinfo/texinfo-9999.ebuild
index cf6a07907231..3b8ef640211a 100644
--- a/sys-apps/texinfo/texinfo-9999.ebuild
+++ b/sys-apps/texinfo/texinfo-9999.ebuild
@@ -27,7 +27,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 	REGEN_BDEPEND=""
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	REGEN_BDEPEND=""
 fi
 
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild
index 68893e3761be..c69adb439c6d 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv x86 ~x64-macos"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r20.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r20.ebuild
index 01e94c98171f..bbc5b9eb38e1 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r20.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r20.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usbutils/usbutils-016.ebuild b/sys-apps/usbutils/usbutils-016.ebuild
index 15ad1aa8edd6..03d35732c35c 100644
--- a/sys-apps/usbutils/usbutils-016.ebuild
+++ b/sys-apps/usbutils/usbutils-016.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-017.ebuild b/sys-apps/usbutils/usbutils-017.ebuild
index 177fcd025a98..75f09a50b212 100644
--- a/sys-apps/usbutils/usbutils-017.ebuild
+++ b/sys-apps/usbutils/usbutils-017.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-018-r1.ebuild b/sys-apps/usbutils/usbutils-018-r1.ebuild
index 2f00ea1e9812..93381d9faa6d 100644
--- a/sys-apps/usbutils/usbutils-018-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-018-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python usbreset"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-018.ebuild b/sys-apps/usbutils/usbutils-018.ebuild
index acbd3eed6696..c014007af77e 100644
--- a/sys-apps/usbutils/usbutils-018.ebuild
+++ b/sys-apps/usbutils/usbutils-018.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-019.ebuild b/sys-apps/usbutils/usbutils-019.ebuild
index 8f482e1833d4..570cb995f5bb 100644
--- a/sys-apps/usbutils/usbutils-019.ebuild
+++ b/sys-apps/usbutils/usbutils-019.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python usbreset"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/util-linux/util-linux-2.40.4.ebuild b/sys-apps/util-linux/util-linux-2.40.4.ebuild
index 963d0f9c94a4..cf3dd0e70fd7 100644
--- a/sys-apps/util-linux/util-linux-2.40.4.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.4.ebuild
@@ -23,7 +23,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-apps/util-linux/util-linux-2.41.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.41.1-r1.ebuild
index 2c4f66a162d2..42aafdccc361 100644
--- a/sys-apps/util-linux/util-linux-2.41.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.41.1-r1.ebuild
@@ -23,7 +23,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-apps/util-linux/util-linux-2.41.2.ebuild b/sys-apps/util-linux/util-linux-2.41.2.ebuild
index 2c4f66a162d2..42aafdccc361 100644
--- a/sys-apps/util-linux/util-linux-2.41.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.41.2.ebuild
@@ -23,7 +23,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-apps/util-linux/util-linux-2.41.3.ebuild b/sys-apps/util-linux/util-linux-2.41.3.ebuild
index 30e08f49287f..40609e5fd3df 100644
--- a/sys-apps/util-linux/util-linux-2.41.3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.41.3.ebuild
@@ -23,7 +23,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index d8dfde9da3df..64c3f01f2ace 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -22,7 +22,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index 635ed80efe75..0ee37b1bfaa7 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_configure() {
 	append-lfs-flags
diff --git a/sys-apps/which/which-2.23.ebuild b/sys-apps/which/which-2.23.ebuild
index d43d481fc5fc..ef20c3838a0a 100644
--- a/sys-apps/which/which-2.23.ebuild
+++ b/sys-apps/which/which-2.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_configure() {
 	tc-export AR
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r11.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r11.ebuild
index 0df9f569f0ef..89fc1820eac7 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r11.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.padl.com/download/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ppc64 ~sparc x86"
 IUSE="debug kerberos ssl sasl split-usr"
 
 DEPEND="
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
index 4083b17c5ae1..46724b3fdb1a 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.openwall.com/pam/modules/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2" # LICENSE file says "heavily cut-down 'BSD license'"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="selinux +prevent-removal"
 
 RDEPEND="sys-libs/pam
diff --git a/sys-auth/passwdqc/passwdqc-2.0.3-r1.ebuild b/sys-auth/passwdqc/passwdqc-2.0.3-r1.ebuild
index c25f563a2cbe..62fbb1d233c8 100644
--- a/sys-auth/passwdqc/passwdqc-2.0.3-r1.ebuild
+++ b/sys-auth/passwdqc/passwdqc-2.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	sys-libs/pam
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.1.0-r3.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.1.0-r3.ebuild
index d01509026941..33fe16a4bc03 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.1.0-r3.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.1.0-r3.ebuild
@@ -166,7 +166,7 @@ else
 		https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.0.ebuild
index 99fcf2c6adde..d2de24ae7efa 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.0.ebuild
@@ -212,7 +212,7 @@ else
 		https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.1.ebuild
index 98d315ace447..debf527bd708 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.3.1.ebuild
@@ -211,7 +211,7 @@ else
 		https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-cluster/charliecloud/charliecloud-0.39-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.39-r1.ebuild
index 210b07c67bfb..096e0c62bb12 100644
--- a/sys-cluster/charliecloud/charliecloud-0.39-r1.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.39-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/${PN}/main.git"
 else
 	SRC_URI="https://gitlab.com/${PN}/main/-/archive/v${PV}/main-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86 ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/main-v${PV}"
 fi
 
diff --git a/sys-cluster/charliecloud/charliecloud-0.40.ebuild b/sys-cluster/charliecloud/charliecloud-0.40.ebuild
index 1d0e05ca5cb3..f68ff9a2a756 100644
--- a/sys-cluster/charliecloud/charliecloud-0.40.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.40.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/${PN}/main.git"
 else
 	SRC_URI="https://gitlab.com/${PN}/main/-/archive/v${PV}/main-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86 ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/main-v${PV}"
 fi
 
diff --git a/sys-cluster/charliecloud/charliecloud-0.41.ebuild b/sys-cluster/charliecloud/charliecloud-0.41.ebuild
index 1a618a828371..ec913c1ba930 100644
--- a/sys-cluster/charliecloud/charliecloud-0.41.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.41.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~x86 ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/sys-cluster/charliecloud/charliecloud-0.42.ebuild b/sys-cluster/charliecloud/charliecloud-0.42.ebuild
index 1a618a828371..ec913c1ba930 100644
--- a/sys-cluster/charliecloud/charliecloud-0.42.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.42.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~x86 ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 1a618a828371..ec913c1ba930 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~x86 ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/sys-cluster/hpx/hpx-1.11.0.ebuild b/sys-cluster/hpx/hpx-1.11.0.ebuild
index 6c30ed3574ba..1dbe1491ab6c 100644
--- a/sys-cluster/hpx/hpx-1.11.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.11.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
 else
 	SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 inherit check-reqs cmake multiprocessing python-single-r1
 
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 5d282d31eeeb..f751c6406971 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
 else
 	SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86"
 fi
 inherit check-reqs cmake multiprocessing python-single-r1
 
diff --git a/sys-cluster/libcircle/libcircle-0.3.0.ebuild b/sys-cluster/libcircle/libcircle-0.3.0.ebuild
index c18d1ca7b41f..ada8d348bc90 100644
--- a/sys-cluster/libcircle/libcircle-0.3.0.ebuild
+++ b/sys-cluster/libcircle/libcircle-0.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/hpc/libcircle/releases/download/v$(ver_cut 1-2)/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/mpich/mpich-3.4.3-r1.ebuild b/sys-cluster/mpich/mpich-3.4.3-r1.ebuild
index 34debb3c5689..9ebf0af01518 100644
--- a/sys-cluster/mpich/mpich-3.4.3-r1.ebuild
+++ b/sys-cluster/mpich/mpich-3.4.3-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="mpich2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ppc64 ~riscv x86"
 IUSE="+cxx doc fortran mpi-threads +romio threads valgrind"
 REQUIRED_USE="mpi-threads? ( threads )"
 
diff --git a/sys-cluster/native-mpi/native-mpi-0-r1.ebuild b/sys-cluster/native-mpi/native-mpi-0-r1.ebuild
index 592189462df5..428f1c6de84f 100644
--- a/sys-cluster/native-mpi/native-mpi-0-r1.ebuild
+++ b/sys-cluster/native-mpi/native-mpi-0-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux"
+KEYWORDS=""
 
 src_install() {
 	newenvd - 99mpi <<-_EOF_
diff --git a/sys-cluster/openmpi/openmpi-4.1.6-r1.ebuild b/sys-cluster/openmpi/openmpi-4.1.6-r1.ebuild
index 9bd868b4b46a..9242db542bcd 100644
--- a/sys-cluster/openmpi/openmpi-4.1.6-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.1.6-r1.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="cma cuda cxx fortran libompitrace peruse romio valgrind
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
diff --git a/sys-cluster/openmpi/openmpi-4.1.6.ebuild b/sys-cluster/openmpi/openmpi-4.1.6.ebuild
index 30c11884901c..e2f9aab9d3fb 100644
--- a/sys-cluster/openmpi/openmpi-4.1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.1.6.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="cma cuda cxx fortran ipv6 libompitrace peruse romio valgrind
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
diff --git a/sys-cluster/openmpi/openmpi-5.0.6-r1.ebuild b/sys-cluster/openmpi/openmpi-5.0.6-r1.ebuild
index 5d07e3ca1bfa..cc59ee47c4b6 100644
--- a/sys-cluster/openmpi/openmpi-5.0.6-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-5.0.6-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 -arm arm64 -ppc ppc64 -x86 ~amd64-linux"
+KEYWORDS="amd64 -arm arm64 -ppc ppc64 -x86"
 IUSE="cma cuda fortran peruse romio valgrind
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM}"
 
diff --git a/sys-cluster/openmpi/openmpi-5.0.6.ebuild b/sys-cluster/openmpi/openmpi-5.0.6.ebuild
index 12537749a9bd..7b2c9fb08eba 100644
--- a/sys-cluster/openmpi/openmpi-5.0.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-5.0.6.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 -arm arm64 -ppc ppc64 -x86 ~amd64-linux"
+KEYWORDS="amd64 -arm arm64 -ppc ppc64 -x86"
 IUSE="cma cuda fortran ipv6 peruse romio valgrind
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM}"
 
diff --git a/sys-cluster/openmpi/openmpi-5.0.8.ebuild b/sys-cluster/openmpi/openmpi-5.0.8.ebuild
index 9085ee95d911..b54d9a8ee34c 100644
--- a/sys-cluster/openmpi/openmpi-5.0.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-5.0.8.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 -arm ~arm64 -ppc ~ppc64 -x86 ~amd64-linux"
+KEYWORDS="~amd64 -arm ~arm64 -ppc ~ppc64 -x86"
 IUSE="cma cuda fortran peruse romio valgrind
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM}"
 
diff --git a/sys-cluster/pmix/pmix-4.2.2-r1.ebuild b/sys-cluster/pmix/pmix-4.2.2-r1.ebuild
index 7aca4777648b..6fbc46db5219 100644
--- a/sys-cluster/pmix/pmix-4.2.2-r1.ebuild
+++ b/sys-cluster/pmix/pmix-4.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/openpmix/openpmix/releases/download/v${PV}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug +munge pmi"
 
 RDEPEND="
diff --git a/sys-cluster/pmix/pmix-4.2.8.ebuild b/sys-cluster/pmix/pmix-4.2.8.ebuild
index ded7f8c8cb47..ba20f1b7a4df 100644
--- a/sys-cluster/pmix/pmix-4.2.8.ebuild
+++ b/sys-cluster/pmix/pmix-4.2.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/openpmix/openpmix/releases/download/v${PV}/${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 # No support for 32-bit systems as of 4.2.8 (https://github.com/open-mpi/ompi/issues/11248)
-KEYWORDS="~amd64 -x86 ~amd64-linux"
+KEYWORDS="~amd64 -x86"
 IUSE="debug +munge pmi"
 
 RDEPEND="
diff --git a/sys-cluster/pmix/pmix-5.0.3.ebuild b/sys-cluster/pmix/pmix-5.0.3.ebuild
index becb41392bc0..97ed17515317 100644
--- a/sys-cluster/pmix/pmix-5.0.3.ebuild
+++ b/sys-cluster/pmix/pmix-5.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/openpmix/openpmix/releases/download/v${PV}/${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 # No support for 32-bit systems as of 4.2.8 (https://github.com/open-mpi/ompi/issues/11248)
-KEYWORDS="~amd64 ~arm64 ~ppc64 -x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 -x86"
 IUSE="debug +munge pmi"
 
 RDEPEND="
diff --git a/sys-cluster/pmix/pmix-5.0.4-r1.ebuild b/sys-cluster/pmix/pmix-5.0.4-r1.ebuild
index 46b82e112fc7..e5c18d705494 100644
--- a/sys-cluster/pmix/pmix-5.0.4-r1.ebuild
+++ b/sys-cluster/pmix/pmix-5.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/openpmix/openpmix/releases/download/v${PV}/${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 # No support for 32-bit systems as of 4.2.8 (https://github.com/open-mpi/ompi/issues/11248)
-KEYWORDS="amd64 arm64 ppc64 -x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ppc64 -x86"
 IUSE="debug +munge pmi"
 
 RDEPEND="
diff --git a/sys-cluster/ucx/ucx-1.18.1.ebuild b/sys-cluster/ucx/ucx-1.18.1.ebuild
index 4fdb8995fe73..f6f191e0f2d6 100644
--- a/sys-cluster/ucx/ucx-1.18.1.ebuild
+++ b/sys-cluster/ucx/ucx-1.18.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 -riscv ~x86"
 IUSE="+openmp"
 
 RDEPEND="
diff --git a/sys-devel/autogen/autogen-5.18.16-r102.ebuild b/sys-devel/autogen/autogen-5.18.16-r102.ebuild
index 0837f39f1bac..f8769052965e 100644
--- a/sys-devel/autogen/autogen-5.18.16-r102.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r102.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="libopts static-libs"
 
 REQUIRED_USE="${GUILE_REQUIRED_USE}"
diff --git a/sys-devel/bc/bc-1.07.1-r6.ebuild b/sys-devel/bc/bc-1.07.1-r6.ebuild
index 09ab7b6c8880..033bfb882704 100644
--- a/sys-devel/bc/bc-1.07.1-r6.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bc/bc-1.08.0.ebuild b/sys-devel/bc/bc-1.08.0.ebuild
index b9e4047d57d4..36c14af19245 100644
--- a/sys-devel/bc/bc-1.08.0.ebuild
+++ b/sys-devel/bc/bc-1.08.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bc/bc-1.08.1.ebuild b/sys-devel/bc/bc-1.08.1.ebuild
index 02cf9dc2270d..d3a2cd0a575e 100644
--- a/sys-devel/bc/bc-1.08.1.ebuild
+++ b/sys-devel/bc/bc-1.08.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bc/bc-1.08.2.ebuild b/sys-devel/bc/bc-1.08.2.ebuild
index 02cf9dc2270d..d3a2cd0a575e 100644
--- a/sys-devel/bc/bc-1.08.2.ebuild
+++ b/sys-devel/bc/bc-1.08.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/bison/bison-3.8.2-r2.ebuild b/sys-devel/bison/bison-3.8.2-r2.ebuild
index 29bb96ec1e07..cd2955a0b178 100644
--- a/sys-devel/bison/bison-3.8.2-r2.ebuild
+++ b/sys-devel/bison/bison-3.8.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.8.2-r3.ebuild b/sys-devel/bison/bison-3.8.2-r3.ebuild
index 76fa97b8ad38..e2cdb1a233a4 100644
--- a/sys-devel/bison/bison-3.8.2-r3.ebuild
+++ b/sys-devel/bison/bison-3.8.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-16.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-16.ebuild
index e791e7ff60f6..e1b5cd9ab49d 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-16.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-16.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	llvm-core/clang:${SLOT}
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-17.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-17.ebuild
index e791e7ff60f6..e1b5cd9ab49d 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-17.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-17.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	llvm-core/clang:${SLOT}
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-18.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-18.ebuild
index 023ce8d2df53..4df78ccb1fa2 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-18.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-18.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	llvm-core/clang:${SLOT}
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-19.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-19.ebuild
index 73e7cdf6e8b2..68b010a7336a 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-19.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-19.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 PROPERTIES="live"
 
 RDEPEND="
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-20.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-20.ebuild
index 73e7cdf6e8b2..68b010a7336a 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-20.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-20.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 PROPERTIES="live"
 
 RDEPEND="
diff --git a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-21.ebuild b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-21.ebuild
index ed6722a8dacf..1529c02e7f64 100644
--- a/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-21.ebuild
+++ b/sys-devel/clang-crossdev-wrappers/clang-crossdev-wrappers-21.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 PROPERTIES="live"
 
 RDEPEND="
diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild b/sys-devel/flex/flex-2.6.4-r6.ebuild
index 9f4d09c87c27..8cd9ac9bf47f 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild
index 0c898b9e591c..5ec7362ee5f3 100644
--- a/sys-devel/gettext/gettext-0.21.1.ebuild
+++ b/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *_rc* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
diff --git a/sys-devel/gettext/gettext-0.22.5-r2.ebuild b/sys-devel/gettext/gettext-0.22.5-r2.ebuild
index 792a601f1e3a..fe06327b5d23 100644
--- a/sys-devel/gettext/gettext-0.22.5-r2.ebuild
+++ b/sys-devel/gettext/gettext-0.22.5-r2.ebuild
@@ -23,7 +23,7 @@ else
 		mirror://gnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
diff --git a/sys-devel/gettext/gettext-0.23.1-r1.ebuild b/sys-devel/gettext/gettext-0.23.1-r1.ebuild
index 18157268080b..968daaad081f 100644
--- a/sys-devel/gettext/gettext-0.23.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.23.1-r1.ebuild
@@ -22,7 +22,7 @@ else
 		mirror://gnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
diff --git a/sys-devel/gettext/gettext-0.23.2.ebuild b/sys-devel/gettext/gettext-0.23.2.ebuild
index a0e3b608cbad..f93795f09912 100644
--- a/sys-devel/gettext/gettext-0.23.2.ebuild
+++ b/sys-devel/gettext/gettext-0.23.2.ebuild
@@ -22,7 +22,7 @@ else
 		mirror://gnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
diff --git a/sys-devel/gettext/gettext-0.25.1.ebuild b/sys-devel/gettext/gettext-0.25.1.ebuild
index c2ca984e5e0f..c1f5cf219aea 100644
--- a/sys-devel/gettext/gettext-0.25.1.ebuild
+++ b/sys-devel/gettext/gettext-0.25.1.ebuild
@@ -22,7 +22,7 @@ else
 		mirror://gnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
diff --git a/sys-devel/gettext/gettext-0.26.ebuild b/sys-devel/gettext/gettext-0.26.ebuild
index c2ca984e5e0f..c1f5cf219aea 100644
--- a/sys-devel/gettext/gettext-0.26.ebuild
+++ b/sys-devel/gettext/gettext-0.26.ebuild
@@ -22,7 +22,7 @@ else
 		mirror://gnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
diff --git a/sys-devel/gnuconfig/gnuconfig-20240728.ebuild b/sys-devel/gnuconfig/gnuconfig-20240728.ebuild
index c7bb93241345..3ce401e3701c 100644
--- a/sys-devel/gnuconfig/gnuconfig-20240728.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20240728.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 99999999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20250710.ebuild b/sys-devel/gnuconfig/gnuconfig-20250710.ebuild
index c7bb93241345..3ce401e3701c 100644
--- a/sys-devel/gnuconfig/gnuconfig-20250710.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20250710.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 99999999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index f3bedc7995e4..fba341bec212 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 99999999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/m4/m4-1.4.19-r2.ebuild b/sys-devel/m4/m4-1.4.19-r2.ebuild
index ae2a11815cb7..07d4b9679bd1 100644
--- a/sys-devel/m4/m4-1.4.19-r2.ebuild
+++ b/sys-devel/m4/m4-1.4.19-r2.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/m4/m4-1.4.20.ebuild b/sys-devel/m4/m4-1.4.20.ebuild
index 5121a1e3f730..5d1e6aae2e9a 100644
--- a/sys-devel/m4/m4-1.4.20.ebuild
+++ b/sys-devel/m4/m4-1.4.20.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/patch/patch-2.7.6-r6.ebuild b/sys-devel/patch/patch-2.7.6-r6.ebuild
index c342fa635979..917d8776acee 100644
--- a/sys-devel/patch/patch-2.7.6-r6.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r6.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/patch/patch-2.7.6-r8.ebuild b/sys-devel/patch/patch-2.7.6-r8.ebuild
index 0db7f1ed9563..8b96ed080c9a 100644
--- a/sys-devel/patch/patch-2.7.6-r8.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r8.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/patch/patch-2.8-r1.ebuild b/sys-devel/patch/patch-2.8-r1.ebuild
index ae93bf018864..24bf479200d3 100644
--- a/sys-devel/patch/patch-2.8-r1.ebuild
+++ b/sys-devel/patch/patch-2.8-r1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/patch/patch-9999.ebuild b/sys-devel/patch/patch-9999.ebuild
index 387649b7fe89..fafd712ded40 100644
--- a/sys-devel/patch/patch-9999.ebuild
+++ b/sys-devel/patch/patch-9999.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-fabric/opensm/opensm-3.3.23-r2.ebuild b/sys-fabric/opensm/opensm-3.3.23-r2.ebuild
index b1d5ad37ce8b..ce4c2e77f6ef 100644
--- a/sys-fabric/opensm/opensm-3.3.23-r2.ebuild
+++ b/sys-fabric/opensm/opensm-3.3.23-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/linux-rdma/opensm/"
 DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB"
 
 SRC_URI="https://github.com/linux-rdma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86"
 IUSE="selinux tools"
 SLOT="0"
 LICENSE="|| ( GPL-2 BSD-2 )"
diff --git a/sys-fabric/opensm/opensm-3.3.24-r1.ebuild b/sys-fabric/opensm/opensm-3.3.24-r1.ebuild
index f3e45a0d05c3..6536ed357409 100644
--- a/sys-fabric/opensm/opensm-3.3.24-r1.ebuild
+++ b/sys-fabric/opensm/opensm-3.3.24-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-rdma/opensm/releases/download/${PV}/${P}.tar.g
 
 LICENSE="|| ( GPL-2 BSD-2 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86"
 IUSE="selinux tools"
 
 DEPEND="sys-cluster/rdma-core"
diff --git a/sys-fabric/perftest/perftest-4.4.0.37-r1.ebuild b/sys-fabric/perftest/perftest-4.4.0.37-r1.ebuild
index bfd7e8603e50..4d9cf58592a0 100644
--- a/sys-fabric/perftest/perftest-4.4.0.37-r1.ebuild
+++ b/sys-fabric/perftest/perftest-4.4.0.37-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="|| ( GPL-2 BSD-2 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	sys-apps/pciutils
diff --git a/sys-fabric/perftest/perftest-4.5.0.17.ebuild b/sys-fabric/perftest/perftest-4.5.0.17.ebuild
index c4ccd55cbc46..b42c64aec338 100644
--- a/sys-fabric/perftest/perftest-4.5.0.17.ebuild
+++ b/sys-fabric/perftest/perftest-4.5.0.17.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="|| ( GPL-2 BSD-2 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	sys-apps/pciutils
diff --git a/sys-fabric/qperf/qperf-0.4.11.ebuild b/sys-fabric/qperf/qperf-0.4.11.ebuild
index 5dd4a4c319ad..b56efbd68ed8 100644
--- a/sys-fabric/qperf/qperf-0.4.11.ebuild
+++ b/sys-fabric/qperf/qperf-0.4.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-rdma/qperf/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="|| ( GPL-2 BSD-2 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86"
 
 DEPEND="sys-cluster/rdma-core"
 RDEPEND="
diff --git a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
index b4ba9e225346..c7b9e4e32ba1 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git https://kernel.googlesource.com/pub/scm/linux/kernel/git/colyli/bcache-tools.git"
 else
 	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Tools for bcache"
diff --git a/sys-fs/bcache-tools/bcache-tools-1.1_p20230217-r2.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1_p20230217-r2.ebuild
index 0f5f796ce708..c24fb69ee8d8 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.1_p20230217-r2.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.1_p20230217-r2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git https://kernel.googlesource.com/pub/scm/linux/kernel/git/colyli/bcache-tools.git"
 else
 	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/a5e3753516bd39c431def86c8dfec8a9cea1ddd4.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Tools for bcache"
diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
index 26da59216259..e92573f804ca 100644
--- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git https://kernel.googlesource.com/pub/scm/linux/kernel/git/colyli/bcache-tools.git"
 else
 	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Tools for bcache"
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
index bb99a83a8d49..449965e5f59f 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
 
 RDEPEND="
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.17.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.17.ebuild
index 70d4fed43935..12983cc5c32f 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.17.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.17.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cpu_flags_x86_avx2 lzo lzma cpu_flags_x86_sse4_2 static test xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.20.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.20.ebuild
index 5b30d20f00fb..0e770ea91398 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.20.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.20.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc x86"
 IUSE="cpu_flags_x86_avx2 lzo lzma cpu_flags_x86_sse4_2 static test xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.21.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.21.ebuild
index d84507c1a7fc..ad3bb5b714c7 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.21.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.21.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
diff --git a/sys-fs/dd-rescue/dd-rescue-9999.ebuild b/sys-fs/dd-rescue/dd-rescue-9999.ebuild
index 697f828e74ff..6d2f910850a1 100644
--- a/sys-fs/dd-rescue/dd-rescue-9999.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
diff --git a/sys-fs/ddrescue/ddrescue-1.29.1.ebuild b/sys-fs/ddrescue/ddrescue-1.29.1.ebuild
index cb68c4d6e413..202937fccc88 100644
--- a/sys-fs/ddrescue/ddrescue-1.29.1.ebuild
+++ b/sys-fs/ddrescue/ddrescue-1.29.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="static"
 
 BDEPEND="$(unpacker_src_uri_depends)"
diff --git a/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sys-fs/dosfstools/dosfstools-4.2.ebuild
index 507c7d39c484..d57beed54f0b 100644
--- a/sys-fs/dosfstools/dosfstools-4.2.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="compat +iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild
index f7ae4d73b025..67edf3b46977 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild
index 13fda6e9142c..00579fda539c 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.3-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.3-r1.ebuild
index ebcedd28d7b8..1c63b541c873 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.3-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.3.ebuild
index dc4a842e0b61..8ca51a4c8f1d 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/exfat-utils/exfat-utils-1.4.0.ebuild b/sys-fs/exfat-utils/exfat-utils-1.4.0.ebuild
index f0a75f33bad1..ff1791a9b5fc 100644
--- a/sys-fs/exfat-utils/exfat-utils-1.4.0.ebuild
+++ b/sys-fs/exfat-utils/exfat-utils-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
 # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	default
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.4.0-r1.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.4.0-r1.ebuild
index 7bf6efb359c7..443ff1d81d04 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-1.4.0-r1.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.4.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
 # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="suid"
 
 RDEPEND="sys-fs/fuse:3="
diff --git a/sys-fs/fuse/fuse-2.9.9-r2.ebuild b/sys-fs/fuse/fuse-2.9.9-r2.ebuild
index 8cdc8aa6b143..f9fa7f73f40a 100644
--- a/sys-fs/fuse/fuse-2.9.9-r2.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/iconv.m4.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples static-libs"
 
 BDEPEND="sys-devel/gettext
diff --git a/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild
index e438f09a07fe..7772242c959a 100644
--- a/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN^^}.${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev valgrind"
 REQUIRED_USE="
 	static? ( !systemd !udev )
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild
index b96d437df226..766fcd9a7e8f 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="+lzo +ssl test xattr +zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild
index f2e61110c461..cc08684dc482 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="+lzo +ssl test xattr +zstd ubifs"
 REQUIRED_USE="ubifs? ( lzo ssl xattr zstd )"
 RESTRICT="!test? ( test )"
diff --git a/sys-fs/ncdu/ncdu-1.21.ebuild b/sys-fs/ncdu/ncdu-1.21.ebuild
index a14728b48d06..028db6734b00 100644
--- a/sys-fs/ncdu/ncdu-1.21.ebuild
+++ b/sys-fs/ncdu/ncdu-1.21.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)]"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/ncdu/ncdu-1.22.ebuild b/sys-fs/ncdu/ncdu-1.22.ebuild
index c6473bd6d3ce..1459d037b192 100644
--- a/sys-fs/ncdu/ncdu-1.22.ebuild
+++ b/sys-fs/ncdu/ncdu-1.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)]"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/ntfs3g/ntfs3g-2022.10.3.ebuild b/sys-fs/ntfs3g/ntfs3g-2022.10.3.ebuild
index 245a7ea4602f..3a22df228d54 100644
--- a/sys-fs/ntfs3g/ntfs3g-2022.10.3.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2022.10.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/89"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="acl debug +fuse +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r2.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r2.ebuild
index 348bbc07da96..0e54df3722c6 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r2.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv -sparc x86"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/sys-fs/squashfuse/squashfuse-0.5.2-r1.ebuild b/sys-fs/squashfuse/squashfuse-0.5.2-r1.ebuild
index 929922b606df..b3b0f7c768e4 100644
--- a/sys-fs/squashfuse/squashfuse-0.5.2-r1.ebuild
+++ b/sys-fs/squashfuse/squashfuse-0.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vasi/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="lz4 lzma lzo static-libs +zlib zstd"
 REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
 RESTRICT="test" # Tests require access to /dev/fuse.
diff --git a/sys-fs/squashfuse/squashfuse-0.6.0.ebuild b/sys-fs/squashfuse/squashfuse-0.6.0.ebuild
index 919f997dfbd2..8e3366d8283f 100644
--- a/sys-fs/squashfuse/squashfuse-0.6.0.ebuild
+++ b/sys-fs/squashfuse/squashfuse-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vasi/squashfuse/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="lz4 lzma lzo static-libs +zlib zstd"
 REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
 
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
index e3c191a15162..b70b48416fea 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/sys-fs/udftools/udftools-2.3.ebuild b/sys-fs/udftools/udftools-2.3.ebuild
index 6c5f3a57a285..f8e8ff66aafb 100644
--- a/sys-fs/udftools/udftools-2.3.ebuild
+++ b/sys-fs/udftools/udftools-2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="sys-libs/readline:0="
 DEPEND="${RDEPEND}"
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r1.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r1.ebuild
index 48b14bc70d4c..0168b05099d9 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r1.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r2.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r2.ebuild
index edbaab363381..14bc3a3afef1 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r2.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.7.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.7.ebuild
index edbaab363381..14bc3a3afef1 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-3.7.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-kernel/installkernel/installkernel-50.ebuild b/sys-kernel/installkernel/installkernel-50.ebuild
index 286bfb5296c6..9cbb828647df 100644
--- a/sys-kernel/installkernel/installkernel-50.ebuild
+++ b/sys-kernel/installkernel/installkernel-50.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
 REQUIRED_USE="
 	?? ( efistub grub systemd-boot )
diff --git a/sys-kernel/installkernel/installkernel-60.ebuild b/sys-kernel/installkernel/installkernel-60.ebuild
index a7b00fcfdc7e..28eab53adb06 100644
--- a/sys-kernel/installkernel/installkernel-60.ebuild
+++ b/sys-kernel/installkernel/installkernel-60.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
 REQUIRED_USE="
 	systemd-boot? ( systemd )
diff --git a/sys-kernel/installkernel/installkernel-62.ebuild b/sys-kernel/installkernel/installkernel-62.ebuild
index 5c10fbfc01af..d5950d6d7114 100644
--- a/sys-kernel/installkernel/installkernel-62.ebuild
+++ b/sys-kernel/installkernel/installkernel-62.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
 REQUIRED_USE="
 	systemd-boot? ( systemd )
diff --git a/sys-kernel/installkernel/installkernel-63.ebuild b/sys-kernel/installkernel/installkernel-63.ebuild
index 1c32fd6f28fa..020ee174af11 100644
--- a/sys-kernel/installkernel/installkernel-63.ebuild
+++ b/sys-kernel/installkernel/installkernel-63.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
 REQUIRED_USE="
 	systemd-boot? ( systemd )
diff --git a/sys-kernel/installkernel/installkernel-65.ebuild b/sys-kernel/installkernel/installkernel-65.ebuild
index b99345afe9dc..0046af01a4b0 100644
--- a/sys-kernel/installkernel/installkernel-65.ebuild
+++ b/sys-kernel/installkernel/installkernel-65.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-gentoo-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sys-kernel/installkernel/installkernel-9999.ebuild b/sys-kernel/installkernel/installkernel-9999.ebuild
index b99345afe9dc..0046af01a4b0 100644
--- a/sys-kernel/installkernel/installkernel-9999.ebuild
+++ b/sys-kernel/installkernel/installkernel-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-gentoo-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild b/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild
index 5c489f2c9275..0d2cb881269c 100644
--- a/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.18-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/gentoo-headers-base-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild
index 476983caf98b..4064207bb759 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/gentoo-headers-base-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild
index a891f63087f0..8b5b81b149ee 100644
--- a/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.19-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+https://dev.gentoo.org/~sam/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/gentoo-headers-base-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild
index 476983caf98b..4064207bb759 100644
--- a/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/gentoo-headers-base-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
index f562e3e131d1..f67393cff269 100644
--- a/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/gentoo-headers-base-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
index 0093fd594edf..e56fea3da24c 100644
--- a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${KERNEL_URI}
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild b/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
index a7cf93c4b98a..5149ace24510 100644
--- a/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-5.4-r2.ebuild b/sys-kernel/linux-headers/linux-headers-5.4-r2.ebuild
index e2fd64397e9c..0b1e31b3b54c 100644
--- a/sys-kernel/linux-headers/linux-headers-5.4-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.4-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${KERNEL_URI}
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.1.ebuild b/sys-kernel/linux-headers/linux-headers-6.1.ebuild
index 662335367010..22493a47fa75 100644
--- a/sys-kernel/linux-headers/linux-headers-6.1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="app-arch/xz-utils
 	dev-lang/perl
diff --git a/sys-kernel/linux-headers/linux-headers-6.10.ebuild b/sys-kernel/linux-headers/linux-headers-6.10.ebuild
index 2b48a908ff38..743d67b1371c 100644
--- a/sys-kernel/linux-headers/linux-headers-6.10.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.11.ebuild b/sys-kernel/linux-headers/linux-headers-6.11.ebuild
index 2b48a908ff38..743d67b1371c 100644
--- a/sys-kernel/linux-headers/linux-headers-6.11.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.11.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.12.ebuild b/sys-kernel/linux-headers/linux-headers-6.12.ebuild
index 0aaf3efb5ac9..b033f29f0063 100644
--- a/sys-kernel/linux-headers/linux-headers-6.12.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.13.ebuild b/sys-kernel/linux-headers/linux-headers-6.13.ebuild
index 2b48a908ff38..743d67b1371c 100644
--- a/sys-kernel/linux-headers/linux-headers-6.13.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.13.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.14.ebuild b/sys-kernel/linux-headers/linux-headers-6.14.ebuild
index 2b48a908ff38..743d67b1371c 100644
--- a/sys-kernel/linux-headers/linux-headers-6.14.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.15.ebuild b/sys-kernel/linux-headers/linux-headers-6.15.ebuild
index 2b48a908ff38..743d67b1371c 100644
--- a/sys-kernel/linux-headers/linux-headers-6.15.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.15.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.16-r2.ebuild b/sys-kernel/linux-headers/linux-headers-6.16-r2.ebuild
index ab7564ca0802..0a91c199938f 100644
--- a/sys-kernel/linux-headers/linux-headers-6.16-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.16-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.16.ebuild b/sys-kernel/linux-headers/linux-headers-6.16.ebuild
index 2b48a908ff38..743d67b1371c 100644
--- a/sys-kernel/linux-headers/linux-headers-6.16.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.16.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.17-r1.ebuild b/sys-kernel/linux-headers/linux-headers-6.17-r1.ebuild
index c6a88ba68ce8..4bf6a5929f45 100644
--- a/sys-kernel/linux-headers/linux-headers-6.17-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.17-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.6-r1.ebuild b/sys-kernel/linux-headers/linux-headers-6.6-r1.ebuild
index 4f72579b355f..68d8405f1d2b 100644
--- a/sys-kernel/linux-headers/linux-headers-6.6-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.6-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.8-r1.ebuild b/sys-kernel/linux-headers/linux-headers-6.8-r1.ebuild
index 217770f85849..bf758ad08b60 100644
--- a/sys-kernel/linux-headers/linux-headers-6.8-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.8-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-kernel/linux-headers/linux-headers-6.9.ebuild b/sys-kernel/linux-headers/linux-headers-6.9.ebuild
index 217770f85849..bf758ad08b60 100644
--- a/sys-kernel/linux-headers/linux-headers-6.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	app-arch/xz-utils
diff --git a/sys-libs/cracklib/cracklib-2.10.2.ebuild b/sys-libs/cracklib/cracklib-2.10.2.ebuild
index 49dec5968b35..f181121f8852 100644
--- a/sys-libs/cracklib/cracklib-2.10.2.ebuild
+++ b/sys-libs/cracklib/cracklib-2.10.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/cracklib/cracklib-2.10.3.ebuild b/sys-libs/cracklib/cracklib-2.10.3.ebuild
index 49dec5968b35..f181121f8852 100644
--- a/sys-libs/cracklib/cracklib-2.10.3.ebuild
+++ b/sys-libs/cracklib/cracklib-2.10.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/gdbm/gdbm-1.24.ebuild b/sys-libs/gdbm/gdbm-1.24.ebuild
index 205cb05e1622..f5afb7724226 100644
--- a/sys-libs/gdbm/gdbm-1.24.ebuild
+++ b/sys-libs/gdbm/gdbm-1.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-3+ GPL-2+ FDL-1.3+"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+berkdb nls +readline static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/gdbm/gdbm-1.25.ebuild b/sys-libs/gdbm/gdbm-1.25.ebuild
index 1fb27b62f003..a90931dc9586 100644
--- a/sys-libs/gdbm/gdbm-1.25.ebuild
+++ b/sys-libs/gdbm/gdbm-1.25.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-3+ GPL-2+ FDL-1.3+"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+berkdb nls +readline static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/gdbm/gdbm-1.26.ebuild b/sys-libs/gdbm/gdbm-1.26.ebuild
index 922191649b6d..f88fb571943b 100644
--- a/sys-libs/gdbm/gdbm-1.26.ebuild
+++ b/sys-libs/gdbm/gdbm-1.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-3+ GPL-2+ FDL-1.3+"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+berkdb nls +readline static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild
index 77dd380001fb..450f6fdf1c32 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/libcap/libcap-2.71.ebuild b/sys-libs/libcap/libcap-2.71.ebuild
index 16e96157538b..c3a81ac19ab8 100644
--- a/sys-libs/libcap/libcap-2.71.ebuild
+++ b/sys-libs/libcap/libcap-2.71.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="POSIX 1003.1e capabilities"
diff --git a/sys-libs/libcap/libcap-2.76.ebuild b/sys-libs/libcap/libcap-2.76.ebuild
index 16e96157538b..c3a81ac19ab8 100644
--- a/sys-libs/libcap/libcap-2.76.ebuild
+++ b/sys-libs/libcap/libcap-2.76.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="POSIX 1003.1e capabilities"
diff --git a/sys-libs/libcap/libcap-2.77.ebuild b/sys-libs/libcap/libcap-2.77.ebuild
index 16e96157538b..c3a81ac19ab8 100644
--- a/sys-libs/libcap/libcap-2.77.ebuild
+++ b/sys-libs/libcap/libcap-2.77.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="POSIX 1003.1e capabilities"
diff --git a/sys-libs/libcap/libcap-9999.ebuild b/sys-libs/libcap/libcap-9999.ebuild
index aeb560184a59..48a39fe2e5cc 100644
--- a/sys-libs/libcap/libcap-9999.ebuild
+++ b/sys-libs/libcap/libcap-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="POSIX 1003.1e capabilities"
diff --git a/sys-libs/librtas/librtas-2.0.3.ebuild b/sys-libs/librtas/librtas-2.0.3.ebuild
index 0e6e2879eed3..e5e5c31a27f0 100644
--- a/sys-libs/librtas/librtas-2.0.3.ebuild
+++ b/sys-libs/librtas/librtas-2.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ibm-power-utilities/${PN}/archive/v${PV}.tar.gz -> $
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="ppc ppc64 ~ppc64-linux"
+KEYWORDS="ppc ppc64"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/sys-libs/libseccomp/libseccomp-2.5.5-r2.ebuild b/sys-libs/libseccomp/libseccomp-2.5.5-r2.ebuild
index 0655f56bed19..4eb2728435b5 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.5-r2.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.5-r2.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz
 		experimental-loong? ( https://github.com/matoro/libseccomp/compare/v${PV}..loongarch-r1.patch
 			-> ${P}-loongarch-r1.patch )"
-	KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/sys-libs/libseccomp/libseccomp-2.6.0-r3.ebuild b/sys-libs/libseccomp/libseccomp-2.6.0-r3.ebuild
index 3c7740707eef..4f22c8f8ac76 100644
--- a/sys-libs/libseccomp/libseccomp-2.6.0-r3.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.6.0-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/sys-libs/libseccomp/libseccomp-2.6.0.ebuild b/sys-libs/libseccomp/libseccomp-2.6.0.ebuild
index 50009f99b27f..f28f3459eb9c 100644
--- a/sys-libs/libseccomp/libseccomp-2.6.0.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.6.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild
index fdc2f6839999..b3a5119c28b0 100644
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild
+++ b/sys-libs/libseccomp/libseccomp-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/sys-libs/libunwind/libunwind-1.8.2-r1.ebuild b/sys-libs/libunwind/libunwind-1.8.2-r1.ebuild
index 4ceaae8b2d5e..deafe9ddaa68 100644
--- a/sys-libs/libunwind/libunwind-1.8.2-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.8.2-r1.ebuild
@@ -31,7 +31,7 @@ else
 	S="${WORKDIR}"/${P/_rc/-rc}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 -sparc x86 ~amd64-linux ~x86-linux"
+		KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 -sparc x86"
 	fi
 fi
 
diff --git a/sys-libs/libunwind/libunwind-1.8.2.ebuild b/sys-libs/libunwind/libunwind-1.8.2.ebuild
index 316b63bdefda..4971ad884a06 100644
--- a/sys-libs/libunwind/libunwind-1.8.2.ebuild
+++ b/sys-libs/libunwind/libunwind-1.8.2.ebuild
@@ -31,7 +31,7 @@ else
 	S="${WORKDIR}"/${P/_rc/-rc}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 -sparc x86 ~amd64-linux ~x86-linux"
+		KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 -sparc x86"
 	fi
 fi
 
diff --git a/sys-libs/libunwind/libunwind-9999.ebuild b/sys-libs/libunwind/libunwind-9999.ebuild
index 99e0e16ea7cd..dd021de94a4f 100644
--- a/sys-libs/libunwind/libunwind-9999.ebuild
+++ b/sys-libs/libunwind/libunwind-9999.ebuild
@@ -31,7 +31,7 @@ else
 	S="${WORKDIR}"/${P/_rc/-rc}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux"
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86"
 	fi
 fi
 
diff --git a/sys-libs/libutempter/libutempter-1.2.1.ebuild b/sys-libs/libutempter/libutempter-1.2.1.ebuild
index cf173f388595..e4a403adf198 100644
--- a/sys-libs/libutempter/libutempter-1.2.1.ebuild
+++ b/sys-libs/libutempter/libutempter-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/sys-libs/ncurses/ncurses-6.5_p20250329.ebuild b/sys-libs/ncurses/ncurses-6.5_p20250329.ebuild
index 74465d3130dd..fa53d43ecd50 100644
--- a/sys-libs/ncurses/ncurses-6.5_p20250329.ebuild
+++ b/sys-libs/ncurses/ncurses-6.5_p20250329.ebuild
@@ -129,7 +129,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
 # In 6.5_p20250118, the C++ examples fail to link, but there's no automated
 # testsuite anyway. Controlling building examples isn't really what USE=test
diff --git a/sys-libs/ncurses/ncurses-6.5_p20250531-r1.ebuild b/sys-libs/ncurses/ncurses-6.5_p20250531-r1.ebuild
index c876a4c89d90..76f6f5cf00ad 100644
--- a/sys-libs/ncurses/ncurses-6.5_p20250531-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.5_p20250531-r1.ebuild
@@ -138,7 +138,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
 # In 6.5_p20250118, the C++ examples fail to link, but there's no automated
 # testsuite anyway. Controlling building examples isn't really what USE=test
diff --git a/sys-libs/ncurses/ncurses-6.5_p20250802.ebuild b/sys-libs/ncurses/ncurses-6.5_p20250802.ebuild
index b06db9eff40e..69f9dae5d0c1 100644
--- a/sys-libs/ncurses/ncurses-6.5_p20250802.ebuild
+++ b/sys-libs/ncurses/ncurses-6.5_p20250802.ebuild
@@ -146,7 +146,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
 # In 6.5_p20250118, the C++ examples fail to link, but there's no automated
 # testsuite anyway. Controlling building examples isn't really what USE=test
diff --git a/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild b/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
index c716de9bdf0b..4c5e1d9fd7af 100644
--- a/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
+++ b/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64-linux"
+KEYWORDS=""
 
 src_configure() {
 	: # Don't bother with the custom configure script.
diff --git a/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild b/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild
index 9ebdadc2a485..5609d3622347 100644
--- a/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild
+++ b/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild
@@ -35,7 +35,7 @@ fi
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="audit berkdb elogind examples debug nis nls selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
diff --git a/sys-libs/pam/pam-1.7.1-r1.ebuild b/sys-libs/pam/pam-1.7.1-r1.ebuild
index d580d7da9dff..dd29e470f453 100644
--- a/sys-libs/pam/pam-1.7.1-r1.ebuild
+++ b/sys-libs/pam/pam-1.7.1-r1.ebuild
@@ -35,7 +35,7 @@ fi
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="audit berkdb elogind examples debug nis nls selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
diff --git a/sys-libs/pam/pam-1.7.1-r2.ebuild b/sys-libs/pam/pam-1.7.1-r2.ebuild
index 9f36e29ce99b..77c37cdaf4fd 100644
--- a/sys-libs/pam/pam-1.7.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.7.1-r2.ebuild
@@ -35,7 +35,7 @@ fi
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="audit berkdb elogind examples debug nis nls selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
diff --git a/sys-libs/readline/readline-8.2_p13-r1.ebuild b/sys-libs/readline/readline-8.2_p13-r1.ebuild
index 6f761bcc5723..714eb85b5a81 100644
--- a/sys-libs/readline/readline-8.2_p13-r1.ebuild
+++ b/sys-libs/readline/readline-8.2_p13-r1.ebuild
@@ -78,7 +78,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if is_release ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs +unicode utils"
 
diff --git a/sys-libs/readline/readline-8.3_p1.ebuild b/sys-libs/readline/readline-8.3_p1.ebuild
index be3a7f15984b..f4c269fab238 100644
--- a/sys-libs/readline/readline-8.3_p1.ebuild
+++ b/sys-libs/readline/readline-8.3_p1.ebuild
@@ -78,7 +78,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs +unicode utils"
 
diff --git a/sys-libs/readline/readline-8.3_p3.ebuild b/sys-libs/readline/readline-8.3_p3.ebuild
index 72b111ceeb81..09b16343ef16 100644
--- a/sys-libs/readline/readline-8.3_p3.ebuild
+++ b/sys-libs/readline/readline-8.3_p3.ebuild
@@ -78,7 +78,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs +unicode utils"
 
diff --git a/sys-libs/readline/readline-8.4_alpha_pre20251007.ebuild b/sys-libs/readline/readline-8.4_alpha_pre20251007.ebuild
index ba4112f2a8d6..4c2c15370e88 100644
--- a/sys-libs/readline/readline-8.4_alpha_pre20251007.ebuild
+++ b/sys-libs/readline/readline-8.4_alpha_pre20251007.ebuild
@@ -78,7 +78,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs +unicode utils"
 
diff --git a/sys-libs/readline/readline-9999.ebuild b/sys-libs/readline/readline-9999.ebuild
index 72b111ceeb81..09b16343ef16 100644
--- a/sys-libs/readline/readline-9999.ebuild
+++ b/sys-libs/readline/readline-9999.ebuild
@@ -78,7 +78,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs +unicode utils"
 
diff --git a/sys-libs/slang/slang-2.3.3-r1.ebuild b/sys-libs/slang/slang-2.3.3-r1.ebuild
index 504ab875b19b..fe03dd29ecbf 100644
--- a/sys-libs/slang/slang-2.3.3-r1.ebuild
+++ b/sys-libs/slang/slang-2.3.3-r1.ebuild
@@ -17,7 +17,7 @@ else
 		https://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 		https://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-libs/slang/slang-2.3.3-r2.ebuild b/sys-libs/slang/slang-2.3.3-r2.ebuild
index 320d257883b9..1a5529d0fa83 100644
--- a/sys-libs/slang/slang-2.3.3-r2.ebuild
+++ b/sys-libs/slang/slang-2.3.3-r2.ebuild
@@ -17,7 +17,7 @@ else
 		https://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 		https://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-libs/talloc/talloc-2.4.2.ebuild b/sys-libs/talloc/talloc-2.4.2.ebuild
index 0e1ff74e99e1..c16d40f3dd17 100644
--- a/sys-libs/talloc/talloc-2.4.2.ebuild
+++ b/sys-libs/talloc/talloc-2.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="compat +python test valgrind"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/talloc/talloc-2.4.3.ebuild b/sys-libs/talloc/talloc-2.4.3.ebuild
index c307180082cd..eff5e108ca18 100644
--- a/sys-libs/talloc/talloc-2.4.3.ebuild
+++ b/sys-libs/talloc/talloc-2.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="compat +python test valgrind"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.12.ebuild b/sys-libs/tdb/tdb-1.4.12.ebuild
index 247211f778d6..4f6790bddb6a 100644
--- a/sys-libs/tdb/tdb-1.4.12.ebuild
+++ b/sys-libs/tdb/tdb-1.4.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.13.ebuild b/sys-libs/tdb/tdb-1.4.13.ebuild
index db1a2281965b..d5a93712a806 100644
--- a/sys-libs/tdb/tdb-1.4.13.ebuild
+++ b/sys-libs/tdb/tdb-1.4.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.14.ebuild b/sys-libs/tdb/tdb-1.4.14.ebuild
index ac464d462886..d4431304f17c 100644
--- a/sys-libs/tdb/tdb-1.4.14.ebuild
+++ b/sys-libs/tdb/tdb-1.4.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tevent/tevent-0.16.1.ebuild b/sys-libs/tevent/tevent-0.16.1.ebuild
index c89b33198581..fab474e9d02a 100644
--- a/sys-libs/tevent/tevent-0.16.1.ebuild
+++ b/sys-libs/tevent/tevent-0.16.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/tevent/tevent-0.16.2.ebuild b/sys-libs/tevent/tevent-0.16.2.ebuild
index e0daea98c237..68db04859bf5 100644
--- a/sys-libs/tevent/tevent-0.16.2.ebuild
+++ b/sys-libs/tevent/tevent-0.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/tevent/tevent-0.17.1.ebuild b/sys-libs/tevent/tevent-0.17.1.ebuild
index dc874c91495c..df9b7e12df6c 100644
--- a/sys-libs/tevent/tevent-0.17.1.ebuild
+++ b/sys-libs/tevent/tevent-0.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="python test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/timezone-data/timezone-data-2025a-r1.ebuild b/sys-libs/timezone-data/timezone-data-2025a-r1.ebuild
index 4d0bfd3059f7..2cd1931e4efa 100644
--- a/sys-libs/timezone-data/timezone-data-2025a-r1.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2025a-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/tzdb-${PV}
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/timezone-data/timezone-data-2025b.ebuild b/sys-libs/timezone-data/timezone-data-2025b.ebuild
index 8c86107a06c9..3315c169fce0 100644
--- a/sys-libs/timezone-data/timezone-data-2025b.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2025b.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/tzdb-${PV}
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/timezone-data/timezone-data-2025c.ebuild b/sys-libs/timezone-data/timezone-data-2025c.ebuild
index 3811431ac484..6acda8adc9b3 100644
--- a/sys-libs/timezone-data/timezone-data-2025c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2025c.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/tzdb-${PV}
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/zlib/zlib-1.3.1-r1.ebuild b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
index 5247d678bb22..cb6eb7ac7281 100644
--- a/sys-libs/zlib/zlib-1.3.1-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="minizip static-libs"
 
 RDEPEND="!sys-libs/zlib-ng[compat]"
diff --git a/sys-power/powertop/powertop-2.15.ebuild b/sys-power/powertop/powertop-2.15.ebuild
index e027774b6375..c122601b050f 100644
--- a/sys-power/powertop/powertop-2.15.ebuild
+++ b/sys-power/powertop/powertop-2.15.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ppc ~sparc x86"
 fi
 
 inherit autotools ${GIT_ECLASS} flag-o-matic linux-info
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 81d432e1ebaa..45a4b3d13a94 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 fi
 
 inherit autotools ${GIT_ECLASS} linux-info
diff --git a/sys-process/acct/acct-6.6.4-r4.ebuild b/sys-process/acct/acct-6.6.4-r4.ebuild
index df630f1eeb76..ff367b715628 100644
--- a/sys-process/acct/acct-6.6.4-r4.ebuild
+++ b/sys-process/acct/acct-6.6.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-acct )"
diff --git a/sys-process/atop/atop-2.11.0-r1.ebuild b/sys-process/atop/atop-2.11.0-r1.ebuild
index 5e7145463101..5b449d1d722b 100644
--- a/sys-process/atop/atop-2.11.0-r1.ebuild
+++ b/sys-process/atop/atop-2.11.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
 # Module is GPL-2 as well
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/glib
diff --git a/sys-process/atop/atop-2.11.1.ebuild b/sys-process/atop/atop-2.11.1.ebuild
index 5e7145463101..5b449d1d722b 100644
--- a/sys-process/atop/atop-2.11.1.ebuild
+++ b/sys-process/atop/atop-2.11.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
 # Module is GPL-2 as well
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/glib
diff --git a/sys-process/atop/atop-2.12.0-r1.ebuild b/sys-process/atop/atop-2.12.0-r1.ebuild
index 469f4643a921..a5402b5aca59 100644
--- a/sys-process/atop/atop-2.12.0-r1.ebuild
+++ b/sys-process/atop/atop-2.12.0-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
 # Module is GPL-2 as well
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86"
 IUSE="video_cards_nvidia"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-process/atop/atop-2.12.0.ebuild b/sys-process/atop/atop-2.12.0.ebuild
index bded8f7eb092..eff2a2ddcf4c 100644
--- a/sys-process/atop/atop-2.12.0.ebuild
+++ b/sys-process/atop/atop-2.12.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
 # Module is GPL-2 as well
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/glib
diff --git a/sys-process/atop/atop-2.12.1.ebuild b/sys-process/atop/atop-2.12.1.ebuild
index 98739fc55113..a5d6b2fa526b 100644
--- a/sys-process/atop/atop-2.12.1.ebuild
+++ b/sys-process/atop/atop-2.12.1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 # Module is GPL-2 as well
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86"
 IUSE="video_cards_nvidia"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-process/glances/glances-4.1.2.1.ebuild b/sys-process/glances/glances-4.1.2.1.ebuild
index bdb7616c18d4..e019d4a51268 100644
--- a/sys-process/glances/glances-4.1.2.1.ebuild
+++ b/sys-process/glances/glances-4.1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/sys-process/glances/glances-4.3.1.ebuild b/sys-process/glances/glances-4.3.1.ebuild
index 659be5648689..063cefaf9d44 100644
--- a/sys-process/glances/glances-4.3.1.ebuild
+++ b/sys-process/glances/glances-4.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/sys-process/htop/htop-3.3.0.ebuild b/sys-process/htop/htop-3.3.0.ebuild
index acf710238267..419ad8f2eee6 100644
--- a/sys-process/htop/htop-3.3.0.ebuild
+++ b/sys-process/htop/htop-3.3.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/htop-dev/htop/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 S="${WORKDIR}/${P/_}"
diff --git a/sys-process/htop/htop-3.4.0.ebuild b/sys-process/htop/htop-3.4.0.ebuild
index f5474a69edef..b1c98d474d3e 100644
--- a/sys-process/htop/htop-3.4.0.ebuild
+++ b/sys-process/htop/htop-3.4.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/htop-dev/htop/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 S="${WORKDIR}/${P/_}"
diff --git a/sys-process/htop/htop-3.4.1-r2.ebuild b/sys-process/htop/htop-3.4.1-r2.ebuild
index c1d69d80dc7d..780cd21e6491 100644
--- a/sys-process/htop/htop-3.4.1-r2.ebuild
+++ b/sys-process/htop/htop-3.4.1-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/htop-dev/htop/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${P/_}"
diff --git a/sys-process/htop/htop-9999.ebuild b/sys-process/htop/htop-9999.ebuild
index b8c7073782cc..5a4bd6ee9d8a 100644
--- a/sys-process/htop/htop-9999.ebuild
+++ b/sys-process/htop/htop-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/htop-dev/htop/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${P/_}"
diff --git a/sys-process/iotop/iotop-0.6_p20230124.ebuild b/sys-process/iotop/iotop-0.6_p20230124.ebuild
index ce2f41715b6e..bc13cb329f40 100644
--- a/sys-process/iotop/iotop-0.6_p20230124.ebuild
+++ b/sys-process/iotop/iotop-0.6_p20230124.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT::7}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="!sys-process/iotop-c"
 
diff --git a/sys-process/numactl/numactl-2.0.16-r1.ebuild b/sys-process/numactl/numactl-2.0.16-r1.ebuild
index 199e19028df7..f81256028df4 100644
--- a/sys-process/numactl/numactl-2.0.16-r1.ebuild
+++ b/sys-process/numactl/numactl-2.0.16-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-process/numactl/numactl-2.0.18.ebuild b/sys-process/numactl/numactl-2.0.18.ebuild
index ba1efac2032a..89b356501607 100644
--- a/sys-process/numactl/numactl-2.0.18.ebuild
+++ b/sys-process/numactl/numactl-2.0.18.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-process/numactl/numactl-2.0.19.ebuild b/sys-process/numactl/numactl-2.0.19.ebuild
index dec096a83956..1718585c051a 100644
--- a/sys-process/numactl/numactl-2.0.19.ebuild
+++ b/sys-process/numactl/numactl-2.0.19.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-process/numactl/numactl-9999.ebuild b/sys-process/numactl/numactl-9999.ebuild
index 559e2e5aecb6..2cd855f3b3cb 100644
--- a/sys-process/numactl/numactl-9999.ebuild
+++ b/sys-process/numactl/numactl-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-process/parallel/parallel-20250722-r1.ebuild b/sys-process/parallel/parallel-20250722-r1.ebuild
index 9b3cf59c9890..bf93b31df7bc 100644
--- a/sys-process/parallel/parallel-20250722-r1.ebuild
+++ b/sys-process/parallel/parallel-20250722-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl[perl_features_ithreads]
diff --git a/sys-process/parallel/parallel-20250722.ebuild b/sys-process/parallel/parallel-20250722.ebuild
index 2b5cf8adb43e..a9ae5402c710 100644
--- a/sys-process/parallel/parallel-20250722.ebuild
+++ b/sys-process/parallel/parallel-20250722.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sys-process/prll/prll-0.6.4.ebuild b/sys-process/prll/prll-0.6.4.ebuild
index 58e636154a70..dabc44b2140d 100644
--- a/sys-process/prll/prll-0.6.4.ebuild
+++ b/sys-process/prll/prll-0.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/exzombie/prll/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 DOC_CONTENTS="
diff --git a/sys-process/procps/procps-4.0.4-r2.ebuild b/sys-process/procps/procps-4.0.4-r2.ebuild
index d4a063dfe366..8d369dfb0c73 100644
--- a/sys-process/procps/procps-4.0.4-r2.ebuild
+++ b/sys-process/procps/procps-4.0.4-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-ng-${PV}
 # See bug #913210
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/0-ng"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="elogind +kill modern-top +ncurses nls selinux static-libs skill systemd test unicode"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/procps/procps-4.0.5-r2.ebuild b/sys-process/procps/procps-4.0.5-r2.ebuild
index 7f6c4712ceb5..e99e3423aaac 100644
--- a/sys-process/procps/procps-4.0.5-r2.ebuild
+++ b/sys-process/procps/procps-4.0.5-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-ng-${PV}
 # See bug #913210
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1-ng"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="elogind +kill modern-top +ncurses nls selinux static-libs skill systemd test unicode"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/procps/procps-4.0.5-r3.ebuild b/sys-process/procps/procps-4.0.5-r3.ebuild
index 0e5de4e7c0af..1278fd7e2095 100644
--- a/sys-process/procps/procps-4.0.5-r3.ebuild
+++ b/sys-process/procps/procps-4.0.5-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-ng-${PV}
 # See bug #913210
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1-ng"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="elogind +kill modern-top +ncurses nls selinux static-libs skill systemd test unicode"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/psinfo/psinfo-0.12-r1.ebuild b/sys-process/psinfo/psinfo-0.12-r1.ebuild
index 033fcddb450b..7d7ee784d8c9 100644
--- a/sys-process/psinfo/psinfo-0.12-r1.ebuild
+++ b/sys-process/psinfo/psinfo-0.12-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ward.nu/computer/psinfo/"
 SRC_URI="http://www.ward.nu/computer/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 
 PATCHES=(
diff --git a/sys-process/psinfo/psinfo-0.12-r2.ebuild b/sys-process/psinfo/psinfo-0.12-r2.ebuild
index 84c516c8dbf8..f3d459fcb4fe 100644
--- a/sys-process/psinfo/psinfo-0.12-r2.ebuild
+++ b/sys-process/psinfo/psinfo-0.12-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ward.nu/computer/psinfo/"
 SRC_URI="http://www.ward.nu/computer/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86"
 LICENSE="GPL-2"
 
 PATCHES=(
diff --git a/sys-process/psmisc/psmisc-23.6.ebuild b/sys-process/psmisc/psmisc-23.6.ebuild
index 0b85e1fe6dec..bb3a946cbb15 100644
--- a/sys-process/psmisc/psmisc-23.6.ebuild
+++ b/sys-process/psmisc/psmisc-23.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="apparmor nls selinux test X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/psmisc/psmisc-23.7.ebuild b/sys-process/psmisc/psmisc-23.7.ebuild
index 0b85e1fe6dec..bb3a946cbb15 100644
--- a/sys-process/psmisc/psmisc-23.7.ebuild
+++ b/sys-process/psmisc/psmisc-23.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="apparmor nls selinux test X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/schedtool/schedtool-1.3.0-r2.ebuild b/sys-process/schedtool/schedtool-1.3.0-r2.ebuild
index 80a01618a25d..03d538e93850 100644
--- a/sys-process/schedtool/schedtool-1.3.0-r2.ebuild
+++ b/sys-process/schedtool/schedtool-1.3.0-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-c99.patch
diff --git a/sys-process/time/time-1.9-r1.ebuild b/sys-process/time/time-1.9-r1.ebuild
index 97398df1116f..2b7d613fb614 100644
--- a/sys-process/time/time-1.9-r1.ebuild
+++ b/sys-process/time/time-1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/sys-process/unixtop/unixtop-3.8_beta1-r4.ebuild b/sys-process/unixtop/unixtop-3.8_beta1-r4.ebuild
index 76c63663fbb9..20f721f88076 100644
--- a/sys-process/unixtop/unixtop-3.8_beta1-r4.ebuild
+++ b/sys-process/unixtop/unixtop-3.8_beta1-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/top-${PV/_/}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64-linux ~x64-solaris"
+KEYWORDS="~x64-solaris"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="
diff --git a/sys-process/wait_on_pid/wait_on_pid-0.0.2-r2.ebuild b/sys-process/wait_on_pid/wait_on_pid-0.0.2-r2.ebuild
index 5723957b9dad..a0536e9a22a1 100644
--- a/sys-process/wait_on_pid/wait_on_pid-0.0.2-r2.ebuild
+++ b/sys-process/wait_on_pid/wait_on_pid-0.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~zzam/${PN}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
 
 src_prepare() {
 	default
diff --git a/virtual/acl/acl-0-r2.ebuild b/virtual/acl/acl-0-r2.ebuild
index 53d0632bb05f..f966d9b308b5 100644
--- a/virtual/acl/acl-0-r2.ebuild
+++ b/virtual/acl/acl-0-r2.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for acl support (sys/acl.h)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="kernel_linux? ( >=sys-apps/acl-2.2.52-r1[static-libs?,${MULTILIB_USEDEP}] )"
diff --git a/virtual/blas/blas-3.8-r1.ebuild b/virtual/blas/blas-3.8-r1.ebuild
index eed6ca28f5a6..93cf447c6b0f 100644
--- a/virtual/blas/blas-3.8-r1.ebuild
+++ b/virtual/blas/blas-3.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="eselect-ldso flexiblas index64"
 REQUIRED_USE="?? ( eselect-ldso flexiblas )"
 
diff --git a/virtual/blas/blas-3.8.ebuild b/virtual/blas/blas-3.8.ebuild
index 31cd672536e8..da66badce217 100644
--- a/virtual/blas/blas-3.8.ebuild
+++ b/virtual/blas/blas-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/cblas/cblas-3.8-r1.ebuild b/virtual/cblas/cblas-3.8-r1.ebuild
index 32fb287cc3db..e04a2e05eeee 100644
--- a/virtual/cblas/cblas-3.8-r1.ebuild
+++ b/virtual/cblas/cblas-3.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual for BLAS C implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="eselect-ldso flexiblas index64"
 REQUIRED_USE="?? ( eselect-ldso flexiblas )"
 
diff --git a/virtual/cblas/cblas-3.8.ebuild b/virtual/cblas/cblas-3.8.ebuild
index bc41fc189ab9..9f07916d3a98 100644
--- a/virtual/cblas/cblas-3.8.ebuild
+++ b/virtual/cblas/cblas-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Virtual for BLAS C implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/commonlisp/commonlisp-0-r1.ebuild b/virtual/commonlisp/commonlisp-0-r1.ebuild
index d1d5662a526b..1aff15c7fdba 100644
--- a/virtual/commonlisp/commonlisp-0-r1.ebuild
+++ b/virtual/commonlisp/commonlisp-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Common Lisp"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	|| (
diff --git a/virtual/editor/editor-0-r7.ebuild b/virtual/editor/editor-0-r7.ebuild
index 056cce940a3f..5a56964736fa 100644
--- a/virtual/editor/editor-0-r7.ebuild
+++ b/virtual/editor/editor-0-r7.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for editor"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Add a package to RDEPEND only if the editor:
 # - can edit ordinary text files,
diff --git a/virtual/fam/fam-0-r1.ebuild b/virtual/fam/fam-0-r1.ebuild
index 9fc9f9a4a7f4..0a0c810ae47a 100644
--- a/virtual/fam/fam-0-r1.ebuild
+++ b/virtual/fam/fam-0-r1.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="A virtual package to choose between gamin and fam"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/fortran/fortran-0-r1.ebuild b/virtual/fortran/fortran-0-r1.ebuild
index f774305d8c68..90a03b1c9c2f 100644
--- a/virtual/fortran/fortran-0-r1.ebuild
+++ b/virtual/fortran/fortran-0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for Fortran Compiler"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="openmp"
 
 RDEPEND="
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
index 1de16dfe4676..ce240a62a8cd 100644
--- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
+++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual to choose between different icon themes"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="|| (
 	x11-themes/adwaita-icon-theme
diff --git a/virtual/glu/glu-9.0-r2.ebuild b/virtual/glu/glu-9.0-r2.ebuild
index 9c0948853f05..51c114b9618e 100644
--- a/virtual/glu/glu-9.0-r2.ebuild
+++ b/virtual/glu/glu-9.0-r2.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for OpenGL utility library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/gnustep-back/gnustep-back-0.31.0.ebuild b/virtual/gnustep-back/gnustep-back-0.31.0.ebuild
index a31dd6bee9e2..257782678ce1 100644
--- a/virtual/gnustep-back/gnustep-back-0.31.0.ebuild
+++ b/virtual/gnustep-back/gnustep-back-0.31.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for back-end component for the GNUstep GUI Library"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 RDEPEND="|| (
 		~gnustep-base/gnustep-back-cairo-${PV}
diff --git a/virtual/gnustep-back/gnustep-back-0.32.0.ebuild b/virtual/gnustep-back/gnustep-back-0.32.0.ebuild
index a31dd6bee9e2..257782678ce1 100644
--- a/virtual/gnustep-back/gnustep-back-0.32.0.ebuild
+++ b/virtual/gnustep-back/gnustep-back-0.32.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for back-end component for the GNUstep GUI Library"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 RDEPEND="|| (
 		~gnustep-base/gnustep-back-cairo-${PV}
diff --git a/virtual/gsasl/gsasl-3.ebuild b/virtual/gsasl/gsasl-3.ebuild
index 3ab95d48e0c9..237f969d6485 100644
--- a/virtual/gsasl/gsasl-3.ebuild
+++ b/virtual/gsasl/gsasl-3.ebuild
@@ -6,6 +6,6 @@ EAPI=8
 DESCRIPTION="Virtual for the GNU SASL library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=">=net-misc/gsasl-2.0.0"
diff --git a/virtual/httpd-basic/httpd-basic-0-r4.ebuild b/virtual/httpd-basic/httpd-basic-0-r4.ebuild
index cac7f5aadb25..02a125441e66 100644
--- a/virtual/httpd-basic/httpd-basic-0-r4.ebuild
+++ b/virtual/httpd-basic/httpd-basic-0-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for static HTML-enabled webservers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/httpd-basic/httpd-basic-0-r5.ebuild b/virtual/httpd-basic/httpd-basic-0-r5.ebuild
index 7be088bd3bd9..98aaa8d623e5 100644
--- a/virtual/httpd-basic/httpd-basic-0-r5.ebuild
+++ b/virtual/httpd-basic/httpd-basic-0-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for static HTML-enabled webservers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r4.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r4.ebuild
index d40721f9b6c6..3faf2265b3ff 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r4.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for CGI-enabled webservers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r6.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r6.ebuild
index 5b26d9a82b96..4daa7f42388e 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r6.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for CGI-enabled webservers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/httpd-fastcgi/httpd-fastcgi-0-r3.ebuild b/virtual/httpd-fastcgi/httpd-fastcgi-0-r3.ebuild
index 8c333f55c15e..1755e5c345a9 100644
--- a/virtual/httpd-fastcgi/httpd-fastcgi-0-r3.ebuild
+++ b/virtual/httpd-fastcgi/httpd-fastcgi-0-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for FastCGI-enabled webservers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/httpd-php/httpd-php-8.2.ebuild b/virtual/httpd-php/httpd-php-8.2.ebuild
index 079732795e46..36003094b78b 100644
--- a/virtual/httpd-php/httpd-php-8.2.ebuild
+++ b/virtual/httpd-php/httpd-php-8.2.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-8.3.ebuild b/virtual/httpd-php/httpd-php-8.3.ebuild
index 079732795e46..36003094b78b 100644
--- a/virtual/httpd-php/httpd-php-8.3.ebuild
+++ b/virtual/httpd-php/httpd-php-8.3.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-8.4.ebuild b/virtual/httpd-php/httpd-php-8.4.ebuild
index de03de96e6fc..d087a5a01ed8 100644
--- a/virtual/httpd-php/httpd-php-8.4.ebuild
+++ b/virtual/httpd-php/httpd-php-8.4.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-8.5.ebuild b/virtual/httpd-php/httpd-php-8.5.ebuild
index c6d79dc5375a..fb2dfdb87a2b 100644
--- a/virtual/httpd-php/httpd-php-8.5.ebuild
+++ b/virtual/httpd-php/httpd-php-8.5.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/imagemagick-tools/imagemagick-tools-1.ebuild b/virtual/imagemagick-tools/imagemagick-tools-1.ebuild
index ba576ccadf3a..7ccf6a4baeb0 100644
--- a/virtual/imagemagick-tools/imagemagick-tools-1.ebuild
+++ b/virtual/imagemagick-tools/imagemagick-tools-1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for imagemagick command line tools"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="jpeg perl postscript png svg tiff"
 
 # This virtual is to be used **ONLY** for depending on the runtime
diff --git a/virtual/inetd/inetd-1.ebuild b/virtual/inetd/inetd-1.ebuild
index 0e45fcec6c58..73868a2122cc 100644
--- a/virtual/inetd/inetd-1.ebuild
+++ b/virtual/inetd/inetd-1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for the internet super-server daemon"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/jack/jack-2.ebuild b/virtual/jack/jack-2.ebuild
index 4cc00018e651..777937b03b1d 100644
--- a/virtual/jack/jack-2.ebuild
+++ b/virtual/jack/jack-2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for JACK Audio Connection Kit"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	|| (
diff --git a/virtual/jdk/jdk-1.8.0-r9.ebuild b/virtual/jdk/jdk-1.8.0-r9.ebuild
index 21da4e744ad7..6184717ef2e1 100644
--- a/virtual/jdk/jdk-1.8.0-r9.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.8"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos ~x64-solaris"
 IUSE="headless-awt"
 
 RDEPEND="|| (
diff --git a/virtual/jpeg-compat/jpeg-compat-62.ebuild b/virtual/jpeg-compat/jpeg-compat-62.ebuild
index 685e48fd5fce..b776f14a0256 100644
--- a/virtual/jpeg-compat/jpeg-compat-62.ebuild
+++ b/virtual/jpeg-compat/jpeg-compat-62.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs"
 SLOT="62"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/jpeg/jpeg-100-r1.ebuild b/virtual/jpeg/jpeg-100-r1.ebuild
index 17d0d0774bb4..6220f96925f3 100644
--- a/virtual/jpeg/jpeg-100-r1.ebuild
+++ b/virtual/jpeg/jpeg-100-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/virtual/jre/jre-1.8.0-r3.ebuild b/virtual/jre/jre-1.8.0-r3.ebuild
index 54d0edbe7234..08e9d3989f5f 100644
--- a/virtual/jre/jre-1.8.0-r3.ebuild
+++ b/virtual/jre/jre-1.8.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="1.8"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="|| (
 		virtual/jdk:1.8
diff --git a/virtual/lapack/lapack-3.10-r1.ebuild b/virtual/lapack/lapack-3.10-r1.ebuild
index a17c9d47646a..abe825691ccf 100644
--- a/virtual/lapack/lapack-3.10-r1.ebuild
+++ b/virtual/lapack/lapack-3.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="eselect-ldso flexiblas index64"
 REQUIRED_USE="?? ( eselect-ldso flexiblas )"
 
diff --git a/virtual/lapack/lapack-3.10.ebuild b/virtual/lapack/lapack-3.10.ebuild
index eff06cf064f3..224c0fc2ec5e 100644
--- a/virtual/lapack/lapack-3.10.ebuild
+++ b/virtual/lapack/lapack-3.10.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/lapacke/lapacke-3.8-r1.ebuild b/virtual/lapacke/lapacke-3.8-r1.ebuild
index ab21a95786cf..937974acea8d 100644
--- a/virtual/lapacke/lapacke-3.8-r1.ebuild
+++ b/virtual/lapacke/lapacke-3.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for LAPACK C implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/lapacke/lapacke-3.8-r2.ebuild b/virtual/lapacke/lapacke-3.8-r2.ebuild
index fe33f5726719..e30d8c8fa20b 100644
--- a/virtual/lapacke/lapacke-3.8-r2.ebuild
+++ b/virtual/lapacke/lapacke-3.8-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual for LAPACK C implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="eselect-ldso flexiblas index64"
 REQUIRED_USE="?? ( eselect-ldso flexiblas )"
 
diff --git a/virtual/latex-base/latex-base-1.0.ebuild b/virtual/latex-base/latex-base-1.0.ebuild
index 39580663e46c..45532a9d2ebb 100644
--- a/virtual/latex-base/latex-base-1.0.ebuild
+++ b/virtual/latex-base/latex-base-1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for basic LaTeX binaries"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-texlive/texlive-latexrecommended
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
index 5e0aaf4dd489..a626c48cba5a 100644
--- a/virtual/libc/libc-1-r1.ebuild
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for the C library"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # explicitly depend on SLOT 2.2 of glibc, because it sets
 # a different SLOT for cross-compiling
diff --git a/virtual/libcrypt/libcrypt-1-r2.ebuild b/virtual/libcrypt/libcrypt-1-r2.ebuild
index 171426116575..0e42538290f4 100644
--- a/virtual/libcrypt/libcrypt-1-r2.ebuild
+++ b/virtual/libcrypt/libcrypt-1-r2.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for libcrypt.so"
 
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/virtual/libcrypt/libcrypt-2-r1.ebuild b/virtual/libcrypt/libcrypt-2-r1.ebuild
index 6fdd786f3dd6..0a1080b504d3 100644
--- a/virtual/libcrypt/libcrypt-2-r1.ebuild
+++ b/virtual/libcrypt/libcrypt-2-r1.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for libcrypt.so"
 
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/virtual/libcrypt/libcrypt-2.ebuild b/virtual/libcrypt/libcrypt-2.ebuild
index ad969f83da6e..1d6c4b8edbd3 100644
--- a/virtual/libcrypt/libcrypt-2.ebuild
+++ b/virtual/libcrypt/libcrypt-2.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for libcrypt.so"
 
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/virtual/libelf/libelf-3-r1.ebuild b/virtual/libelf/libelf-3-r1.ebuild
index 2f9bf6e34dcc..df8d91a044ff 100644
--- a/virtual/libelf/libelf-3-r1.ebuild
+++ b/virtual/libelf/libelf-3-r1.ebuild
@@ -8,6 +8,6 @@ inherit multilib-build
 DESCRIPTION="Virtual for libelf.so.1 provider dev-libs/elfutils"
 
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=">=dev-libs/elfutils-0.155-r1:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libiconv/libiconv-0-r2.ebuild b/virtual/libiconv/libiconv-0-r2.ebuild
index 0a0c29c86a64..e017427b8fdb 100644
--- a/virtual/libiconv/libiconv-0-r2.ebuild
+++ b/virtual/libiconv/libiconv-0-r2.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for the GNU conversion library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
 # that and gcc
diff --git a/virtual/libintl/libintl-0-r2.ebuild b/virtual/libintl/libintl-0-r2.ebuild
index 9dec2edb34d7..d22b7f030ba9 100644
--- a/virtual/libintl/libintl-0-r2.ebuild
+++ b/virtual/libintl/libintl-0-r2.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for the GNU Internationalization Library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between that and gcc.
 RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) )"
diff --git a/virtual/libusb/libusb-0-r2.ebuild b/virtual/libusb/libusb-0-r2.ebuild
index 5834eadfdd10..1fd42d0743c1 100644
--- a/virtual/libusb/libusb-0-r2.ebuild
+++ b/virtual/libusb/libusb-0-r2.ebuild
@@ -6,6 +6,6 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libusb"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-libs/libusb-compat-0.1.5-r2[${MULTILIB_USEDEP}]"
diff --git a/virtual/libusb/libusb-1-r2.ebuild b/virtual/libusb/libusb-1-r2.ebuild
index b21d3e399aa3..24ab9ba7a3aa 100644
--- a/virtual/libusb/libusb-1-r2.ebuild
+++ b/virtual/libusb/libusb-1-r2.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libusb"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="udev"
 
 # We force a recent libusb so that downstream consumers of virtual/libusb
diff --git a/virtual/logger/logger-0-r2.ebuild b/virtual/logger/logger-0-r2.ebuild
index 9463c301774d..1fa137b6145f 100644
--- a/virtual/logger/logger-0-r2.ebuild
+++ b/virtual/logger/logger-0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for system loggers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/virtual/mailx/mailx-4.ebuild b/virtual/mailx/mailx-4.ebuild
index 7ddfb149eff2..5aca19001f6f 100644
--- a/virtual/mailx/mailx-4.ebuild
+++ b/virtual/mailx/mailx-4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for mail implementations"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="|| (
 	net-mail/mailutils[clients]
diff --git a/virtual/man/man-0-r4.ebuild b/virtual/man/man-0-r4.ebuild
index 532344fb0dcc..f4a8d62bb74c 100644
--- a/virtual/man/man-0-r4.ebuild
+++ b/virtual/man/man-0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for man"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/mda/mda-0.ebuild b/virtual/mda/mda-0.ebuild
index 8aa20ca9d993..4cb19cf1abc5 100644
--- a/virtual/mda/mda-0.ebuild
+++ b/virtual/mda/mda-0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for Message Delivery Agents"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 
 # mail-mta/citadel is from sunrise
 RDEPEND="
diff --git a/virtual/minizip/minizip-1.3.1.ebuild b/virtual/minizip/minizip-1.3.1.ebuild
index 1f3389e1aafb..d07bb000fbfb 100644
--- a/virtual/minizip/minizip-1.3.1.ebuild
+++ b/virtual/minizip/minizip-1.3.1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libminizip.so providers"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/virtual/mpi/mpi-2.0-r8.ebuild b/virtual/mpi/mpi-2.0-r8.ebuild
index 665b10adc3e4..dfb0227a18a0 100644
--- a/virtual/mpi/mpi-2.0-r8.ebuild
+++ b/virtual/mpi/mpi-2.0-r8.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for Message Passing Interface (MPI) v2.0 implementation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="cxx fortran romio threads nullmpi"
 
 RDEPEND="|| (
diff --git a/virtual/mta/mta-1-r2.ebuild b/virtual/mta/mta-1-r2.ebuild
index ba02af3ad0a6..b47eaa2a6fb4 100644
--- a/virtual/mta/mta-1-r2.ebuild
+++ b/virtual/mta/mta-1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for Message Transfer Agents"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="|| (	mail-mta/nullmailer
 				mail-mta/msmtp[mta]
diff --git a/virtual/mysql/mysql-8.0.ebuild b/virtual/mysql/mysql-8.0.ebuild
index 51bf3b954f57..c2298c8d9ec3 100644
--- a/virtual/mysql/mysql-8.0.ebuild
+++ b/virtual/mysql/mysql-8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for MySQL database server"
 SLOT="0/18"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+server static"
 
 RDEPEND="
diff --git a/virtual/notification-daemon/notification-daemon-0.ebuild b/virtual/notification-daemon/notification-daemon-0.ebuild
index add2020cccc8..85bc53b04e55 100644
--- a/virtual/notification-daemon/notification-daemon-0.ebuild
+++ b/virtual/notification-daemon/notification-daemon-0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for notification daemon dbus service"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="gnome kde"
 
 RDEPEND="
diff --git a/virtual/opengl/opengl-8.ebuild b/virtual/opengl/opengl-8.ebuild
index 0d52e68bf2a5..0f680f743153 100644
--- a/virtual/opengl/opengl-8.ebuild
+++ b/virtual/opengl/opengl-8.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for OpenGL implementation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X"
 
 RDEPEND="
diff --git a/virtual/os-headers/os-headers-0-r2.ebuild b/virtual/os-headers/os-headers-0-r2.ebuild
index eb4668bd2ca8..f7fafc72e357 100644
--- a/virtual/os-headers/os-headers-0-r2.ebuild
+++ b/virtual/os-headers/os-headers-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for operating system headers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # depend on SLOT 0 of linux-headers, because kernel-2.eclass
 # sets a different SLOT for cross-building
diff --git a/virtual/package-manager/package-manager-2.ebuild b/virtual/package-manager/package-manager-2.ebuild
index 130e3e5a52db..922057de7c3d 100644
--- a/virtual/package-manager/package-manager-2.ebuild
+++ b/virtual/package-manager/package-manager-2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for the package manager"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/pager/pager-0-r1.ebuild b/virtual/pager/pager-0-r1.ebuild
index 3877e75d3d37..02abf81975c4 100644
--- a/virtual/pager/pager-0-r1.ebuild
+++ b/virtual/pager/pager-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for command-line pagers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="|| ( sys-apps/less
 	sys-apps/most
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-3.20.10_rc.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-3.20.10_rc.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-3.20.10_rc.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-3.20.10_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-3.40.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-3.40.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-3.40.0.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-3.40.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.143.0-r1.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.143.0-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.143.0-r1.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.143.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r11.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r11.ebuild
index 637ecc9118c9..32375c3d8754 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r11.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r11.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN/perl-CPAN-2.360.0-r1.ebuild b/virtual/perl-CPAN/perl-CPAN-2.360.0-r1.ebuild
index 93336edb7544..9bde12595ed8 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.360.0-r1.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.360.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN/perl-CPAN-2.380.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.380.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.380.0.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.380.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Carp/perl-Carp-1.540.0-r2.ebuild b/virtual/perl-Carp/perl-Carp-1.540.0-r2.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Carp/perl-Carp-1.540.0-r2.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.540.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.212.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.212.0.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.212.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.212.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.213.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.213.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.213.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.213.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.212.0-r1.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.212.0-r1.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.212.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.212.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.213.0-r1.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.213.0-r1.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.213.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.213.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-DB_File/perl-DB_File-1.859.0-r1.ebuild b/virtual/perl-DB_File/perl-DB_File-1.859.0-r1.ebuild
index 0cad898fa4dd..f107e8501bd6 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.859.0-r1.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.859.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42*[berkdb] =dev-lang/perl-5.40*[berkdb] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.189.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.189.0.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.189.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.189.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.192.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.192.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.192.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.192.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.720.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.720.0.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.720.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.720.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.730.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.730.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.730.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.730.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.580.100_rc-r1.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.580.100_rc-r1.ebuild
index 93336edb7544..9bde12595ed8 100644
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.580.100_rc-r1.ebuild
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.580.100_rc-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.590.0.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.590.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.590.0.ebuild
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.590.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.40.0-r2.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.40.0-r2.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.40.0-r2.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.40.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest/perl-Digest-1.200.0-r3.ebuild b/virtual/perl-Digest/perl-Digest-1.200.0-r3.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Digest/perl-Digest-1.200.0-r3.ebuild
+++ b/virtual/perl-Digest/perl-Digest-1.200.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/perl-Encode-3.210.0-r2.ebuild b/virtual/perl-Encode/perl-Encode-3.210.0-r2.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-Encode/perl-Encode-3.210.0-r2.ebuild
+++ b/virtual/perl-Encode/perl-Encode-3.210.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild b/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Exporter/perl-Exporter-5.790.0.ebuild b/virtual/perl-Exporter/perl-Exporter-5.790.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.790.0.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.790.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.240.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.240.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.240.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.240.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.242-r2.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.242-r2.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.242-r2.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.242-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.700.0-r1.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.700.0-r1.ebuild
index 93336edb7544..9bde12595ed8 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.700.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.700.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.760.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.760.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.760.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.760.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.510.0-r1.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.510.0-r1.ebuild
index 93336edb7544..9bde12595ed8 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.510.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.510.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.570.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.570.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.570.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.570.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Path/perl-File-Path-2.180.0-r4.ebuild b/virtual/perl-File-Path/perl-File-Path-2.180.0-r4.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.180.0-r4.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.180.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild
index b05f73c3c349..6935d084d52b 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40.0* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.910.0-r1.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.910.0-r1.ebuild
index aabf2dd8890b..e77d913254f1 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.910.0-r1.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.910.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40.2* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild
index 5afd8d7403ec..430e3e499aa5 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40.1* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.940.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.940.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.940.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.940.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.231.100-r1.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.231.100-r1.ebuild
index a4958c1f5f24..e1bb3add7474 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.231.100-r1.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.231.100-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.580.0-r1.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.580.0-r1.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.580.0-r1.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.580.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.88.0.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.88.0.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.88.0.ebuild
+++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.88.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.90.0.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.90.0.ebuild
index dec780b5a586..de98f8450ebe 100644
--- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.90.0.ebuild
+++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.90.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.212.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.212.0.ebuild
index 559750adfbc5..d2109e23c529 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.212.0.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.212.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.213.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.213.0.ebuild
index 264fbb2d1568..c7740b20231b 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.213.0.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.213.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.420.0.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.420.0.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.420.0.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.420.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.430.0.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.430.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.430.0.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.430.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.150.0-r1.ebuild b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.150.0-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.150.0-r1.ebuild
+++ b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.150.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/perl-IO-1.550.0-r1.ebuild b/virtual/perl-IO/perl-IO-1.550.0-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-IO/perl-IO-1.550.0-r1.ebuild
+++ b/virtual/perl-IO/perl-IO-1.550.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-4.160.0-r3.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-4.160.0-r3.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-4.160.0-r3.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-4.160.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.330.0-r2.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.330.0-r2.ebuild
index 7fb5754459dc..51574e843c73 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.330.0-r2.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.330.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.160.100_rc-r2.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.160.100_rc-r2.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.160.100_rc-r2.ebuild
+++ b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.160.100_rc-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.501.800.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.501.800.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.501.800.ebuild
+++ b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.501.800.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.502.0.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.502.0.ebuild
index dec780b5a586..de98f8450ebe 100644
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.502.0.ebuild
+++ b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.502.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-2.3.2.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-2.3.2.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-2.3.2.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-2.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-2.5.2.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-2.5.2.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-2.5.2.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-2.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-2.3.2.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-2.3.2.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-2.3.2.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-2.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-2.5.2.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-2.5.2.ebuild
index dec780b5a586..de98f8450ebe 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-2.5.2.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-2.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.620.0-r1.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.620.0-r1.ebuild
index 93336edb7544..9bde12595ed8 100644
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.620.0-r1.ebuild
+++ b/virtual/perl-Math-Complex/perl-Math-Complex-1.620.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.630.0.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.630.0.ebuild
index dec780b5a586..de98f8450ebe 100644
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.630.0.ebuild
+++ b/virtual/perl-Math-Complex/perl-Math-Complex-1.630.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.406.90.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.406.90.ebuild
index c4bbad43a48e..5b08bc5b1d94 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.406.90.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.406.90.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.501.184_rc-r1.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.501.184_rc-r1.ebuild
index 1a96b1e87ab4..f94abf84a4eb 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.501.184_rc-r1.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.501.184_rc-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.504.134_rc.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.504.134_rc.ebuild
index 32dbf085ce37..b42584e94cbd 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.504.134_rc.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.504.134_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.507.20-r2.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.507.20-r2.ebuild
index 783b63ddcde6..032d4b07cd14 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.507.20-r2.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.507.20-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0-r4.ebuild b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0-r4.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0-r4.ebuild
+++ b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.360.0-r5.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.360.0-r5.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Module-Load/perl-Module-Load-0.360.0-r5.ebuild
+++ b/virtual/perl-Module-Load/perl-Module-Load-0.360.0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.38-r1.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.38-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.38-r1.ebuild
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.38-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r15.ebuild b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r15.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r15.ebuild
+++ b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r15.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r9.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r9.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r9.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.450.0-r1.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.450.0-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.450.0-r1.ebuild
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.450.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.630.0-r1.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.630.0-r1.ebuild
index 177d4a62679a..e6724ccaa3c0 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.630.0-r1.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.630.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.680.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.680.0.ebuild
index 812d44354aea..255d8cf0f937 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.680.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.680.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.680.100_rc.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.680.100_rc.ebuild
index 90fce33b1f1e..775ec25bcf3e 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.680.100_rc.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.680.100_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Socket/perl-Socket-2.38.0-r1.ebuild b/virtual/perl-Socket/perl-Socket-2.38.0-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-Socket/perl-Socket-2.38.0-r1.ebuild
+++ b/virtual/perl-Socket/perl-Socket-2.38.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/perl-Storable-3.320.0-r1.ebuild b/virtual/perl-Storable/perl-Storable-3.320.0-r1.ebuild
index 93336edb7544..9bde12595ed8 100644
--- a/virtual/perl-Storable/perl-Storable-3.320.0-r1.ebuild
+++ b/virtual/perl-Storable/perl-Storable-3.320.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/perl-Storable-3.370.0.ebuild b/virtual/perl-Storable/perl-Storable-3.370.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Storable/perl-Storable-3.370.0.ebuild
+++ b/virtual/perl-Storable/perl-Storable-3.370.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.360.0-r5.ebuild b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.360.0-r5.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.360.0-r5.ebuild
+++ b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.360.0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-5.10.0-r5.ebuild b/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-5.10.0-r5.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-5.10.0-r5.ebuild
+++ b/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-5.10.0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r9.ebuild b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r9.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r9.ebuild
+++ b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Term-Table/perl-Term-Table-0.22.0.ebuild b/virtual/perl-Term-Table/perl-Term-Table-0.22.0.ebuild
index c2c5f0637462..5809601f3e48 100644
--- a/virtual/perl-Term-Table/perl-Term-Table-0.22.0.ebuild
+++ b/virtual/perl-Term-Table/perl-Term-Table-0.22.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-Term-Table/perl-Term-Table-0.23.0.ebuild b/virtual/perl-Term-Table/perl-Term-Table-0.23.0.ebuild
index c2c5f0637462..5809601f3e48 100644
--- a/virtual/perl-Term-Table/perl-Term-Table-0.23.0.ebuild
+++ b/virtual/perl-Term-Table/perl-Term-Table-0.23.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-Term-Table/perl-Term-Table-0.24.0-r1.ebuild b/virtual/perl-Term-Table/perl-Term-Table-0.24.0-r1.ebuild
index bd39307f19f9..4894218fe276 100644
--- a/virtual/perl-Term-Table/perl-Term-Table-0.24.0-r1.ebuild
+++ b/virtual/perl-Term-Table/perl-Term-Table-0.24.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.500.0-r1.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.500.0-r1.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.500.0-r1.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.500.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.199.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.199.ebuild
index 1c7c37ac9cc5..58f9e41667f6 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.199.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.199.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.208.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.208.ebuild
index be7ae26fb9b5..bf6a3ca710eb 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.208.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.208.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.210.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.210.ebuild
index e26c7a0e70b6..c53fcdb06b31 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.210.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.210.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test/perl-Test-1.310.0-r8.ebuild b/virtual/perl-Test/perl-Test-1.310.0-r8.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Test/perl-Test-1.310.0-r8.ebuild
+++ b/virtual/perl-Test/perl-Test-1.310.0-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test2-Suite/perl-Test2-Suite-0.0.162.ebuild b/virtual/perl-Test2-Suite/perl-Test2-Suite-0.0.162.ebuild
index 7ae153cf9bf1..8c10ad8064e8 100644
--- a/virtual/perl-Test2-Suite/perl-Test2-Suite-0.0.162.ebuild
+++ b/virtual/perl-Test2-Suite/perl-Test2-Suite-0.0.162.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test2-Suite/perl-Test2-Suite-1.302.210.ebuild b/virtual/perl-Test2-Suite/perl-Test2-Suite-1.302.210.ebuild
index cf23874ee21e..939a50eed218 100644
--- a/virtual/perl-Test2-Suite/perl-Test2-Suite-1.302.210.ebuild
+++ b/virtual/perl-Test2-Suite/perl-Test2-Suite-1.302.210.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.60.0-r2.ebuild b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.60.0-r2.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.60.0-r2.ebuild
+++ b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.60.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.310.0-r4.ebuild b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.310.0-r4.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.310.0-r4.ebuild
+++ b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.310.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2024.1.0-r1.ebuild b/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2024.1.0-r1.ebuild
index e8d6d8ec9194..8d09141892f9 100644
--- a/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2024.1.0-r1.ebuild
+++ b/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2024.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Text::Tabs and Text::Wrap, also distributed as Text::Tabs+Wrap"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.700.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.700.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.700.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.700.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.800.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.800.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.800.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.800.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.350.0-r1.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.350.0-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-Time-Local/perl-Time-Local-1.350.0-r1.ebuild
+++ b/virtual/perl-Time-Local/perl-Time-Local-1.350.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.310.0-r3.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.310.0-r3.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.310.0-r3.ebuild
+++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.310.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.320.0-r2.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.320.0-r2.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.320.0-r2.ebuild
+++ b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.320.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.320.0-r2.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.320.0-r2.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.320.0-r2.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.320.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-autodie/perl-autodie-2.370.0-r1.ebuild b/virtual/perl-autodie/perl-autodie-2.370.0-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-autodie/perl-autodie-2.370.0-r1.ebuild
+++ b/virtual/perl-autodie/perl-autodie-2.370.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-bignum/perl-bignum-0.670.0-r1.ebuild b/virtual/perl-bignum/perl-bignum-0.670.0-r1.ebuild
index 482679563ec7..430b95d65610 100644
--- a/virtual/perl-bignum/perl-bignum-0.670.0-r1.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.670.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-if/perl-if-0.61.0-r3.ebuild b/virtual/perl-if/perl-if-0.61.0-r3.ebuild
index 1920e0a0bc42..f65834b444fb 100644
--- a/virtual/perl-if/perl-if-0.61.0-r3.ebuild
+++ b/virtual/perl-if/perl-if-0.61.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-libnet/perl-libnet-3.150.0-r2.ebuild b/virtual/perl-libnet/perl-libnet-3.150.0-r2.ebuild
index a461d7c015a9..f6b03cd55da4 100644
--- a/virtual/perl-libnet/perl-libnet-3.150.0-r2.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.150.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+ssl"
 
 RDEPEND="
diff --git a/virtual/perl-parent/perl-parent-0.241.0-r1.ebuild b/virtual/perl-parent/perl-parent-0.241.0-r1.ebuild
index 93336edb7544..9bde12595ed8 100644
--- a/virtual/perl-parent/perl-parent-0.241.0-r1.ebuild
+++ b/virtual/perl-parent/perl-parent-0.241.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-parent/perl-parent-0.244.0.ebuild b/virtual/perl-parent/perl-parent-0.244.0.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-parent/perl-parent-0.244.0.ebuild
+++ b/virtual/perl-parent/perl-parent-0.244.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-podlators/perl-podlators-5.10.200_rc.ebuild b/virtual/perl-podlators/perl-podlators-5.10.200_rc.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-podlators/perl-podlators-5.10.200_rc.ebuild
+++ b/virtual/perl-podlators/perl-podlators-5.10.200_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-podlators/perl-podlators-6.0.2.ebuild b/virtual/perl-podlators/perl-podlators-6.0.2.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-podlators/perl-podlators-6.0.2.ebuild
+++ b/virtual/perl-podlators/perl-podlators-6.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/perl-threads-2.400.0.ebuild b/virtual/perl-threads/perl-threads-2.400.0.ebuild
index 3e214a8beb6c..484ee1554fdc 100644
--- a/virtual/perl-threads/perl-threads-2.400.0.ebuild
+++ b/virtual/perl-threads/perl-threads-2.400.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40*[perl_features_ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/perl-threads-2.430.0.ebuild b/virtual/perl-threads/perl-threads-2.430.0.ebuild
index 02a1be31defb..19ac446560c0 100644
--- a/virtual/perl-threads/perl-threads-2.430.0.ebuild
+++ b/virtual/perl-threads/perl-threads-2.430.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42*[perl_features_ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/perl-version-0.993.0.ebuild b/virtual/perl-version/perl-version-0.993.0.ebuild
index 413c4acd25a3..efd9779dd6f2 100644
--- a/virtual/perl-version/perl-version-0.993.0.ebuild
+++ b/virtual/perl-version/perl-version-0.993.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/perl-version-0.993.300.ebuild b/virtual/perl-version/perl-version-0.993.300.ebuild
index 4132f8b33eb4..81e5def98b79 100644
--- a/virtual/perl-version/perl-version-0.993.300.ebuild
+++ b/virtual/perl-version/perl-version-0.993.300.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.42* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/pkgconfig/pkgconfig-3.ebuild b/virtual/pkgconfig/pkgconfig-3.ebuild
index 6460bac5d0d4..b51956ed3299 100644
--- a/virtual/pkgconfig/pkgconfig-3.ebuild
+++ b/virtual/pkgconfig/pkgconfig-3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for the pkg-config implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+native-symlinks"
 
 RDEPEND="dev-util/pkgconf[native-symlinks(+)=]"
diff --git a/virtual/ruby-ssl/ruby-ssl-13.ebuild b/virtual/ruby-ssl/ruby-ssl-13.ebuild
index e5bd145071ba..31f4abd0d26c 100644
--- a/virtual/ruby-ssl/ruby-ssl-13.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-13.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	ruby_targets_ruby32? ( dev-lang/ruby:3.2[ssl] )
diff --git a/virtual/ruby-ssl/ruby-ssl-14.ebuild b/virtual/ruby-ssl/ruby-ssl-14.ebuild
index a725f40bea26..67dbb8769bcc 100644
--- a/virtual/ruby-ssl/ruby-ssl-14.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-14.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	ruby_targets_ruby32? ( dev-lang/ruby:3.2[ssl] )
diff --git a/virtual/ruby-ssl/ruby-ssl-15.ebuild b/virtual/ruby-ssl/ruby-ssl-15.ebuild
index 374619cf0420..70fe23613687 100644
--- a/virtual/ruby-ssl/ruby-ssl-15.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-15.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	ruby_targets_ruby32? ( dev-lang/ruby:3.2[ssl] )
diff --git a/virtual/rubygems/rubygems-19.ebuild b/virtual/rubygems/rubygems-19.ebuild
index fb6267f519a4..b2a9c2c6bef1 100644
--- a/virtual/rubygems/rubygems-19.ebuild
+++ b/virtual/rubygems/rubygems-19.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for rubygems"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	ruby_targets_ruby32? ( >=dev-ruby/rubygems-3.4.6[ruby_targets_ruby32] )
diff --git a/virtual/rubygems/rubygems-20.ebuild b/virtual/rubygems/rubygems-20.ebuild
index 5beb59124be6..e33bbef30561 100644
--- a/virtual/rubygems/rubygems-20.ebuild
+++ b/virtual/rubygems/rubygems-20.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for rubygems"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	ruby_targets_ruby32? ( >=dev-ruby/rubygems-3.4.6[ruby_targets_ruby32] )
diff --git a/virtual/rubygems/rubygems-21-r1.ebuild b/virtual/rubygems/rubygems-21-r1.ebuild
index 1a5798db1953..126330f0fcd7 100644
--- a/virtual/rubygems/rubygems-21-r1.ebuild
+++ b/virtual/rubygems/rubygems-21-r1.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for rubygems"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	ruby_targets_ruby32? ( >=dev-ruby/rubygems-3.4.19[ruby_targets_ruby32] )
diff --git a/virtual/secret-service/secret-service-0-r1.ebuild b/virtual/secret-service/secret-service-0-r1.ebuild
index 1c4d7ed852dc..21dc062551bb 100644
--- a/virtual/secret-service/secret-service-0-r1.ebuild
+++ b/virtual/secret-service/secret-service-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for a freedesktop.org Secret Service API provider"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="|| (
 	gnome-base/gnome-keyring
diff --git a/virtual/secret-service/secret-service-0.ebuild b/virtual/secret-service/secret-service-0.ebuild
index eaac20b11b0e..185cc0b115a7 100644
--- a/virtual/secret-service/secret-service-0.ebuild
+++ b/virtual/secret-service/secret-service-0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for a freedesktop.org Secret Service API provider"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="|| (
 	gnome-base/gnome-keyring
diff --git a/virtual/service-manager/service-manager-2.ebuild b/virtual/service-manager/service-manager-2.ebuild
index 3c6c73a4e82e..0cdac3d427ef 100644
--- a/virtual/service-manager/service-manager-2.ebuild
+++ b/virtual/service-manager/service-manager-2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for various service managers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/virtual/skkserv/skkserv-0-r1.ebuild b/virtual/skkserv/skkserv-0-r1.ebuild
index bb9debba20df..0227688da0e8 100644
--- a/virtual/skkserv/skkserv-0-r1.ebuild
+++ b/virtual/skkserv/skkserv-0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for SKK server"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="|| (
 		app-i18n/dbskkd-cdb
diff --git a/virtual/ssh/ssh-0-r2.ebuild b/virtual/ssh/ssh-0-r2.ebuild
index adbfd8845007..58c683816f42 100644
--- a/virtual/ssh/ssh-0-r2.ebuild
+++ b/virtual/ssh/ssh-0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for SSH client and server"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/virtual/szip/szip-2.1.ebuild b/virtual/szip/szip-2.1.ebuild
index 7ab554eb2d10..d7f1e6b4d8b6 100644
--- a/virtual/szip/szip-2.1.ebuild
+++ b/virtual/szip/szip-2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for szip compression drop-in replacements"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="|| (
 	sci-libs/libaec[szip]
diff --git a/virtual/tex-base/tex-base-0.ebuild b/virtual/tex-base/tex-base-0.ebuild
index 30101bdd2dce..28bea9ac3bb1 100644
--- a/virtual/tex-base/tex-base-0.ebuild
+++ b/virtual/tex-base/tex-base-0.ebuild
@@ -6,6 +6,6 @@ EAPI=7
 DESCRIPTION="Virtual for basic TeX binaries (tex, kpathsea)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="app-text/texlive-core"
diff --git a/virtual/texi2dvi/texi2dvi-0-r2.ebuild b/virtual/texi2dvi/texi2dvi-0-r2.ebuild
index b4f70dfd78b7..822eb2961e8f 100644
--- a/virtual/texi2dvi/texi2dvi-0-r2.ebuild
+++ b/virtual/texi2dvi/texi2dvi-0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for texi2dvi (and texi2pdf)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-texlive/texlive-plaingeneric
diff --git a/virtual/tmpfiles/tmpfiles-0-r5.ebuild b/virtual/tmpfiles/tmpfiles-0-r5.ebuild
index a84abab92b9d..db167d978343 100644
--- a/virtual/tmpfiles/tmpfiles-0-r5.ebuild
+++ b/virtual/tmpfiles/tmpfiles-0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual to select between different tmpfiles.d handlers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/virtual/ttf-fonts/ttf-fonts-1-r2.ebuild b/virtual/ttf-fonts/ttf-fonts-1-r2.ebuild
index d47987a2c50c..bef8ab33e9e2 100644
--- a/virtual/ttf-fonts/ttf-fonts-1-r2.ebuild
+++ b/virtual/ttf-fonts/ttf-fonts-1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for Serif/Sans/Monospace font packages"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="|| (
 		media-fonts/liberation-fonts
diff --git a/virtual/w3m/w3m-1.ebuild b/virtual/w3m/w3m-1.ebuild
index 7e69508f5d2b..4170be969339 100644
--- a/virtual/w3m/w3m-1.ebuild
+++ b/virtual/w3m/w3m-1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for the w3m web browser"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="|| (
 		www-client/w3m
diff --git a/virtual/zlib/zlib-1.3.1-r1.ebuild b/virtual/zlib/zlib-1.3.1-r1.ebuild
index 05fd6ebe1362..76f775f90a47 100644
--- a/virtual/zlib/zlib-1.3.1-r1.ebuild
+++ b/virtual/zlib/zlib-1.3.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libz.so providers"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/virtual/zlib/zlib-1.3.1.ebuild b/virtual/zlib/zlib-1.3.1.ebuild
index 26b058cec30f..15284cc9edc8 100644
--- a/virtual/zlib/zlib-1.3.1.ebuild
+++ b/virtual/zlib/zlib-1.3.1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libz.so providers"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="minizip static-libs"
 
 RDEPEND="
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
index 08c90fca9a51..a72d8dd1a7c2 100644
--- a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
+++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~sparc x86"
 
 need_apache2
 
diff --git a/www-apps/novnc/novnc-1.4.0.ebuild b/www-apps/novnc/novnc-1.4.0.ebuild
index c9856e9a01bb..32c264ae98b6 100644
--- a/www-apps/novnc/novnc-1.4.0.ebuild
+++ b/www-apps/novnc/novnc-1.4.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/novnc/noVNC"
 else
 	SRC_URI="https://github.com/novnc/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~riscv x86"
 	S="${WORKDIR}/noVNC-${PV}"
 fi
 
diff --git a/www-apps/novnc/novnc-1.6.0.ebuild b/www-apps/novnc/novnc-1.6.0.ebuild
index f2c683fb2457..030b05f103d1 100644
--- a/www-apps/novnc/novnc-1.6.0.ebuild
+++ b/www-apps/novnc/novnc-1.6.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/novnc/noVNC"
 else
 	SRC_URI="https://github.com/novnc/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~riscv x86"
 	S="${WORKDIR}/noVNC-${PV}"
 fi
 
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index 6abcaaea8568..7a111a7820e0 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/novnc/noVNC"
 else
 	SRC_URI="https://github.com/novnc/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	S="${WORKDIR}/noVNC-${PV}"
 fi
 
diff --git a/www-client/elinks/elinks-0.18.0.ebuild b/www-client/elinks/elinks-0.18.0.ebuild
index 121869560768..dd2bf2193583 100644
--- a/www-client/elinks/elinks-0.18.0.ebuild
+++ b/www-client/elinks/elinks-0.18.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/rkd77/elinks/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 26855a75aec2..b679d078f9c3 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/rkd77/elinks/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-client/httrack/httrack-3.49.5.ebuild b/www-client/httrack/httrack-3.49.5.ebuild
index 53eea419aed4..acff50786c0f 100644
--- a/www-client/httrack/httrack-3.49.5.ebuild
+++ b/www-client/httrack/httrack-3.49.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/xroche/httrack/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="BSD GPL-3 public-domain"  # BSD and public-domain is from bundled Coucal
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE="static-libs"
 
 RDEPEND=">=virtual/zlib-1.2.5.1-r1:=
diff --git a/www-client/links/links-2.30-r2.ebuild b/www-client/links/links-2.30-r2.ebuild
index 32a6bef234e3..bb601397612a 100644
--- a/www-client/links/links-2.30-r2.ebuild
+++ b/www-client/links/links-2.30-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="avif brotli bzip2 fbcon freetype gpm jpeg libevent livecd lzip lzma selinux ssl suid tiff webp X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:="
diff --git a/www-client/lynx/lynx-2.9.0.ebuild b/www-client/lynx/lynx-2.9.0.ebuild
index 7b736f5799fe..ca769179af01 100644
--- a/www-client/lynx/lynx-2.9.0.ebuild
+++ b/www-client/lynx/lynx-2.9.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="brotli bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="
diff --git a/www-client/lynx/lynx-2.9.2.ebuild b/www-client/lynx/lynx-2.9.2.ebuild
index ea8dde76ecdf..e7c6bc72cc5a 100644
--- a/www-client/lynx/lynx-2.9.2.ebuild
+++ b/www-client/lynx/lynx-2.9.2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="brotli bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="
diff --git a/www-client/pybugz/pybugz-0.14.ebuild b/www-client/pybugz/pybugz-0.14.ebuild
index 776d203401f0..98e66d409738 100644
--- a/www-client/pybugz/pybugz-0.14.ebuild
+++ b/www-client/pybugz/pybugz-0.14.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 inherit distutils-r1
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index 04d9e6b42662..eeeecc05db82 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 inherit distutils-r1
diff --git a/www-client/surfraw/surfraw-2.3.0-r3.ebuild b/www-client/surfraw/surfraw-2.3.0-r3.ebuild
index dce5981d052e..2b58bc461b73 100644
--- a/www-client/surfraw/surfraw-2.3.0-r3.ebuild
+++ b/www-client/surfraw/surfraw-2.3.0-r3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.com/surfraw/Surfraw"
 SRC_URI="https://gitlab.com/surfraw/Surfraw/-/archive/${P}/${PN^}-${P}.tar.bz2"
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ~sparc x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/www-client/w3m/w3m-0.5.3_p20230121.ebuild b/www-client/w3m/w3m-0.5.3_p20230121.ebuild
index 95b2e5e4ac93..d5adccda2451 100644
--- a/www-client/w3m/w3m-0.5.3_p20230121.ebuild
+++ b/www-client/w3m/w3m-0.5.3_p20230121.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_p/-git}"
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="fbcon gdk-pixbuf gpm imlib l10n_ja lynxkeymap nls nntp ssl unicode X xface"
 
 REQUIRED_USE="
diff --git a/www-client/w3m/w3m-0.5.3_p20240916.ebuild b/www-client/w3m/w3m-0.5.3_p20240916.ebuild
index 50b432f4f9be..a96625f06641 100644
--- a/www-client/w3m/w3m-0.5.3_p20240916.ebuild
+++ b/www-client/w3m/w3m-0.5.3_p20240916.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/w3m-${COMMIT}"
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="fbcon gdk-pixbuf gpm imlib l10n_ja lynxkeymap nls nntp ssl unicode X xface"
 
 REQUIRED_USE="
diff --git a/www-servers/apache/apache-2.4.65.ebuild b/www-servers/apache/apache-2.4.65.ebuild
index 6e2585452931..ba13c6ee514f 100644
--- a/www-servers/apache/apache-2.4.65.ebuild
+++ b/www-servers/apache/apache-2.4.65.ebuild
@@ -147,7 +147,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="${RDEPEND}"
 
diff --git a/www-servers/apache/apache-2.4.66.ebuild b/www-servers/apache/apache-2.4.66.ebuild
index 76fd06af9157..d92d5175976a 100644
--- a/www-servers/apache/apache-2.4.66.ebuild
+++ b/www-servers/apache/apache-2.4.66.ebuild
@@ -147,7 +147,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 
 DEPEND="${RDEPEND}"
 
diff --git a/www-servers/nginx/nginx-1.26.3-r2.ebuild b/www-servers/nginx/nginx-1.26.3-r2.ebuild
index 13b2a171d5e0..f996ddca7437 100644
--- a/www-servers/nginx/nginx-1.26.3-r2.ebuild
+++ b/www-servers/nginx/nginx-1.26.3-r2.ebuild
@@ -220,7 +220,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/nginx/nginx-1.27.5-r1.ebuild b/www-servers/nginx/nginx-1.27.5-r1.ebuild
index fbf2f192bd3c..01c8df442568 100644
--- a/www-servers/nginx/nginx-1.27.5-r1.ebuild
+++ b/www-servers/nginx/nginx-1.27.5-r1.ebuild
@@ -220,7 +220,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
 	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
diff --git a/www-servers/nginx/nginx-1.28.0-r5.ebuild b/www-servers/nginx/nginx-1.28.0-r5.ebuild
index 1f99b81df43c..130a934e0c01 100644
--- a/www-servers/nginx/nginx-1.28.0-r5.ebuild
+++ b/www-servers/nginx/nginx-1.28.0-r5.ebuild
@@ -27,7 +27,7 @@ NGINX_MISC_FILES=(
 
 inherit nginx
 
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
diff --git a/www-servers/nginx/nginx-1.29.3-r3.ebuild b/www-servers/nginx/nginx-1.29.3-r3.ebuild
index a7c27a668537..302a351bdaeb 100644
--- a/www-servers/nginx/nginx-1.29.3-r3.ebuild
+++ b/www-servers/nginx/nginx-1.29.3-r3.ebuild
@@ -27,7 +27,7 @@ NGINX_MISC_FILES=(
 
 inherit nginx
 
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
diff --git a/www-servers/tomcat/tomcat-10.1.48.ebuild b/www-servers/tomcat/tomcat-10.1.48.ebuild
index ba9574548e59..453b37eba5e8 100644
--- a/www-servers/tomcat/tomcat-10.1.48.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.48.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="10.1"
-KEYWORDS="amd64 ~arm64 ~amd64-linux"
+KEYWORDS="amd64 ~arm64"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-10.1.50.ebuild b/www-servers/tomcat/tomcat-10.1.50.ebuild
index 0aa6f58df4c4..732e18566505 100644
--- a/www-servers/tomcat/tomcat-10.1.50.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.50.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="10.1"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-11.0.13.ebuild b/www-servers/tomcat/tomcat-11.0.13.ebuild
index 75aee543f48a..54a180327d05 100644
--- a/www-servers/tomcat/tomcat-11.0.13.ebuild
+++ b/www-servers/tomcat/tomcat-11.0.13.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="Apache-2.0"
 SLOT="11"
 
-KEYWORDS="amd64 ~arm64 ~amd64-linux"
+KEYWORDS="amd64 ~arm64"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-11.0.15.ebuild b/www-servers/tomcat/tomcat-11.0.15.ebuild
index dfee9a8f2b1a..fc203ce2bd36 100644
--- a/www-servers/tomcat/tomcat-11.0.15.ebuild
+++ b/www-servers/tomcat/tomcat-11.0.15.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="Apache-2.0"
 SLOT="11"
 
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.111.ebuild b/www-servers/tomcat/tomcat-9.0.111.ebuild
index f87310543866..3d13ca5edd99 100644
--- a/www-servers/tomcat/tomcat-9.0.111.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.111.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.113.ebuild b/www-servers/tomcat/tomcat-9.0.113.ebuild
index 9f5520f14ec2..fa1835b2a5e4 100644
--- a/www-servers/tomcat/tomcat-9.0.113.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.113.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/uwsgi/uwsgi-2.0.23-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.23-r1.ebuild
index 4caef4304fe8..ebd7819d04b4 100644
--- a/www-servers/uwsgi/uwsgi-2.0.23-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.23-r1.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 x86"
 
 UWSGI_PLUGINS_STD=(
 	ping cache carbon nagios rpc rrdtool
diff --git a/www-servers/uwsgi/uwsgi-2.0.27-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.27-r1.ebuild
index 693d09280f38..e813b6f564f3 100644
--- a/www-servers/uwsgi/uwsgi-2.0.27-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.27-r1.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 x86"
 
 UWSGI_PLUGINS_STD=(
 	ping cache carbon nagios rpc rrdtool
diff --git a/x11-apps/appres/appres-1.0.7.ebuild b/x11-apps/appres/appres-1.0.7.ebuild
index 58e9da95c3f8..4434ca328b69 100644
--- a/x11-apps/appres/appres-1.0.7.ebuild
+++ b/x11-apps/appres/appres-1.0.7.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="list X application resource database"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.2.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.2.ebuild
index c6f1c7f47eeb..cb7e8b51bbbc 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.2.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X.Org bdftopcf application"
 SRC_URI="https://xorg.freedesktop.org/archive/individual/util/${P}.tar.xz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="x11-base/xorg-proto"
 # RDEPEND=""
diff --git a/x11-apps/iceauth/iceauth-1.0.10.ebuild b/x11-apps/iceauth/iceauth-1.0.10.ebuild
index 54d794b0e92f..6ca59749a5e9 100644
--- a/x11-apps/iceauth/iceauth-1.0.10.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.10.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/ico/ico-1.0.6.ebuild b/x11-apps/ico/ico-1.0.6.ebuild
index 05988261a66c..900a3713ace2 100644
--- a/x11-apps/ico/ico-1.0.6.ebuild
+++ b/x11-apps/ico/ico-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="animate an icosahedron or other polyhedron"
 
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/luit/luit-20240910.ebuild b/x11-apps/luit/luit-20240910.ebuild
index 1fd1407c7633..e9503998bc58 100644
--- a/x11-apps/luit/luit-20240910.ebuild
+++ b/x11-apps/luit/luit-20240910.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="
 	virtual/zlib:=
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index bc08c87d3fff..346c38d6835a 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.xz
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild
index 436d8c7bc4fb..e8745038a410 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	x11-libs/libfontenc
diff --git a/x11-apps/oclock/oclock-1.0.6.ebuild b/x11-apps/oclock/oclock-1.0.6.ebuild
index 972c4f9e5c59..b2b2c872f689 100644
--- a/x11-apps/oclock/oclock-1.0.6.ebuild
+++ b/x11-apps/oclock/oclock-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="round X clock"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/rgb/rgb-1.1.0.ebuild b/x11-apps/rgb/rgb-1.1.0.ebuild
index 102d9170344b..1e34fa970b27 100644
--- a/x11-apps/rgb/rgb-1.1.0.ebuild
+++ b/x11-apps/rgb/rgb-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="x11-misc/util-macros"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.4.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.4.ebuild
index 570a91df0725..6f3b55c31eab 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.4.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="Controls the keyboard layout of a running X server"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 COMMON_DEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/xauth/xauth-1.1.4.ebuild b/x11-apps/xauth/xauth-1.1.4.ebuild
index b955d2e76437..6d1421f39a69 100644
--- a/x11-apps/xauth/xauth-1.1.4.ebuild
+++ b/x11-apps/xauth/xauth-1.1.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="X authority file utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xcalc/xcalc-1.1.2.ebuild b/x11-apps/xcalc/xcalc-1.1.2.ebuild
index f6c4a4943297..dfa519ce43c3 100644
--- a/x11-apps/xcalc/xcalc-1.1.2.ebuild
+++ b/x11-apps/xcalc/xcalc-1.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="scientific calculator for X"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXt
diff --git a/x11-apps/xclock/xclock-1.1.1.ebuild b/x11-apps/xclock/xclock-1.1.1.ebuild
index b7c08a1353b4..f2fe735d5f8d 100644
--- a/x11-apps/xclock/xclock-1.1.1.ebuild
+++ b/x11-apps/xclock/xclock-1.1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="analog / digital clock for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.4.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.4.ebuild
index fa5bd11d4f15..eafbc0a905a4 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.4.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.4.0.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.4.0.ebuild
index fbcccc7c9e67..0968f4c056be 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.4.0.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.4.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-meson
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="dga xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xev/xev-1.2.6.ebuild b/x11-apps/xev/xev-1.2.6.ebuild
index f362c1b8271d..716fa62822ca 100644
--- a/x11-apps/xev/xev-1.2.6.ebuild
+++ b/x11-apps/xev/xev-1.2.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Print contents of X events"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xeyes/xeyes-1.3.1.ebuild b/x11-apps/xeyes/xeyes-1.3.1.ebuild
index faaf91988e5f..da4e7990bfee 100644
--- a/x11-apps/xeyes/xeyes-1.3.1.ebuild
+++ b/x11-apps/xeyes/xeyes-1.3.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-meson
 
 DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=x11-libs/libXi-1.7
diff --git a/x11-apps/xfontsel/xfontsel-1.1.1.ebuild b/x11-apps/xfontsel/xfontsel-1.1.1.ebuild
index f758a68b70d2..c19284d8102c 100644
--- a/x11-apps/xfontsel/xfontsel-1.1.1.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="point and click selection of X11 font names"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xhost/xhost-1.0.10.ebuild b/x11-apps/xhost/xhost-1.0.10.ebuild
index 3f30752edd0b..4c252060ff1a 100644
--- a/x11-apps/xhost/xhost-1.0.10.ebuild
+++ b/x11-apps/xhost/xhost-1.0.10.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="Controls host and/or user access to a running X server"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/xinit/xinit-1.4.4.ebuild b/x11-apps/xinit/xinit-1.4.4.ebuild
index e80ed9274247..e5695be41db1 100644
--- a/x11-apps/xinit/xinit-1.4.4.ebuild
+++ b/x11-apps/xinit/xinit-1.4.4.ebuild
@@ -8,7 +8,7 @@ inherit eapi9-ver xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="twm"
 
 RDEPEND="
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.7.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.7.ebuild
index 6f997845266b..c299b4bfa4ac 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.7.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.7.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="XKB keyboard description compiler"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.9
diff --git a/x11-apps/xkbcomp/xkbcomp-1.5.0-r1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.5.0-r1.ebuild
index 3ab245fa8d1b..76d932b543e8 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.5.0-r1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.5.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-meson
 
 DESCRIPTION="XKB keyboard description compiler"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.9
diff --git a/x11-apps/xkill/xkill-1.0.6.ebuild b/x11-apps/xkill/xkill-1.0.6.ebuild
index 2e05dbda9fb2..203df3415e98 100644
--- a/x11-apps/xkill/xkill-1.0.6.ebuild
+++ b/x11-apps/xkill/xkill-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="kill a client by its X resource"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.8.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.8.ebuild
index 7d049b3f806b..ee1bb4b19299 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.8.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.8.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="X.Org xlsfonts application"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xmessage/xmessage-1.0.7.ebuild b/x11-apps/xmessage/xmessage-1.0.7.ebuild
index 1f84e6317b4c..234929eaa673 100644
--- a/x11-apps/xmessage/xmessage-1.0.7.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.7.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
index acdc63c70b76..eb591e36f44a 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xprop/xprop-1.2.8.ebuild b/x11-apps/xprop/xprop-1.2.8.ebuild
index bda13b4915dc..e9eff7c47145 100644
--- a/x11-apps/xprop/xprop-1.2.8.ebuild
+++ b/x11-apps/xprop/xprop-1.2.8.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="property displayer for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xrandr/xrandr-1.5.3.ebuild b/x11-apps/xrandr/xrandr-1.5.3.ebuild
index a926cffbc121..e7906b34edcd 100644
--- a/x11-apps/xrandr/xrandr-1.5.3.ebuild
+++ b/x11-apps/xrandr/xrandr-1.5.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-3
 
 DESCRIPTION="A primitive command line interface to RandR extension"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=">=x11-libs/libXrandr-1.5
 	x11-libs/libXrender
diff --git a/x11-apps/xrdb/xrdb-1.2.2.ebuild b/x11-apps/xrdb/xrdb-1.2.2.ebuild
index 993920f62684..1a5a856a0496 100644
--- a/x11-apps/xrdb/xrdb-1.2.2.ebuild
+++ b/x11-apps/xrdb/xrdb-1.2.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="X server resource database utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	x11-libs/libXmu
diff --git a/x11-apps/xset/xset-1.2.5.ebuild b/x11-apps/xset/xset-1.2.5.ebuild
index 560ddad536f3..3b07b18a4de9 100644
--- a/x11-apps/xset/xset-1.2.5.ebuild
+++ b/x11-apps/xset/xset-1.2.5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="X.Org xset application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xsetroot/xsetroot-1.1.3.ebuild b/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
index 6466b917e284..3cab7be7e7d8 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xsm/xsm-1.0.6.ebuild b/x11-apps/xsm/xsm-1.0.6.ebuild
index abe71345ed31..c18df9f544a5 100644
--- a/x11-apps/xsm/xsm-1.0.6.ebuild
+++ b/x11-apps/xsm/xsm-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X Session Manager"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
diff --git a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
index 4cc043cfcf76..a2c2d188df8b 100644
--- a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # DEPEND=""
diff --git a/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild
index 01b3abd3abad..8740e7a5a8e7 100644
--- a/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="metapackage"
 SLOT="0"
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 else
 	PROPERTIES+=" live"
 fi
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index e3f327838951..bb70dcade9f1 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="metapackage"
 SLOT="0"
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 else
 	PROPERTIES+=" live"
 fi
diff --git a/x11-base/xorg-proto/xorg-proto-2024.1.ebuild b/x11-base/xorg-proto/xorg-proto-2024.1.ebuild
index a14dfdf7b203..5631f0311fad 100644
--- a/x11-base/xorg-proto/xorg-proto-2024.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2024.1.ebuild
@@ -18,7 +18,7 @@ inherit ${GIT_ECLASS} meson python-any-r1
 DESCRIPTION="X.Org combined protocol headers"
 HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild
index 2568914aaeb5..672caa568b76 100644
--- a/x11-base/xorg-proto/xorg-proto-9999.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild
@@ -18,7 +18,7 @@ inherit ${GIT_ECLASS} meson python-any-r1
 DESCRIPTION="X.Org combined protocol headers"
 HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-server/xorg-server-21.1.20.ebuild b/x11-base/xorg-server/xorg-server-21.1.20.ebuild
index b71fac4c27a2..82633638ac64 100644
--- a/x11-base/xorg-server/xorg-server-21.1.20.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.20.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-server/xorg-server-21.1.21.ebuild b/x11-base/xorg-server/xorg-server-21.1.21.ebuild
index 21ee0d4aad17..79dc75708d78 100644
--- a/x11-base/xorg-server/xorg-server-21.1.21.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.21.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 4ee61e7fc418..50536a7f36ea 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild
index d515880cf193..fa97dcb59de8 100644
--- a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild
+++ b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SGML entities and XML/CSS stylesheets used in X.Org docs"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="x11-misc/util-macros"
 # RDEPEND=""
diff --git a/x11-base/xwayland/xwayland-24.1.9.ebuild b/x11-base/xwayland/xwayland-24.1.9.ebuild
index 0d19234cbd00..449d36d043ba 100644
--- a/x11-base/xwayland/xwayland-24.1.9.ebuild
+++ b/x11-base/xwayland/xwayland-24.1.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index d72df2a354cb..6cdae63f075d 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
index 2262c85bf8c5..6f1db55814aa 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 
 DESCRIPTION="null input driver"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ppc ppc64 ~s390 ~sparc x86"
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.1.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.1.ebuild
index b7d5b31801a8..8f781d41e276 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.1.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.1.ebuild
@@ -6,4 +6,4 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="X.Org driver for dummy cards"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.1.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-2.1.0.ebuild
index 6ba8489e36df..ea1f23340507 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-2.1.0.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-2.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Matrox video driver"
 
-KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~sparc x86"
 
 src_configure() {
 	local XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.13.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.13.0.ebuild
index 2d283cdfd351..8ed60f44b282 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.13.0.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.13.0.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic xorg-3
 
 DESCRIPTION="ATI Rage128 video driver"
 
-KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~sparc x86"
 
 src_configure() {
 	# always use C11 semantics
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index 12b591e829f8..47e7209c55c5 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz"
 
 LICENSE="GPL-2 gpc? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="+gpc sdl static-libs +truetype +X"
 
 # preffer X with enabled xcb, really
diff --git a/x11-libs/cairo/cairo-1.18.4-r1.ebuild b/x11-libs/cairo/cairo-1.18.4-r1.ebuild
index 54f4c19aa42f..fdff2a42274d 100644
--- a/x11-libs/cairo/cairo-1.18.4-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.18.4-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index bcbce5a6c541..aaa8c2d728df 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild
index 4973586aa1ac..9e6af321d72b 100644
--- a/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild
+++ b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/intel/cmrt/archive/refs/tags/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild
index b9b211a1673a..e5395aed0a13 100644
--- a/x11-libs/fltk/fltk-1.3.8.ebuild
+++ b/x11-libs/fltk/fltk-1.3.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 LICENSE="FLTK LGPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-libs/fltk/fltk-1.4.4-r1.ebuild b/x11-libs/fltk/fltk-1.4.4-r1.ebuild
index 7b90cd21638b..a232f9041960 100644
--- a/x11-libs/fltk/fltk-1.4.4-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fltk/fltk/releases/download/release-${PV}/${P}-sourc
 
 LICENSE="FLTK LGPL-2 MIT ZLIB"
 SLOT="1/$(ver_cut 1-2)" # README.abi-version.txt
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+X +cairo +dbus doc examples opengl static-libs test wayland"
 REQUIRED_USE="
 	|| ( X wayland )
diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
index 34a200a2cc3d..0b1ddfb23be5 100644
--- a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
+++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"
 LICENSE="LGPL-2+ MPL-1.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10-r1.ebuild
index 8ee35784377b..a29463e76aed 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="gtk-doc +introspection jpeg test tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild
index aaafc425bcd4..2318e4c7242b 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="gtk-doc +introspection gif jpeg test tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2-r1.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2-r1.ebuild
index f86e57086a6a..9c46fd3bd0fd 100644
--- a/x11-libs/gl2ps/gl2ps-1.4.2-r1.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.4.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://geuz.org/${PN}/src/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="doc png zlib"
 
 RDEPEND="
diff --git a/x11-libs/goffice/goffice-0.10.59-r1.ebuild b/x11-libs/goffice/goffice-0.10.59-r1.ebuild
index b925a0e27d99..816911fcd6e8 100644
--- a/x11-libs/goffice/goffice-0.10.59-r1.ebuild
+++ b/x11-libs/goffice/goffice-0.10.59-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
index a4f1a4be584f..c06ee77ca7f9 100644
--- a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.51.ebuild b/x11-libs/gtk+/gtk+-3.24.51.ebuild
index 24d7be97d335..2c684d518f93 100644
--- a/x11-libs/gtk+/gtk+-3.24.51.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.51.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r5.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r5.ebuild
index 3f7098f5ffdd..4a8c90cb47da 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r5.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild
index 4dfd430810ae..56af8e431545 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11-r4.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r4.ebuild
index 9369d012131d..ca6658103d7e 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11-r4.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.4-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.4-r2.ebuild
index 6b1a3f8e8ce5..de712b9bf4c7 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.8.4-r2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.4-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="4"
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
index 578224c74202..a834abdbe4fe 100644
--- a/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
+++ b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+motif"
 
 RDEPEND="
diff --git a/x11-libs/libICE/libICE-1.1.2.ebuild b/x11-libs/libICE/libICE-1.1.2.ebuild
index 030ca2501695..ed6108ff7e2e 100644
--- a/x11-libs/libICE/libICE-1.1.2.ebuild
+++ b/x11-libs/libICE/libICE-1.1.2.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Inter-Client Exchange library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	elibc_glibc? (
diff --git a/x11-libs/libSM/libSM-1.2.6.ebuild b/x11-libs/libSM/libSM-1.2.6.ebuild
index 388cba80759b..36a35c34a900 100644
--- a/x11-libs/libSM/libSM-1.2.6.ebuild
+++ b/x11-libs/libSM/libSM-1.2.6.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Session Management library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+uuid"
 
 RDEPEND="
diff --git a/x11-libs/libX11/libX11-1.8.12.ebuild b/x11-libs/libX11/libX11-1.8.12.ebuild
index 2765e1457118..f84b32d131b0 100644
--- a/x11-libs/libX11/libX11-1.8.12.ebuild
+++ b/x11-libs/libX11/libX11-1.8.12.ebuild
@@ -10,7 +10,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.5.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.5.ebuild
index 5877c6396d6a..62af3eb60142 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.5.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.5.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-meson
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXau/libXau-1.0.12.ebuild b/x11-libs/libXau/libXau-1.0.12.ebuild
index 1176165cd428..ce6fbb15b5e0 100644
--- a/x11-libs/libXau/libXau-1.0.12.ebuild
+++ b/x11-libs/libXau/libXau-1.0.12.ebuild
@@ -9,6 +9,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/libXaw-1.0.16.ebuild b/x11-libs/libXaw/libXaw-1.0.16.ebuild
index 0610b65fbdfc..2c8b5c7a5899 100644
--- a/x11-libs/libXaw/libXaw-1.0.16.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.16.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="deprecated"
 
 RDEPEND="
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild
index 0ff19fc47086..03da84e9b82f 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="X.Org Xaw3d library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="xpm"
 
 RDEPEND="
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild
index 06b9cb379a97..3a2c5fee37b9 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xcomposite library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libXcursor/libXcursor-1.2.3.ebuild b/x11-libs/libXcursor/libXcursor-1.2.3.ebuild
index c2ea43713528..333b683f2563 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.3.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X.Org Xcursor library"
 LICENSE="HPND"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/libXdamage-1.1.6.ebuild b/x11-libs/libXdamage/libXdamage-1.1.6.ebuild
index f13024941239..8b994e3204ce 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.6.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.6.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xdamage library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild
index d57582e04d22..05715ebf9253 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	elibc_glibc? (
diff --git a/x11-libs/libXext/libXext-1.3.6.ebuild b/x11-libs/libXext/libXext-1.3.6.ebuild
index b3246603054e..e409e321b9a8 100644
--- a/x11-libs/libXext/libXext-1.3.6.ebuild
+++ b/x11-libs/libXext/libXext-1.3.6.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libXfixes/libXfixes-6.0.2.ebuild b/x11-libs/libXfixes/libXfixes-6.0.2.ebuild
index ce76d72ba0d1..97dfc9d546b3 100644
--- a/x11-libs/libXfixes/libXfixes-6.0.2.ebuild
+++ b/x11-libs/libXfixes/libXfixes-6.0.2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-meson
 
 DESCRIPTION="X.Org Xfixes library"
 LICENSE="HPND MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
index 8ced849e6541..227385880fdc 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="bzip2 truetype"
 
 RDEPEND="virtual/zlib:=
diff --git a/x11-libs/libXft/libXft-2.3.9.ebuild b/x11-libs/libXft/libXft-2.3.9.ebuild
index 3c838c3ce2a7..7c875f5f6a79 100644
--- a/x11-libs/libXft/libXft-2.3.9.ebuild
+++ b/x11-libs/libXft/libXft-2.3.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xft library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/libXi-1.8.2.ebuild b/x11-libs/libXi/libXi-1.8.2.ebuild
index 2a64dcf16803..8b3ac3079160 100644
--- a/x11-libs/libXi/libXi-1.8.2.ebuild
+++ b/x11-libs/libXi/libXi-1.8.2.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
index 44bf2a82cea7..daf7b8329374 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/libXmu-1.2.1.ebuild b/x11-libs/libXmu/libXmu-1.2.1.ebuild
index 1a22579afdf6..f264e4eefd39 100644
--- a/x11-libs/libXmu/libXmu-1.2.1.ebuild
+++ b/x11-libs/libXmu/libXmu-1.2.1.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xmu library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXpm/libXpm-3.5.17.ebuild b/x11-libs/libXpm/libXpm-3.5.17.ebuild
index d6e0739eb473..52d9c8ad3b6a 100644
--- a/x11-libs/libXpm/libXpm-3.5.17.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.17.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xpm library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXpresent/libXpresent-1.0.2.ebuild b/x11-libs/libXpresent/libXpresent-1.0.2.ebuild
index 1333904e8586..85152ad890af 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.2.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-meson
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrandr/libXrandr-1.5.4.ebuild b/x11-libs/libXrandr/libXrandr-1.5.4.ebuild
index 69c849a4ec13..99748d605911 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.4.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrandr library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXrender/libXrender-0.9.12.ebuild b/x11-libs/libXrender/libXrender-0.9.12.ebuild
index 02b0d215ef13..a62014aa4d74 100644
--- a/x11-libs/libXrender/libXrender-0.9.12.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXres/libXres-1.2.3.ebuild b/x11-libs/libXres/libXres-1.2.3.ebuild
index 585dae965b36..765b47acc7a2 100644
--- a/x11-libs/libXres/libXres-1.2.3.ebuild
+++ b/x11-libs/libXres/libXres-1.2.3.ebuild
@@ -7,7 +7,7 @@ XORG_DOC=doc
 inherit xorg-meson
 
 DESCRIPTION="X.Org XRes library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
diff --git a/x11-libs/libXt/libXt-1.3.1-r1.ebuild b/x11-libs/libXt/libXt-1.3.1-r1.ebuild
index 585258af0acd..40852a8fb7bf 100644
--- a/x11-libs/libXt/libXt-1.3.1-r1.ebuild
+++ b/x11-libs/libXt/libXt-1.3.1-r1.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXtst/libXtst-1.2.5.ebuild b/x11-libs/libXtst/libXtst-1.2.5.ebuild
index c640602668dd..29635bb08515 100644
--- a/x11-libs/libXtst/libXtst-1.2.5.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXv/libXv-1.0.13.ebuild b/x11-libs/libXv/libXv-1.0.13.ebuild
index 83f6a3afb706..91e44cab63a3 100644
--- a/x11-libs/libXv/libXv-1.0.13.ebuild
+++ b/x11-libs/libXv/libXv-1.0.13.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xv library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXvMC/libXvMC-1.0.14.ebuild b/x11-libs/libXvMC/libXvMC-1.0.14.ebuild
index b072fdbe68a0..22b5e63273db 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.14.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.14.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3 meson-multilib
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild
index 14fc83982ff3..46806c4262c6 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86dga library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild
index 42f1667fdfd8..4efd8bbe8808 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/libdrm-2.4.127.ebuild b/x11-libs/libdrm/libdrm-2.4.127.ebuild
index 27758936bd91..2a95300854bd 100644
--- a/x11-libs/libdrm/libdrm-2.4.127.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.127.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.130.ebuild b/x11-libs/libdrm/libdrm-2.4.130.ebuild
index 2c9fc648c342..420a12f7072d 100644
--- a/x11-libs/libdrm/libdrm-2.4.130.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.130.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.131.ebuild b/x11-libs/libdrm/libdrm-2.4.131.ebuild
index 2c9fc648c342..420a12f7072d 100644
--- a/x11-libs/libdrm/libdrm-2.4.131.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.131.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 2c9fc648c342..420a12f7072d 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
index 533ed1bde147..db68870254c7 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2"
diff --git a/x11-libs/libfm/libfm-1.3.2-r1.ebuild b/x11-libs/libfm/libfm-1.3.2-r1.ebuild
index a7a8cf69eb63..ff7080ab6923 100644
--- a/x11-libs/libfm/libfm-1.3.2-r1.ebuild
+++ b/x11-libs/libfm/libfm-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+automount debug doc examples exif gtk udisks vala"
 
 REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
diff --git a/x11-libs/libfontenc/libfontenc-1.1.8.ebuild b/x11-libs/libfontenc/libfontenc-1.1.8.ebuild
index e2d7659dec3a..d60c36b3dede 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.8.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="virtual/zlib:="
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libnotify/libnotify-0.8.6.ebuild b/x11-libs/libnotify/libnotify-0.8.6.ebuild
index caf5fafc4549..cb8d6e1ef43c 100644
--- a/x11-libs/libnotify/libnotify-0.8.6.ebuild
+++ b/x11-libs/libnotify/libnotify-0.8.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +introspection test"
 # https://gitlab.gnome.org/GNOME/libnotify/-/issues/30
 # https://gitlab.gnome.org/GNOME/libnotify/-/issues/59
diff --git a/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild
index d2b570ae715e..45525cde55ba 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3 meson-multilib
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="zlib"
 
 DEPEND="
diff --git a/x11-libs/libwnck/libwnck-43.2.ebuild b/x11-libs/libwnck/libwnck-43.2.ebuild
index 4fa31c9213a5..6c692afa1426 100644
--- a/x11-libs/libwnck/libwnck-43.2.ebuild
+++ b/x11-libs/libwnck/libwnck-43.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 
 IUSE="gtk-doc +introspection startup-notification tools"
 
diff --git a/x11-libs/libwnck/libwnck-43.3.ebuild b/x11-libs/libwnck/libwnck-43.3.ebuild
index 4fa31c9213a5..6c692afa1426 100644
--- a/x11-libs/libwnck/libwnck-43.3.ebuild
+++ b/x11-libs/libwnck/libwnck-43.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 
 IUSE="gtk-doc +introspection startup-notification tools"
 
diff --git a/x11-libs/libxcb/libxcb-1.17.0.ebuild b/x11-libs/libxcb/libxcb-1.17.0.ebuild
index f08b1b136478..3e1c2786df2d 100644
--- a/x11-libs/libxcb/libxcb-1.17.0.ebuild
+++ b/x11-libs/libxcb/libxcb-1.17.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="X C-language Bindings library"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
 
 SLOT="0/1.12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc selinux test +xkb"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild
index 470ecfef9385..dde35a391865 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libxklavier/libxklavier-5.4-r1.ebuild b/x11-libs/libxklavier/libxklavier-5.4-r1.ebuild
index d875635e9887..46a367476d19 100644
--- a/x11-libs/libxklavier/libxklavier-5.4-r1.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild
index 86b3a2be726b..284365cb39a1 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild
@@ -8,6 +8,6 @@ inherit xorg-3
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/motif/motif-2.3.8-r6.ebuild b/x11-libs/motif/motif-2.3.8-r6.ebuild
index 0fb32a4a1ef7..2b682d5622c6 100644
--- a/x11-libs/motif/motif-2.3.8-r6.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/motif/Motif%20${PV}%20Source%
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="examples jpeg png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r5.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r5.ebuild
index 9a57811c5a0c..e7b4919f7251 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r5.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	x11-libs/libICE
diff --git a/x11-libs/pixman/pixman-0.46.4.ebuild b/x11-libs/pixman/pixman-0.46.4.ebuild
index f182fdc3e334..9b8de6541b4c 100644
--- a/x11-libs/pixman/pixman-0.46.4.ebuild
+++ b/x11-libs/pixman/pixman-0.46.4.ebuild
@@ -14,7 +14,7 @@ inherit flag-o-matic ${GIT_ECLASS} meson-multilib multiprocessing toolchain-func
 DESCRIPTION="Low-level pixel manipulation routines"
 HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index c3eed0a5c98f..63c42b82ce0c 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -14,7 +14,7 @@ inherit flag-o-matic ${GIT_ECLASS} meson-multilib multiprocessing toolchain-func
 DESCRIPTION="Low-level pixel manipulation routines"
 HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/qwt/qwt-6.2.0-r4.ebuild b/x11-libs/qwt/qwt-6.2.0-r4.ebuild
index 164f002c3ea9..68ff9221ac21 100644
--- a/x11-libs/qwt/qwt-6.2.0-r4.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz
 
 LICENSE="qwt"
 SLOT="6/2.0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86"
 IUSE="designer doc examples opengl polar +qt5 qt6 svg"
 REQUIRED_USE="|| ( qt5 qt6 )"
 
diff --git a/x11-libs/qwt/qwt-6.3.0.ebuild b/x11-libs/qwt/qwt-6.3.0.ebuild
index 5d83680c3840..dc255b36bb86 100644
--- a/x11-libs/qwt/qwt-6.3.0.ebuild
+++ b/x11-libs/qwt/qwt-6.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz
 
 LICENSE="qwt"
 SLOT="6/3.0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc examples opengl polar svg"
 
 # tests require package to be already installed
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r2.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r2.ebuild
index f200fea688cd..2b4f93c1b60f 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r2.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 RESTRICT="test" # no tests
 
 RDEPEND=">=x11-libs/libX11-1.4.3
diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild
index d9f7a5a5392c..f3490854f378 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/wxWidgets-${PV}"
 
 LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
 SLOT="${WXRELEASE}/3.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X"
 REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )"
 RESTRICT="!test? ( test )"
diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.1.ebuild
index 251067d307d8..1b7899201268 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.8.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.8.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/wxWidgets-${PV}"
 
 LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
 SLOT="${WXRELEASE}/3.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X"
 REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )"
 RESTRICT="!test? ( test )"
diff --git a/x11-libs/xbae/xbae-4.60.4-r1.ebuild b/x11-libs/xbae/xbae-4.60.4-r1.ebuild
index 527e1da0c9db..062ea62b3f67 100644
--- a/x11-libs/xbae/xbae-4.60.4-r1.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="doc examples"
 # tests need X display
 # and are interactive so virtualx will not help
diff --git a/x11-libs/xbae/xbae-4.60.4-r2.ebuild b/x11-libs/xbae/xbae-4.60.4-r2.ebuild
index a0169ab95e75..e1a29ac0b378 100644
--- a/x11-libs/xbae/xbae-4.60.4-r2.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="doc examples"
 # tests need X display
 # and are interactive so virtualx will not help
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild
index b081f2c1a077..764ded24ff0f 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.6.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.6.ebuild
index b081f2c1a077..764ded24ff0f 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.6.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.6.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
index 0162979ec851..616ac14acfc1 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-0.4:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
index 118cb8488db0..855538a36a86 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
index 6eee54535bdf..b0db1dcdbaec 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
index 95781d038cd2..b6dd4543e7d3 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util/xcb-util-0.4.1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.1.ebuild
index 9d0283393376..8e8a4a17af38 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.1.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xforms/xforms-1.2.4-r1.ebuild b/x11-libs/xforms/xforms-1.2.4-r1.ebuild
index 580af7cb1f67..628c264b748d 100644
--- a/x11-libs/xforms/xforms-1.2.4-r1.ebuild
+++ b/x11-libs/xforms/xforms-1.2.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc opengl"
 
 RDEPEND="
diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild
index 984f56d2241d..c2b3aef367e5 100644
--- a/x11-libs/xpa/xpa-2.1.18.ebuild
+++ b/x11-libs/xpa/xpa-2.1.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/xtrans/xtrans-1.6.0.ebuild b/x11-libs/xtrans/xtrans-1.6.0.ebuild
index cfd9af69aa62..24043e3d8b90 100644
--- a/x11-libs/xtrans/xtrans-1.6.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.6.0.ebuild
@@ -9,7 +9,7 @@ XORG_DOC=doc
 inherit xorg-3
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 src_configure() {
 	local XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-misc/compose-tables/compose-tables-1.8.12.ebuild b/x11-misc/compose-tables/compose-tables-1.8.12.ebuild
index dfaba2de5d95..3fb58a25f4d7 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.12.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.12.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/copyq/copyq-13.0.0.ebuild b/x11-misc/copyq/copyq-13.0.0.ebuild
index 2a6d1f40d7da..ee099007c192 100644
--- a/x11-misc/copyq/copyq-13.0.0.ebuild
+++ b/x11-misc/copyq/copyq-13.0.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/CopyQ-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="notification test X"
 
 RESTRICT="!test? ( test )"
diff --git a/x11-misc/devilspie/devilspie-0.23-r2.ebuild b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
index 301f7cb7b8d0..b38c5b76bee3 100644
--- a/x11-misc/devilspie/devilspie-0.23-r2.ebuild
+++ b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.burtonini.com/computing/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/dex/dex-0.10.1.ebuild b/x11-misc/dex/dex-0.10.1.ebuild
index 2546734768ab..68a7d444aaf3 100644
--- a/x11-misc/dex/dex-0.10.1.ebuild
+++ b/x11-misc/dex/dex-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jceb/dex/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # https://github.com/jceb/dex/issues/37
diff --git a/x11-misc/dex/dex-0.9.0.ebuild b/x11-misc/dex/dex-0.9.0.ebuild
index 43d7d3926076..16e6626d371f 100644
--- a/x11-misc/dex/dex-0.9.0.ebuild
+++ b/x11-misc/dex/dex-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # https://github.com/jceb/dex/issues/37
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
index 928ca8c65d34..57644e023213 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
index 36bafb0ed9cb..b31654d37b1f 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~riscv x86"
 
 RDEPEND=">=media-libs/imlib2-1.0.6.2003[X]
 	x11-libs/libX11
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild
index 6246e4e970cc..da988955ee77 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-misc/imake/imake-1.0.10.ebuild b/x11-misc/imake/imake-1.0.10.ebuild
index c2affd486de9..87b90693b520 100644
--- a/x11-misc/imake/imake-1.0.10.ebuild
+++ b/x11-misc/imake/imake-1.0.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="x11-misc/xorg-cf-files"
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/makedepend/makedepend-1.0.9.ebuild b/x11-misc/makedepend/makedepend-1.0.9.ebuild
index 319815f18875..9b49e6c49da7 100644
--- a/x11-misc/makedepend/makedepend-1.0.9.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.9.ebuild
@@ -6,4 +6,4 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
index 96fb7576ad3f..32b8c0405ebb 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/x11-misc/obconf/obconf-2.0.4_p20150213-r2.ebuild b/x11-misc/obconf/obconf-2.0.4_p20150213-r2.ebuild
index 2241558c5bf7..40409afba602 100644
--- a/x11-misc/obconf/obconf-2.0.4_p20150213-r2.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4_p20150213-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${HASH_OBCONF::7}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.4-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.4-r2.ebuild
index 7d765318ce1c..cb2ef9cedc2a 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.4-r2.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.4-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDG
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.4-r3.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.4-r3.ebuild
index f6d0b3e15933..db9144bedde5 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.4-r3.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.4-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDG
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/util-macros/util-macros-1.20.2.ebuild b/x11-misc/util-macros/util-macros-1.20.2.ebuild
index ee44fb20b0f8..5290f9f8f852 100644
--- a/x11-misc/util-macros/util-macros-1.20.2.ebuild
+++ b/x11-misc/util-macros/util-macros-1.20.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
index 00a94c207920..bcf3296a2424 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/x11vnc/x11vnc-0.9.17.ebuild b/x11-misc/x11vnc/x11vnc-0.9.17.ebuild
index 138d7f72187b..eb46cc7cd042 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.17.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="crypt drm fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xaos/xaos-4.3.3.ebuild b/x11-misc/xaos/xaos-4.3.3.ebuild
index f9c154858345..93be7f123d64 100644
--- a/x11-misc/xaos/xaos-4.3.3.ebuild
+++ b/x11-misc/xaos/xaos-4.3.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/XaoS-release-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="dev-qt/qtbase:6[gui,widgets]"
 DEPEND="${RDEPEND}"
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r100.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r100.ebuild
index c5feffeb0249..66a059e3920d 100644
--- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r100.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r100.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86"
 IUSE="guile tk"
 
 REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} )"
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
index d39dcf0d5ff1..110935725e32 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
@@ -7,7 +7,7 @@ XORG_MODULE=data/
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/xcape/xcape-1.2-r1.ebuild b/x11-misc/xcape/xcape-1.2-r1.ebuild
index 8b524c8c6a55..c6f4fb9b2a2c 100644
--- a/x11-misc/xcape/xcape-1.2-r1.ebuild
+++ b/x11-misc/xcape/xcape-1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/alols/xcape/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index 2830b9899ab9..e069bbfe56a1 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild
index 18c221504e3c..0ff581a2766c 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.14.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.14.ebuild
index 3d9be0c6eb7b..968d52f8673b 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.14.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.14.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
index 1222bc78dfbd..bb845e6e1ca3 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gtk"
 
 BDEPEND="app-text/docbook-xml-dtd:4.3
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r9.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r9.ebuild
index 2ffd4090f80e..9200eab60a5d 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r9.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r9.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
 IUSE="dbus doc gnome perl plasma X"
 REQUIRED_USE="gnome? ( dbus )"
 
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index 22bdac1cd667..2897365edb2e 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	media-libs/imlib2[X]
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild
index 4f4eab60ba2b..8f6d70371c74 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 72afa28b4676..3c0fd7400364 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.9.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.9.ebuild
index bdeb5095689a..3c599a282bd6 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.9.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/x11-misc/xscreensaver/xscreensaver-6.10.1-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.10.1-r2.ebuild
index 8e38623d92f0..97167cc27b9a 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.10.1-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.10.1-r2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="elogind ffmpeg fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.12-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.12-r1.ebuild
index 5481dca01ada..7291d6fcde4c 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.12-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.12-r1.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="elogind ffmpeg fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama wayland"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild
index f9020b127a9c..594878cf1553 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="elogind ffmpeg fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking logind-idle-hint new-login offensive pam +perl +png selinux suid systemd xinerama wayland"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xsel/xsel-1.2.0-r2.ebuild b/x11-misc/xsel/xsel-1.2.0-r2.ebuild
index 08534e5dd72c..0eda90764435 100644
--- a/x11-misc/xsel/xsel-1.2.0-r2.ebuild
+++ b/x11-misc/xsel/xsel-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xsel/xsel-1.2.1.ebuild b/x11-misc/xsel/xsel-1.2.1.ebuild
index 41d865b62466..adfd34b42c00 100644
--- a/x11-misc/xsel/xsel-1.2.1.ebuild
+++ b/x11-misc/xsel/xsel-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kfish/xsel/archive/refs/tags/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild
index cdc4a35235c8..b43595c404a3 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc x86"
 
 COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
diff --git a/x11-plugins/asclock/asclock-2.0.12-r5.ebuild b/x11-plugins/asclock/asclock-2.0.12-r5.ebuild
index 8c0c2e039910..a01aa5d5926f 100644
--- a/x11-plugins/asclock/asclock-2.0.12-r5.ebuild
+++ b/x11-plugins/asclock/asclock-2.0.12-r5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/asclock-xlib"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~mips ppc ~sparc x86 ~x64-solaris"
 
 DEPEND="
 	x11-libs/libX11
diff --git a/x11-plugins/bfm/bfm-0.6.4-r4.ebuild b/x11-plugins/bfm/bfm-0.6.4-r4.ebuild
index 9e1bdbf76da7..357bad863c65 100644
--- a/x11-plugins/bfm/bfm-0.6.4-r4.ebuild
+++ b/x11-plugins/bfm/bfm-0.6.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JNRowe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="gkrellm"
 
 RDEPEND="
diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
index ba410ab76f8e..b6fef506ab66 100644
--- a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
+++ b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}-dockapp-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ppc ~sparc x86 ~x64-solaris"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
index b236d829259a..6b99ff3ffd86 100644
--- a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
+++ b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://hules.free.fr/wmforkplop/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
 
 DEPEND="gnome-base/libgtop
 	media-libs/imlib2[X,text(+)]"
diff --git a/x11-plugins/wmload/wmload-0.9.7-r1.ebuild b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
index e3639a64a47a..e8ea69f767fa 100644
--- a/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc ~sparc x86 ~x64-solaris"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild b/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
index 7080166ba275..f6224fb016a2 100644
--- a/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.thregr.org/~wavexx/software/wmnd/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc x86 ~x64-solaris"
 IUSE="snmp"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmnd/wmnd-0.4.18.ebuild b/x11-plugins/wmnd/wmnd-0.4.18.ebuild
index 8e979f7edf58..31de79de4d3f 100644
--- a/x11-plugins/wmnd/wmnd-0.4.18.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.thregr.org/~wavexx/software/wmnd/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc x86 ~x64-solaris"
 IUSE="snmp"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-terms/kterm/kterm-6.2.0-r7.ebuild b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
index 6a1e1fa8689d..8f12a291430a 100644
--- a/x11-terms/kterm/kterm-6.2.0-r7.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="MIT HPND XC"
 SLOT="0"
-KEYWORDS="-alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-alpha amd64 ~ppc ~sparc x86"
 IUSE="Xaw3d"
 
 RDEPEND="
diff --git a/x11-terms/sakura/sakura-3.8.9.ebuild b/x11-terms/sakura/sakura-3.8.9.ebuild
index 5b682b8c20c9..e2eda6c56ea2 100644
--- a/x11-terms/sakura/sakura-3.8.9.ebuild
+++ b/x11-terms/sakura/sakura-3.8.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/sakura/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~x86-linux"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40:2
diff --git a/x11-terms/tilda/tilda-1.5.4.ebuild b/x11-terms/tilda/tilda-1.5.4.ebuild
index 5193c1828760..be4b2d917a01 100644
--- a/x11-terms/tilda/tilda-1.5.4.ebuild
+++ b/x11-terms/tilda/tilda-1.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="x11-libs/vte:2.91
 	>=dev-libs/glib-2.8.4:2
diff --git a/x11-terms/tilda/tilda-2.0.0.ebuild b/x11-terms/tilda/tilda-2.0.0.ebuild
index 22d434008eb4..c1e042f48cae 100644
--- a/x11-terms/tilda/tilda-2.0.0.ebuild
+++ b/x11-terms/tilda/tilda-2.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="x11-libs/vte:2.91
 	>=dev-libs/glib-2.8.4:2
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.4.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.4.ebuild
index 8c6e82b3415b..1fce44acd656 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.4.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="utempter wayland X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.5.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.5.ebuild
index f9c0c83ba406..93acc4d79426 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.5.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="utempter wayland X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/x11-terms/xterm/xterm-401.ebuild b/x11-terms/xterm/xterm-401.ebuild
index 5215cdf469e3..6811f84fcb88 100644
--- a/x11-terms/xterm/xterm-401.ebuild
+++ b/x11-terms/xterm/xterm-401.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
diff --git a/x11-terms/xterm/xterm-402.ebuild b/x11-terms/xterm/xterm-402.ebuild
index e28d9211d268..ceba7bb29cd1 100644
--- a/x11-terms/xterm/xterm-402.ebuild
+++ b/x11-terms/xterm/xterm-402.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
diff --git a/x11-terms/xterm/xterm-403.ebuild b/x11-terms/xterm/xterm-403.ebuild
index e28d9211d268..ceba7bb29cd1 100644
--- a/x11-terms/xterm/xterm-403.ebuild
+++ b/x11-terms/xterm/xterm-403.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
diff --git a/x11-terms/xterm/xterm-404.ebuild b/x11-terms/xterm/xterm-404.ebuild
index e28d9211d268..ceba7bb29cd1 100644
--- a/x11-terms/xterm/xterm-404.ebuild
+++ b/x11-terms/xterm/xterm-404.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
diff --git a/x11-terms/xterm/xterm-405.ebuild b/x11-terms/xterm/xterm-405.ebuild
index e28d9211d268..ceba7bb29cd1 100644
--- a/x11-terms/xterm/xterm-405.ebuild
+++ b/x11-terms/xterm/xterm-405.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
diff --git a/x11-themes/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy-46.2.ebuild b/x11-themes/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy-46.2.ebuild
index 774e5103034e..ea3e7f3a19bd 100644
--- a/x11-themes/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy-46.2.ebuild
+++ b/x11-themes/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy-46.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
index 27d8148b936d..c202a441e2ff 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-47.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-47.0.ebuild
index 607b5bd9f42e..fe8941d606bd 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-47.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-47.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 	branding? ( CC-BY-SA-4.0 )
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="branding"
 
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-48.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-48.1.ebuild
index ed0cc16b742d..ec25aae54b25 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-48.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-48.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 	branding? ( CC-BY-SA-4.0 )
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE="branding"
 
diff --git a/x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild b/x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild
index 7a28ba00ba05..16384a134ffb 100644
--- a/x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild
+++ b/x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/horst3180/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x64-solaris"
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
 
diff --git a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0-r1.ebuild b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0-r1.ebuild
index 5d4c9aa6436f..b3645602d8e1 100644
--- a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0-r1.ebuild
+++ b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
 
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28-r1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28-r1.ebuild
index 83b5682e280d..0a8fa51682b3 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28-r1.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 # Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
 # their default background image
diff --git a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild
index 5669b80482ff..183716e6bf8d 100644
--- a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild
+++ b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://plasmasturm.org/programs/gtk-chtheme/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28-r1.ebuild b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28-r1.ebuild
index 9d670b3c09c7..7acf8b7cb29d 100644
--- a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28-r1.ebuild
+++ b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 DEPEND="
 	>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild b/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
index 9a26cfb26780..1912a23522d4 100644
--- a/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
+++ b/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/candido.berlios/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild b/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
index c95e01d453be..272886017d35 100644
--- a/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
+++ b/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://benjamin.sipsolutions.net/experience/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r3.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r3.ebuild
index 37553df41dba..75958f29b0c0 100644
--- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r3.ebuild
+++ b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://tracker.debian.org/pkg/gtk2-engines-murrine"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="+themes animation-rtl"
 
 RDEPEND=">=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r2.ebuild b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r2.ebuild
index 6d3b74b1a09a..7b9c80819a62 100644
--- a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r2.ebuild
+++ b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/rezlooks-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6.1.ebuild b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6.1.ebuild
index 341bd08d4270..867f35ce94a5 100644
--- a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6.1.ebuild
+++ b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/rezlooks-gtk-engine-"${PV}"/rezlooks
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
index 863d255c02ca..d5081a81286f 100644
--- a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
+++ b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r101.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r101.ebuild
index 67b93a7e6fb5..005cc9a62a41 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r101.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r101.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="accessibility lua"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r102.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r102.ebuild
index 554cc17e311c..14f185822e33 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r102.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r102.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="accessibility lua"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
diff --git a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
index dd61836057f6..1e1aaac92a96 100644
--- a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
+++ b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
index c723956c015a..cda8d3aa5e7a 100644
--- a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
+++ b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://icon-theme.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="app-arch/xz-utils"
 
diff --git a/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8-r1.ebuild b/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8-r1.ebuild
index 96c483586459..27b975d39300 100644
--- a/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8-r1.ebuild
+++ b/x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://people.freedesktop.org/~mccann/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2 CC-BY-3.0 CC-BY-SA-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	>=dev-util/intltool-0.40
diff --git a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild
index b0ffb6c5c348..caa984ca374f 100644
--- a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild
+++ b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~x64-solaris"
 IUSE="png"
 RESTRICT="binchecks strip"
 
diff --git a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild
index 8d11cf776288..3e9f07d2aa0f 100644
--- a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild
+++ b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-solaris"
 IUSE="minimal png"
 RESTRICT="binchecks strip"
 
diff --git a/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506-r1.ebuild b/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506-r1.ebuild
index 079f73c51e07..8cea6d9feed0 100644
--- a/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506-r1.ebuild
+++ b/x11-themes/vertex-icon-theme/vertex-icon-theme-20150506-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
 
 LICENSE="|| ( GPL-3 GPL-2 LGPL-3 CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x64-solaris"
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
 
diff --git a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r2.ebuild b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r2.ebuild
index da9f25522752..76fd8931699f 100644
--- a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r2.ebuild
+++ b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/art/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
 RESTRICT="binchecks strip"
 
 RDEPEND=">=xfce-base/xfwm4-4.10"
diff --git a/x11-wm/evilwm/evilwm-1.4.2.ebuild b/x11-wm/evilwm/evilwm-1.4.2.ebuild
index 9f5fb2754286..58ea0fd04962 100644
--- a/x11-wm/evilwm/evilwm-1.4.2.ebuild
+++ b/x11-wm/evilwm/evilwm-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.6809.org.uk/evilwm/${P}.tar.gz"
 
 LICENSE="MIT 9wm"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libXrandr
diff --git a/x11-wm/evilwm/evilwm-1.4.3.ebuild b/x11-wm/evilwm/evilwm-1.4.3.ebuild
index 32cf0f061b35..23e399452373 100644
--- a/x11-wm/evilwm/evilwm-1.4.3.ebuild
+++ b/x11-wm/evilwm/evilwm-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.6809.org.uk/evilwm/dl/${P}.tar.gz"
 
 LICENSE="MIT 9wm"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libXrandr
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild
index 5a70c0b70afd..c7bbcab75ddb 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/fluxbox/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="nls xinerama bidi +truetype +imlib +slit +systray test +toolbar vim-syntax"
 REQUIRED_USE="systray? ( toolbar )"
 # Tests are all manual and throw an exception on launch.
diff --git a/x11-wm/openbox/openbox-3.6.1-r11.ebuild b/x11-wm/openbox/openbox-3.6.1-r11.ebuild
index 138873004c18..7e7118f10d96 100644
--- a/x11-wm/openbox/openbox-3.6.1-r11.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r11.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Mikachu/openbox.git"
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 49def4305977..620b0cf719f2 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Mikachu/openbox.git"
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild
index 5a548bdf096a..c987afef9877 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ FDL-1.2+ )"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="debug emacs +history sloppy +xft +xrandr"
 
 RDEPEND="
diff --git a/x11-wm/twm/twm-1.0.13.1.ebuild b/x11-wm/twm/twm-1.0.13.1.ebuild
index 996d628ad4ce..aa3533128fb6 100644
--- a/x11-wm/twm/twm-1.0.13.1.ebuild
+++ b/x11-wm/twm/twm-1.0.13.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 COMMON_DEPEND="
 	x11-libs/libICE
diff --git a/x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild
index 5998ae0b5327..a131861f54fe 100644
--- a/x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild
@@ -18,7 +18,7 @@ else
 		https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
 	"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-solaris"
 fi
 
 # WRASTER_CURRENT-WRASTER_AGE.WINGS_CURRENT-WINGS_AGE.WUTIL_CURRENT-WUTIL_AGE from configure.ac
diff --git a/x11-wm/windowmaker/windowmaker-0.96.0.ebuild b/x11-wm/windowmaker/windowmaker-0.96.0.ebuild
index 32e1761c6f1c..14ea8ab08cdc 100644
--- a/x11-wm/windowmaker/windowmaker-0.96.0.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.96.0.ebuild
@@ -13,7 +13,7 @@ https://github.com/window-maker/wmaker/releases/download/wmaker-${PV}/${P/window
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 5998ae0b5327..a131861f54fe 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -18,7 +18,7 @@ else
 		https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
 	"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-solaris"
 fi
 
 # WRASTER_CURRENT-WRASTER_AGE.WINGS_CURRENT-WINGS_AGE.WUTIL_CURRENT-WUTIL_AGE from configure.ac
diff --git a/xfce-base/exo/exo-4.20.0-r1.ebuild b/xfce-base/exo/exo-4.20.0-r1.ebuild
index 6635e2840c61..0f275fa4e462 100644
--- a/xfce-base/exo/exo-4.20.0-r1.ebuild
+++ b/xfce-base/exo/exo-4.20.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="wayland X"
 
 DEPEND="
diff --git a/xfce-base/exo/exo-4.21.0-r1.ebuild b/xfce-base/exo/exo-4.21.0-r1.ebuild
index 21d725c8c29b..63f3ab99a250 100644
--- a/xfce-base/exo/exo-4.21.0-r1.ebuild
+++ b/xfce-base/exo/exo-4.21.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-solaris"
 IUSE="wayland X"
 
 DEPEND="
diff --git a/xfce-base/garcon/garcon-4.20.0.ebuild b/xfce-base/garcon/garcon-4.20.0.ebuild
index e7765f760a95..872acce83baf 100644
--- a/xfce-base/garcon/garcon-4.20.0.ebuild
+++ b/xfce-base/garcon/garcon-4.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="introspection"
 
 DEPEND="
diff --git a/xfce-base/garcon/garcon-4.21.0.ebuild b/xfce-base/garcon/garcon-4.21.0.ebuild
index 251f6921cbf2..6fff0cf4b8b5 100644
--- a/xfce-base/garcon/garcon-4.21.0.ebuild
+++ b/xfce-base/garcon/garcon-4.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.20.2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.20.2.ebuild
index 2286760093bc..a5260e9c5f50 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.20.2.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.20.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="glade +introspection startup-notification system-info vala wayland X"
 REQUIRED_USE="
 	|| ( wayland X )
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.21.2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.21.2.ebuild
index 636f43ef7a85..14642906b5c1 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.21.2.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.21.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="glade gtk-doc +introspection startup-notification system-info vala wayland X"
 REQUIRED_USE="
 	|| ( wayland X )
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.21.3.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.21.3.ebuild
index 636f43ef7a85..14642906b5c1 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.21.3.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.21.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="glade gtk-doc +introspection startup-notification system-info vala wayland X"
 REQUIRED_USE="
 	|| ( wayland X )
diff --git a/xfce-base/libxfce4util/libxfce4util-4.20.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.20.1.ebuild
index ad9bca66cee7..da40ac581538 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.20.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.20.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0/7"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/thunar/thunar-4.20.5.ebuild b/xfce-base/thunar/thunar-4.20.5.ebuild
index 8d98a63633b1..12c5774c660c 100644
--- a/xfce-base/thunar/thunar-4.20.5.ebuild
+++ b/xfce-base/thunar/thunar-4.20.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/thunar/thunar-4.20.6.ebuild b/xfce-base/thunar/thunar-4.20.6.ebuild
index 8d98a63633b1..12c5774c660c 100644
--- a/xfce-base/thunar/thunar-4.20.6.ebuild
+++ b/xfce-base/thunar/thunar-4.20.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/thunar/thunar-4.21.2.ebuild b/xfce-base/thunar/thunar-4.21.2.ebuild
index 883e375681a2..982e28a3b658 100644
--- a/xfce-base/thunar/thunar-4.21.2.ebuild
+++ b/xfce-base/thunar/thunar-4.21.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X exif gtk-doc introspection libnotify pcre policykit +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/thunar/thunar-4.21.3.ebuild b/xfce-base/thunar/thunar-4.21.3.ebuild
index a8e50b859ed6..ffe8f8df080a 100644
--- a/xfce-base/thunar/thunar-4.21.3.ebuild
+++ b/xfce-base/thunar/thunar-4.21.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X exif gtk-doc introspection libnotify pcre policykit +trash-panel-plugin udisks"
 
 # x11-libs/vte is automagic: https://gitlab.xfce.org/xfce/thunar/-/issues/1735
diff --git a/xfce-base/tumbler/tumbler-4.20.0.ebuild b/xfce-base/tumbler/tumbler-4.20.0.ebuild
index 0fda7971a92f..9af0a6c73111 100644
--- a/xfce-base/tumbler/tumbler-4.20.0.ebuild
+++ b/xfce-base/tumbler/tumbler-4.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
 
 DEPEND="
diff --git a/xfce-base/tumbler/tumbler-4.20.1.ebuild b/xfce-base/tumbler/tumbler-4.20.1.ebuild
index 0fda7971a92f..9af0a6c73111 100644
--- a/xfce-base/tumbler/tumbler-4.20.1.ebuild
+++ b/xfce-base/tumbler/tumbler-4.20.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
 
 DEPEND="
diff --git a/xfce-base/tumbler/tumbler-4.21.0.ebuild b/xfce-base/tumbler/tumbler-4.21.0.ebuild
index 742706468b38..56c8d74b4930 100644
--- a/xfce-base/tumbler/tumbler-4.21.0.ebuild
+++ b/xfce-base/tumbler/tumbler-4.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="curl epub ffmpeg gstreamer gtk-doc jpeg odf pdf raw"
 
 DEPEND="
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.20.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.20.0.ebuild
index d7d60950c687..92fb597833f4 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.20.0.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.72.0
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.21.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.21.0.ebuild
index 92a50922da75..13edc482de39 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.21.0.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.72.0
diff --git a/xfce-base/xfce4-session/xfce4-session-4.20.3.ebuild b/xfce-base/xfce4-session/xfce4-session-4.20.3.ebuild
index 7f01cb2d9f9a..c534bd60706c 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.20.3.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.20.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="X nls policykit wayland +xscreensaver"
 REQUIRED_USE="|| ( X wayland )"
 
diff --git a/xfce-base/xfce4-session/xfce4-session-4.21.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.21.0.ebuild
index 79e1b222d4a0..0ad06bf85069 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.21.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X nls policykit wayland +xscreensaver"
 REQUIRED_USE="|| ( X wayland )"
 
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.20.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.20.2.ebuild
index b5ae988debb9..e8bbae81e696 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.20.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.20.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="X colord input_devices_libinput libcanberra libnotify upower wayland +xklavier"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.21.0-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.21.0-r1.ebuild
index 2a122c5e707a..a2f7c3ca8658 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.21.0-r1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.21.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X colord input_devices_libinput libnotify upower wayland +xklavier"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/xfce-base/xfconf/xfconf-4.20.0.ebuild b/xfce-base/xfconf/xfconf-4.20.0.ebuild
index 8e4a099132c6..be17f121862f 100644
--- a/xfce-base/xfconf/xfconf-4.20.0.ebuild
+++ b/xfce-base/xfconf/xfconf-4.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-solaris"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfconf/xfconf-4.21.0.ebuild b/xfce-base/xfconf/xfconf-4.21.0.ebuild
index f2af35f11f89..c1c20ecbe801 100644
--- a/xfce-base/xfconf/xfconf-4.21.0.ebuild
+++ b/xfce-base/xfconf/xfconf-4.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-solaris"
 IUSE="debug gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
diff --git a/xfce-base/xfwm4/xfwm4-4.20.0.ebuild b/xfce-base/xfwm4/xfwm4-4.20.0.ebuild
index 03cc366a672e..804df32008f2 100644
--- a/xfce-base/xfwm4/xfwm4-4.20.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 DEPEND="
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.6.0.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.6.0.ebuild
index 4c750ca5be34..bf27f75c1c74 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.6.0.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.7.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.7.ebuild
index aa01da47dfa2..2011dd93d26a 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.7.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="X qrcode wayland"
 REQUIRED_USE="|| ( X wayland )"
 
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.7.0.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.7.0.ebuild
index 31c1e84e7b6e..e4c81acbd3e0 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.7.0.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="X qrcode test wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( X wayland )"
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.3.0.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.3.0.ebuild
index 197e9a9d4037..c6b07d08e65b 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.3.0.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.3.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.3.ebuild
index 87a94edef93f..0127f33702d6 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.3.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.9.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.9.ebuild
index 33b2fc00c32d..efc34863baa2 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.9.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.8.0.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.8.0.ebuild
index ce6722c8fd64..0feacbee9136 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.8.0.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.7.0.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.7.0.ebuild
index 0f8c1a65a658..608fbab82738 100644
--- a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.7.0.ebuild
+++ b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.2.0.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.2.0.ebuild
index 451d15492de3..fcc2934099ba 100644
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.3.0.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.3.0.ebuild
index 78ccb687a0af..0ea5dfcc3d8f 100644
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.3.0.ebuild
+++ b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.4.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.4.0.ebuild
index be2e16549e96..9cd2806bcf06 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.4.0.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="ssl"
 
 # TODO: remove exo when we depend on libxfce4ui >= 4.21.0
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.2.0.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.2.0.ebuild
index 41d863ecfd88..31f09292afcb 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.5.0.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.5.0.ebuild
index e9287eff4970..874922667d55 100644
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.5.0.ebuild
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.12.0.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.12.0.ebuild
index 2866285679bf..0c064193fee2 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.12.0.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.12.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0:2
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.9.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.9.0.ebuild
index ba8cf4cea5bb..b5eb0b67fa1b 100644
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.9.0.ebuild
+++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="libnotify"
 
 # TODO: remove exo when we depend on libxfce4ui >= 4.21.0
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.1.ebuild
index f75216e099a3..e935cc61a66e 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.1.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="X wayland"
 REQUIRED_USE="|| ( X wayland )"
 
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.2.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.2.ebuild
index 40f8a2ad1a19..f133a112356a 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.2.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="X wayland"
 REQUIRED_USE="|| ( X wayland )"
 
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.3.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.3.ebuild
index 1fd96eb6e52e..0a04dcef3aea 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.3.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.11.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="X wayland"
 REQUIRED_USE="|| ( X wayland )"
 
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.6.0.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.6.0.ebuild
index 19becb62faa9..b0a906113e4d 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.6.0.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.4.0.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.4.0.ebuild
index 70b85d333776..c9fa25d0b479 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.4.0.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="upower"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.6.0-r1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.6.0-r1.ebuild
index f488ebf4640b..bdd238216d51 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.6.0-r1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.6.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="X"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.2.0.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.2.0.ebuild
index 21d411837852..900c3f957be5 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="X"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.8.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.8.0.ebuild
index 0ae5cb4bd7f1..c437e1f3ff5d 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.8.0.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.1.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.1.0.ebuild
index 44a23f41a26b..b00aba6e4804 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.1.0.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.50.0
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.9.0.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.9.0.ebuild
index f577bcb24fee..adc179c12603 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.9.0.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="libnotify"
 
 DEPEND="