diff --git a/app-crypt/sirikali/sirikali-1.5.1.ebuild b/app-crypt/sirikali/sirikali-1.5.1.ebuild
index b836855..cbb8f03 100644
--- a/app-crypt/sirikali/sirikali-1.5.1.ebuild
+++ b/app-crypt/sirikali/sirikali-1.5.1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="gnome-keyring kwallet test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 DEPEND="
 	dev-libs/libgcrypt:0=
diff --git a/app-emulation/nemu/nemu-3.3.1.ebuild b/app-emulation/nemu/nemu-3.3.1.ebuild
index 47c3170..13695c5 100644
--- a/app-emulation/nemu/nemu-3.3.1.ebuild
+++ b/app-emulation/nemu/nemu-3.3.1.ebuild
@@ -23,7 +23,7 @@ else
 		S="${WORKDIR}/$PN-${MY_PV}/"
 	fi
 fi
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-misc/fff/fff-2.2.ebuild b/app-misc/fff/fff-2.2.ebuild
index 4239c2f..89c750b 100644
--- a/app-misc/fff/fff-2.2.ebuild
+++ b/app-misc/fff/fff-2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/dylanaraps/fff/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 DEPEND="
 	app-shells/bash:0
diff --git a/app-text/zeal/zeal-0.7.1.ebuild b/app-text/zeal/zeal-0.7.1.ebuild
index 1d667bb..10abe7c 100644
--- a/app-text/zeal/zeal-0.7.1.ebuild
+++ b/app-text/zeal/zeal-0.7.1.ebuild
@@ -27,7 +27,7 @@ else
 		S="${WORKDIR}/$PN-${MY_PV}/"
 	fi
 fi
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-python/hdf5storage/hdf5storage-0.1.19-r1.ebuild b/dev-python/hdf5storage/hdf5storage-0.1.19-r1.ebuild
index 33230b9..8cf2745 100644
--- a/dev-python/hdf5storage/hdf5storage-0.1.19-r1.ebuild
+++ b/dev-python/hdf5storage/hdf5storage-0.1.19-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="doc"
 # Tests need nose which is getting cleaned from main tree.
 RESTRICT="test"
diff --git a/dev-python/multi_key_dict/multi_key_dict-2.0.3-r3.ebuild b/dev-python/multi_key_dict/multi_key_dict-2.0.3-r3.ebuild
index e5d487d..3647408 100644
--- a/dev-python/multi_key_dict/multi_key_dict-2.0.3-r3.ebuild
+++ b/dev-python/multi_key_dict/multi_key_dict-2.0.3-r3.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 RESTRICT="test" # no tests
diff --git a/dev-python/soundfile/soundfile-0.12.1-r1.ebuild b/dev-python/soundfile/soundfile-0.12.1-r1.ebuild
index 5c5d7cf..23f4087 100644
--- a/dev-python/soundfile/soundfile-0.12.1-r1.ebuild
+++ b/dev-python/soundfile/soundfile-0.12.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 		S="${WORKDIR}/python-${PN}-${COMMIT_ID}"
 	fi
 fi
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 LICENSE="PySoundFile-BSD-3"
 SLOT="0"
diff --git a/dev-ruby/asciidoctor-pdf/asciidoctor-pdf-2.3.18.ebuild b/dev-ruby/asciidoctor-pdf/asciidoctor-pdf-2.3.18.ebuild
index 780dff0..7154250 100644
--- a/dev-ruby/asciidoctor-pdf/asciidoctor-pdf-2.3.18.ebuild
+++ b/dev-ruby/asciidoctor-pdf/asciidoctor-pdf-2.3.18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 BDEPEND="test? ( app-text/poppler )"
 
diff --git a/dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild b/dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild
index 2c4ac05..ed65478 100644
--- a/dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild
+++ b/dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Provides support for icons in Prawn"
 HOMEPAGE="https://github.com/jessedoyle/prawn-icon"
 LICENSE="|| ( GPL-2+ GPL-3 Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 # prawn breaks tests for some reasons, needs to be investigated; code
