diff --git a/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild
index eef83ed218c90..7a0904aa359e6 100644
--- a/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild
+++ b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/jmh-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 DEPEND="
 	dev-java/jmh-core:0
diff --git a/dev-perl/Shell-Command/Shell-Command-0.60.0.ebuild b/dev-perl/Shell-Command/Shell-Command-0.60.0.ebuild
index 6b683e3c686c6..7057bf547e8f7 100644
--- a/dev-perl/Shell-Command/Shell-Command-0.60.0.ebuild
+++ b/dev-perl/Shell-Command/Shell-Command-0.60.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Cross-platform functions emulating common shell commands"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/dev-vcs/vcsh/vcsh-2.0.8.ebuild b/dev-vcs/vcsh/vcsh-2.0.8.ebuild
index c4fe75d56fbb3..d571722fc695b 100644
--- a/dev-vcs/vcsh/vcsh-2.0.8.ebuild
+++ b/dev-vcs/vcsh/vcsh-2.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/RichiH/vcsh/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/games-util/heroic-bin/Manifest b/games-util/heroic-bin/Manifest
index 37e583b6c5729..784bdcf6f2561 100644
--- a/games-util/heroic-bin/Manifest
+++ b/games-util/heroic-bin/Manifest
@@ -1,6 +1,6 @@
-DIST com.heroicgameslauncher.hgl.2.17.2.desktop 529 BLAKE2B effd9f5d89cb8453e616650cd128fea795c65c2c2d2f6073f2d137fcb270aa02554a19e6e627ccc7aaf0c927f42cd86ca56beeba6478929eeb28b2dafcd572aa SHA512 e7af610d21013943c43539224a5dd2ea3994726ecc7ed14e9db3513543ab5c6796d66394eb63d90f90148259ef2928739cd346eb7c8fe7a73273984fe9b8e6a5
-DIST com.heroicgameslauncher.hgl.2.17.2.png 9797 BLAKE2B c6f76df4ec2fd25323f5c37e03605647ede8f8c2ed48cfbb8af11aad22ae90182d3678b943633b46a2d8dfb0c1cbd1a275b6c62dde238b9b0f68cbafb4bf3697 SHA512 68e9881fb4f123008398409825aa8cf70cec34365a23adb1234f7c054a14f40d159e7d8912cfedac0bb2b12f1d3c3c980469c2fca9735d4bc06bd4074aecc7e3
 DIST com.heroicgameslauncher.hgl.2.18.0.desktop 529 BLAKE2B effd9f5d89cb8453e616650cd128fea795c65c2c2d2f6073f2d137fcb270aa02554a19e6e627ccc7aaf0c927f42cd86ca56beeba6478929eeb28b2dafcd572aa SHA512 e7af610d21013943c43539224a5dd2ea3994726ecc7ed14e9db3513543ab5c6796d66394eb63d90f90148259ef2928739cd346eb7c8fe7a73273984fe9b8e6a5
 DIST com.heroicgameslauncher.hgl.2.18.0.png 9797 BLAKE2B c6f76df4ec2fd25323f5c37e03605647ede8f8c2ed48cfbb8af11aad22ae90182d3678b943633b46a2d8dfb0c1cbd1a275b6c62dde238b9b0f68cbafb4bf3697 SHA512 68e9881fb4f123008398409825aa8cf70cec34365a23adb1234f7c054a14f40d159e7d8912cfedac0bb2b12f1d3c3c980469c2fca9735d4bc06bd4074aecc7e3
-DIST heroic-bin-2.17.2.tar.xz 120177180 BLAKE2B 63a8611b437c0da35f37646a4e35df4b95143dba0fa32df8f7914015ce4f9c4c87e411bd5e263400582a3d6ae75ccbed6916fe974a34155da007156144b7ee35 SHA512 8e359171cdd098bb75f986a87f767e3a26d9e3f5d1eb92b3965f1c00bd3cc2de81f202da4603bc9a0c5cd952fd773c60a62b69321b3187de68a3718922337910
+DIST com.heroicgameslauncher.hgl.2.18.1.desktop 529 BLAKE2B effd9f5d89cb8453e616650cd128fea795c65c2c2d2f6073f2d137fcb270aa02554a19e6e627ccc7aaf0c927f42cd86ca56beeba6478929eeb28b2dafcd572aa SHA512 e7af610d21013943c43539224a5dd2ea3994726ecc7ed14e9db3513543ab5c6796d66394eb63d90f90148259ef2928739cd346eb7c8fe7a73273984fe9b8e6a5
+DIST com.heroicgameslauncher.hgl.2.18.1.png 9797 BLAKE2B c6f76df4ec2fd25323f5c37e03605647ede8f8c2ed48cfbb8af11aad22ae90182d3678b943633b46a2d8dfb0c1cbd1a275b6c62dde238b9b0f68cbafb4bf3697 SHA512 68e9881fb4f123008398409825aa8cf70cec34365a23adb1234f7c054a14f40d159e7d8912cfedac0bb2b12f1d3c3c980469c2fca9735d4bc06bd4074aecc7e3
 DIST heroic-bin-2.18.0.tar.xz 120185448 BLAKE2B d3347fcd2084667fa30b01e07bd252f5213a440de37748d7c58e648a3ba511cbcd0e9bd45187cd2751bcbfea1b55c6fde8af53a7c86e80cc2eec29c72c039bee SHA512 e75690b4730935d4378a7b71a6da522c94acc9d2ba57872764f1e8c3809bbf3ad3661269174049019f6dfb6e725beb1a4befe2c993e7006308bacfc7425bc7ce
+DIST heroic-bin-2.18.1.tar.xz 120199340 BLAKE2B 759e5faa5e52643d2437fb71c3887a8888d019b93a38613312c20d1fcbad094ff1eb59845a9fea2edcdeb2f7ff97c1f24dedd188fac011b2e0a854ca1927983c SHA512 4a454d92bf823a914f477fa9163a88a87f4daa092de1f0eb4fad5d3b7940feeb03fa171df6177861b3690a72828cb94380344dd71ded4ace5e002372c22befe7
diff --git a/games-util/heroic-bin/heroic-bin-2.17.2.ebuild b/games-util/heroic-bin/heroic-bin-2.18.1.ebuild
similarity index 100%
rename from games-util/heroic-bin/heroic-bin-2.17.2.ebuild
rename to games-util/heroic-bin/heroic-bin-2.18.1.ebuild
diff --git a/net-libs/libhackrf/libhackrf-2024.02.1-r1.ebuild b/net-libs/libhackrf/libhackrf-2024.02.1-r1.ebuild
index a1a7959994334..140713e775383 100644
--- a/net-libs/libhackrf/libhackrf-2024.02.1-r1.ebuild
+++ b/net-libs/libhackrf/libhackrf-2024.02.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
 	SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 arm ppc ~riscv ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2024.02.1-r1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2024.02.1-r1.ebuild
index c9dafbc0af85d..2ad212deae540 100644
--- a/net-wireless/hackrf-tools/hackrf-tools-2024.02.1-r1.ebuild
+++ b/net-wireless/hackrf-tools/hackrf-tools-2024.02.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
 	SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~x86"
+	KEYWORDS="amd64 arm ppc ~x86"
 fi
 
 LICENSE="BSD"