diff --git a/app-emulation/firecracker-bin/firecracker-bin-1.10.1.ebuild b/app-emulation/firecracker-bin/firecracker-bin-1.10.1.ebuild
index 37f3ffa69f76..9b59d9014392 100644
--- a/app-emulation/firecracker-bin/firecracker-bin-1.10.1.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-1.10.1.ebuild
@@ -51,7 +51,7 @@ pkg_pretend() {
 			ERROR_BRIDGE="You will also need support for 802.1d"
 			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
 
-			if use amd64 || use amd64-linux; then
+			if use amd64; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/firecracker-bin/firecracker-bin-1.12.0.ebuild b/app-emulation/firecracker-bin/firecracker-bin-1.12.0.ebuild
index 1692428937bf..daf8f4e6795e 100644
--- a/app-emulation/firecracker-bin/firecracker-bin-1.12.0.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-1.12.0.ebuild
@@ -51,7 +51,7 @@ pkg_pretend() {
 			ERROR_BRIDGE="You will also need support for 802.1d"
 			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
 
-			if use amd64 || use amd64-linux; then
+			if use amd64; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/firecracker-bin/firecracker-bin-1.13.1.ebuild b/app-emulation/firecracker-bin/firecracker-bin-1.13.1.ebuild
index 1692428937bf..daf8f4e6795e 100644
--- a/app-emulation/firecracker-bin/firecracker-bin-1.13.1.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-1.13.1.ebuild
@@ -51,7 +51,7 @@ pkg_pretend() {
 			ERROR_BRIDGE="You will also need support for 802.1d"
 			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
 
-			if use amd64 || use amd64-linux; then
+			if use amd64; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.0.0.ebuild b/app-emulation/qemu/qemu-10.0.0.ebuild
index 873d979e2384..1dafbc2e3970 100644
--- a/app-emulation/qemu/qemu-10.0.0.ebuild
+++ b/app-emulation/qemu/qemu-10.0.0.ebuild
@@ -406,7 +406,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.0.2-r50.ebuild b/app-emulation/qemu/qemu-10.0.2-r50.ebuild
index bc60226762b4..fea565c10552 100644
--- a/app-emulation/qemu/qemu-10.0.2-r50.ebuild
+++ b/app-emulation/qemu/qemu-10.0.2-r50.ebuild
@@ -420,7 +420,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.0.2.ebuild b/app-emulation/qemu/qemu-10.0.2.ebuild
index 757ca18112c8..8b16c97bb595 100644
--- a/app-emulation/qemu/qemu-10.0.2.ebuild
+++ b/app-emulation/qemu/qemu-10.0.2.ebuild
@@ -406,7 +406,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.0.3.ebuild b/app-emulation/qemu/qemu-10.0.3.ebuild
index bc60226762b4..fea565c10552 100644
--- a/app-emulation/qemu/qemu-10.0.3.ebuild
+++ b/app-emulation/qemu/qemu-10.0.3.ebuild
@@ -420,7 +420,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.0.4.ebuild b/app-emulation/qemu/qemu-10.0.4.ebuild
index bc60226762b4..fea565c10552 100644
--- a/app-emulation/qemu/qemu-10.0.4.ebuild
+++ b/app-emulation/qemu/qemu-10.0.4.ebuild
@@ -420,7 +420,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.0.5.ebuild b/app-emulation/qemu/qemu-10.0.5.ebuild
index 20d6a759930d..d7d50e82737c 100644
--- a/app-emulation/qemu/qemu-10.0.5.ebuild
+++ b/app-emulation/qemu/qemu-10.0.5.ebuild
@@ -421,7 +421,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.0.6.ebuild b/app-emulation/qemu/qemu-10.0.6.ebuild
index bc60226762b4..fea565c10552 100644
--- a/app-emulation/qemu/qemu-10.0.6.ebuild
+++ b/app-emulation/qemu/qemu-10.0.6.ebuild
@@ -420,7 +420,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.1.0.ebuild b/app-emulation/qemu/qemu-10.1.0.ebuild
index b700e2ad46f8..d46037780e49 100644
--- a/app-emulation/qemu/qemu-10.1.0.ebuild
+++ b/app-emulation/qemu/qemu-10.1.0.ebuild
@@ -422,7 +422,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.1.1.ebuild b/app-emulation/qemu/qemu-10.1.1.ebuild
index b79195b65bcf..46eb3b0e6a1d 100644
--- a/app-emulation/qemu/qemu-10.1.1.ebuild
+++ b/app-emulation/qemu/qemu-10.1.1.ebuild
@@ -423,7 +423,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-10.1.2.ebuild b/app-emulation/qemu/qemu-10.1.2.ebuild
index 15f527943702..da5a453e2410 100644
--- a/app-emulation/qemu/qemu-10.1.2.ebuild
+++ b/app-emulation/qemu/qemu-10.1.2.ebuild
@@ -423,7 +423,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-9.1.3-r2.ebuild b/app-emulation/qemu/qemu-9.1.3-r2.ebuild
index 1f9890689359..eea70bf2b720 100644
--- a/app-emulation/qemu/qemu-9.1.3-r2.ebuild
+++ b/app-emulation/qemu/qemu-9.1.3-r2.ebuild
@@ -408,7 +408,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-9.2.3-r3.ebuild b/app-emulation/qemu/qemu-9.2.3-r3.ebuild
index 7630902ccbbd..22d96e04ced9 100644
--- a/app-emulation/qemu/qemu-9.2.3-r3.ebuild
+++ b/app-emulation/qemu/qemu-9.2.3-r3.ebuild
@@ -407,7 +407,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-9.2.4.ebuild b/app-emulation/qemu/qemu-9.2.4.ebuild
index 0ed0f5ee874f..3b294ab40685 100644
--- a/app-emulation/qemu/qemu-9.2.4.ebuild
+++ b/app-emulation/qemu/qemu-9.2.4.ebuild
@@ -406,7 +406,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index b3129596fbf4..84f2bacdc718 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -422,7 +422,7 @@ pkg_pretend() {
 			use test && CONFIG_CHECK+=" IP_MULTICAST"
 			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
 
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+			if use amd64 || use x86; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
diff --git a/dev-cpp/gtest/gtest-1.14.0-r2.ebuild b/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
index e5e6ff5cb59a..30adeb65db29 100644
--- a/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
+++ b/dev-cpp/gtest/gtest-1.14.0-r2.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 	)
 	if use test; then
-		if use x86 || use x86-linux; then
+		if use x86; then
 			append-cxxflags -ffloat-store # bug #905007
 		fi
 		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
diff --git a/dev-cpp/gtest/gtest-1.17.0.ebuild b/dev-cpp/gtest/gtest-1.17.0.ebuild
index e391487ab7d1..08ac21f25db1 100644
--- a/dev-cpp/gtest/gtest-1.17.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.17.0.ebuild
@@ -65,7 +65,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 	)
 	if use test; then
-		if use x86 || use x86-linux; then
+		if use x86; then
 			append-cxxflags -ffloat-store # bug #905007
 		fi
 		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index e391487ab7d1..08ac21f25db1 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -65,7 +65,7 @@ multilib_src_configure() {
 		-Dgtest_build_tests=$(usex test)
 	)
 	if use test; then
-		if use x86 || use x86-linux; then
+		if use x86; then
 			append-cxxflags -ffloat-store # bug #905007
 		fi
 		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
diff --git a/dev-db/mysql/mysql-8.4.6.ebuild b/dev-db/mysql/mysql-8.4.6.ebuild
index 8b1e2e28c088..7b6fc69311eb 100644
--- a/dev-db/mysql/mysql-8.4.6.ebuild
+++ b/dev-db/mysql/mysql-8.4.6.ebuild
@@ -41,7 +41,7 @@ LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 # 64-bit only since 8.2.0
 # https://github.com/mysql/mysql-server/commit/07bf1bdb620daf62c02ead0d5439d65c7c34aa00
-# -arm -hppa -mips -ppc -x86 -x86-linux
+# -arm -hppa -mips -ppc -x86
 # -ppc for bug #761715
 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"
diff --git a/dev-db/mysql/mysql-8.4.7.ebuild b/dev-db/mysql/mysql-8.4.7.ebuild
index 10f120855c4a..2b1c7b167aad 100644
--- a/dev-db/mysql/mysql-8.4.7.ebuild
+++ b/dev-db/mysql/mysql-8.4.7.ebuild
@@ -41,7 +41,7 @@ LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 # 64-bit only since 8.2.0
 # https://github.com/mysql/mysql-server/commit/07bf1bdb620daf62c02ead0d5439d65c7c34aa00
-# -arm -hppa -mips -ppc -x86 -x86-linux
+# -arm -hppa -mips -ppc -x86
 # -ppc for bug #761715
 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"
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 16a403f5dc95..8931e941a396 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.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-libs/boost/boost-1.89.0.ebuild b/dev-libs/boost/boost-1.89.0.ebuild
index 9e9ef27ea271..b0668e53d5e7 100644
--- a/dev-libs/boost/boost-1.89.0.ebuild
+++ b/dev-libs/boost/boost-1.89.0.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/jemalloc/jemalloc-5.3.0-r1.ebuild b/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild
index 19af346a70c4..9c1c44edac20 100644
--- a/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0/2"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-macos ~x64-solaris"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug lazy-lock prof stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
diff --git a/dev-libs/libbsd/libbsd-0.12.1.ebuild b/dev-libs/libbsd/libbsd-0.12.1.ebuild
index 9f2517d30bf1..ae39adf3ff90 100644
--- a/dev-libs/libbsd/libbsd-0.12.1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.12.1.ebuild
@@ -14,7 +14,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"
 # Unkeyworded until figured out a solution for bug #925663
-#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-util/debugedit/debugedit-5.1-r3.ebuild b/dev-util/debugedit/debugedit-5.1-r3.ebuild
index 814f454cb23e..d394aa8deda5 100644
--- a/dev-util/debugedit/debugedit-5.1-r3.ebuild
+++ b/dev-util/debugedit/debugedit-5.1-r3.ebuild
@@ -15,7 +15,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"
-#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/elfutils-0.176-r1:=
diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild
index c0f906928ab3..98f790e69530 100644
--- a/dev-vcs/git-lfs/git-lfs-9999.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-9999.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/eclass/acct-group.eclass b/eclass/acct-group.eclass
index 62f3660a772f..892a9ff98065 100644
--- a/eclass/acct-group.eclass
+++ b/eclass/acct-group.eclass
@@ -78,7 +78,7 @@ ACCT_GROUP_NAME=${PN}
 # << Boilerplate ebuild variables >>
 : "${DESCRIPTION:="System group: ${ACCT_GROUP_NAME}"}"
 : "${SLOT:=0}"
-: "${KEYWORDS:=~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-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/eclass/acct-user.eclass b/eclass/acct-user.eclass
index 35562c501437..e20b6fca4814 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -144,7 +144,7 @@ ACCT_USER_NAME=${PN}
 # << Boilerplate ebuild variables >>
 : "${DESCRIPTION:="System user: ${ACCT_USER_NAME}"}"
 : "${SLOT:=0}"
-: "${KEYWORDS:=~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-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/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.1.ebuild
index c93f7ac44e92..595b6993e572 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.1.ebuild
@@ -35,8 +35,6 @@ RDEPEND="
 BDEPEND="
 	amd64? ( ${ASM_DEPEND} )
 	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
 	x64-macos? ( ${ASM_DEPEND} )
 "
 
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 f2e91dc9db77..88b755811350 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.2.ebuild
@@ -36,8 +36,6 @@ RDEPEND="
 BDEPEND="
 	amd64? ( ${ASM_DEPEND} )
 	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
 	x64-macos? ( ${ASM_DEPEND} )
 "
 
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 0d9cec740f89..197d03114471 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.1.3.ebuild
@@ -36,8 +36,6 @@ RDEPEND="
 BDEPEND="
 	amd64? ( ${ASM_DEPEND} )
 	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
 	x64-macos? ( ${ASM_DEPEND} )
 "
 
diff --git a/media-libs/libmikmod/libmikmod-3.3.12.ebuild b/media-libs/libmikmod/libmikmod-3.3.12.ebuild
index c232319ea95c..f732cbf50e46 100644
--- a/media-libs/libmikmod/libmikmod-3.3.12.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.12.ebuild
@@ -46,7 +46,7 @@ multilib_src_configure() {
 	if use ppc || use ppc64; then
 		mysimd="$(use_enable cpu_flags_ppc_altivec simd)"
 	fi
-	if use amd64 || use x86 || use amd64-linux || use x86-linux || use x64-macos; then
+	if use amd64 || use x86 || use x64-macos; then
 		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
 	fi
 
diff --git a/media-libs/libmikmod/libmikmod-3.3.13.ebuild b/media-libs/libmikmod/libmikmod-3.3.13.ebuild
index c232319ea95c..f732cbf50e46 100644
--- a/media-libs/libmikmod/libmikmod-3.3.13.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.13.ebuild
@@ -46,7 +46,7 @@ multilib_src_configure() {
 	if use ppc || use ppc64; then
 		mysimd="$(use_enable cpu_flags_ppc_altivec simd)"
 	fi
-	if use amd64 || use x86 || use amd64-linux || use x86-linux || use x64-macos; then
+	if use amd64 || use x86 || use x64-macos; then
 		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
 	fi
 
diff --git a/sys-apps/coreutils/coreutils-9.9-r10.ebuild b/sys-apps/coreutils/coreutils-9.9-r10.ebuild
index 3775a9cdeef9..331293db8eb4 100644
--- a/sys-apps/coreutils/coreutils-9.9-r10.ebuild
+++ b/sys-apps/coreutils/coreutils-9.9-r10.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 )"