diff --git a/dev-ruby/prawn-svg/prawn-svg-0.35.0.ebuild b/dev-ruby/prawn-svg/prawn-svg-0.35.0.ebuild
index aaf71f6..4ea33f1 100644
--- a/dev-ruby/prawn-svg/prawn-svg-0.35.0.ebuild
+++ b/dev-ruby/prawn-svg/prawn-svg-0.35.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Provides support for SVG in Prawn"
 HOMEPAGE="https://github.com/mogest/prawn-svg"
 LICENSE="|| ( MIT Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 # prawn breaks tests for some reasons, needs to be investigated; code
diff --git a/dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild b/dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild
index 6c54e59..340e42b 100644
--- a/dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild
+++ b/dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Provides support for templates in Prawn"
 HOMEPAGE="https://github.com/prawnpdf/prawn-templates"
 LICENSE="|| ( GPL-2+ GPL-3 Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 # prawn breaks tests for some reasons, needs to be investigated; code
diff --git a/games-puzzle/osmos/osmos-1.6.1-r4.ebuild b/games-puzzle/osmos/osmos-1.6.1-r4.ebuild
index de3f541..6dc3fa6 100644
--- a/games-puzzle/osmos/osmos-1.6.1-r4.ebuild
+++ b/games-puzzle/osmos/osmos-1.6.1-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${MY_P}.tar.gz"
 
 LICENSE="Hemisphere_Games-EULA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64"
 IUSE=""
 
 RESTRICT="bindist fetch strip test"
@@ -46,12 +46,7 @@ src_install() {
 
 	# install all files to /opt/osmos, including the actual binary
 	exeinto "/opt/${PN}"
-	if use amd64
-		then newexe ${MY_PN}.bin64 ${PN}
-	fi
-	if use x86
-		then newexe ${MY_PN}.bin32 ${PN}
-	fi
+	newexe ${MY_PN}.bin64 ${PN}
 	insinto "/opt/${PN}"
 	doins -r Fonts/ Sounds/ Textures/ Osmos-* *.cfg
 
diff --git a/net-im/toot/toot-0.43.0-r1.ebuild b/net-im/toot/toot-0.43.0-r1.ebuild
index f0fd1b3..bbb486b 100644
--- a/net-im/toot/toot-0.43.0-r1.ebuild
+++ b/net-im/toot/toot-0.43.0-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 RESTRICT="test"
 
 DEPEND="
diff --git a/net-mail/urlscan/urlscan-1.0.3.ebuild b/net-mail/urlscan/urlscan-1.0.3.ebuild
index b6c5e9c..a8bdce9 100644
--- a/net-mail/urlscan/urlscan-1.0.3.ebuild
+++ b/net-mail/urlscan/urlscan-1.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://raw.githubusercontent.com/firecat53/urlscan/${PV}/urlscan.1 -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/net-misc/fb-client/fb-client-2.3.0-r2.ebuild b/net-misc/fb-client/fb-client-2.3.0-r2.ebuild
index 9083722..9dc4a18 100644
--- a/net-misc/fb-client/fb-client-2.3.0-r2.ebuild
+++ b/net-misc/fb-client/fb-client-2.3.0-r2.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="+clipboard"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test" # this packages has no tests
diff --git a/net-misc/fb-client/fb-client-9999.ebuild b/net-misc/fb-client/fb-client-9999.ebuild
index 04dc5da..0f1db85 100644
--- a/net-misc/fb-client/fb-client-9999.ebuild
+++ b/net-misc/fb-client/fb-client-9999.ebuild
@@ -20,7 +20,7 @@ else
 	S="${WORKDIR}/fb-${PV}"
 fi
 
-#KEYWORDS="~amd64 ~x86"
+#KEYWORDS="~amd64"
 SLOT="0"
 IUSE="+clipboard"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-fs/gocryptfs/gocryptfs-2.4.0.ebuild b/sys-fs/gocryptfs/gocryptfs-2.4.0.ebuild
index a4f274f..cc112d2 100644
--- a/sys-fs/gocryptfs/gocryptfs-2.4.0.ebuild
+++ b/sys-fs/gocryptfs/gocryptfs-2.4.0.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64"
 IUSE="debug +man pie +ssl"
 # Some tests need an ext4, some need libsandbox.so preloaded.
 RESTRICT="test"