16 files changed, 14 insertions, 340 deletions
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.10.1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.10.1.ebuild
index fbe31c5e0b6e..1e4e5287f1dd 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.10.1.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.10.1.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 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="log4j"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-digester/commons-digester-2.1-r3.ebuild b/dev-java/commons-digester/commons-digester-2.1-r3.ebuild
index 90477a846833..4190d85b8cae 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r3.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/commons-digester-${PV}-src"
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="log4j"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
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 f970a077e1ac..bf8f341886d0 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 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="log4j"
 
 # src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26:
diff --git a/dev-java/commons-validator/commons-validator-1.9.0.ebuild b/dev-java/commons-validator/commons-validator-1.9.0.ebuild
index 6641dbdedc9a..70894252cd97 100644
--- a/dev-java/commons-validator/commons-validator-1.9.0.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.9.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="log4j"
 RESTRICT="test" #839681
 
diff --git a/dev-java/icu4j/icu4j-77.1.ebuild b/dev-java/icu4j/icu4j-77.1.ebuild
index 75d1f4b318ac..ef979e696fc7 100644
--- a/dev-java/icu4j/icu4j-77.1.ebuild
+++ b/dev-java/icu4j/icu4j-77.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
 
 LICENSE="icu"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ~ppc64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 0fc7b4edf95a..8dbf6c900978 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,7 +1,6 @@
 DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45
 DIST openjdk-11.0.26_p4.tar.gz 116557373 BLAKE2B 0d3dc31b4568778da2612d002c8e92eb3aa0e2b1b1eed973adb82fe3ca2ebdddafa9cae116e0b91cfb4cfdd7a40c381b3c8dd14e5b4ee28c0cf388b467166b76 SHA512 b5375de7c39aafa4fe1ef6556e17bf5c8ace577953ea8e666c4e8adc3e8b0f6fdbf20b7c426a156420acb99787363e0e4c9d36df20cefcef5e74a48bb75eeb24
 DIST openjdk-11.0.27_p6.tar.gz 116557817 BLAKE2B a51e354f4f2b2d907eb289ec8a0279061a9fe6ada45cd0c90b07507a289334ff1bed2cc70aebcddea8212e3ec83242241a6cb69789210a5733fa1a58013c4c94 SHA512 050dea8fcc25636cbb15b25db38f3f072438eddd84fe7d35b7577197ca272f99cbe81dbb21e1452110fd06a09124823c49ba147adf8a564ac73a33567d3029f0
-DIST openjdk-17.0.14_p7.tar.gz 107408032 BLAKE2B 006be4d75d3d9ef3a40b1853dded3cced6f345ea473b7c03c89f04b1d74df7532878246bafde932b49da39c1cf66bcd7c2ee42dc9049c19efc653db8f7367971 SHA512 0643ac52b68e5884734289ab13592feef7273db96f7b5c0fd77d801e4d4e44a84abcc439fd1b138119c5583986f1d0b058aa74f55b00e0dfd31333cbb536744d
 DIST openjdk-17.0.15_p6.tar.gz 107492979 BLAKE2B 0089821fdb9b4e2e717d5e42641ddfc1695d250def95cbb4c311e4dc83a0bca0d04aad7aaed727e7cebd693929b56b39c55c232cb5d40fce75295a4170443239 SHA512 207ac62818c8730c1d2ad82f21f812b5b85d41aab9990f7b29b55f6df0e1cd3c6cf5737d5b40895bc47f6b0022c637275a7c8ac994cf789cd88424b6af4c4ad6
 DIST openjdk-21.0.6_p7.tar.gz 113221815 BLAKE2B 2b3d240037baa2b306a1064f260b7ed57a4f4dafe97626bf6e1de3e54357d8a7652c1798f6946d58aba30ca0be334d9a1f918b25381ab370d515f829abea4952 SHA512 fb03362608a35b0f6e131eaa974a52e6ff8a96f90d3bdaeccd2e1268f46db65c72387ed7bba1c8b0d9457c56950eae607fba29e102a338b009259262e1024726
 DIST openjdk-21.0.7_p6.tar.gz 113314595 BLAKE2B 5bc9962c2f1fac243fdd06cae7703a3348cce66b516e9f0c289c30752fe69292dff58675e89aec31eef09b2bb9532f216b793b9f33fc61311bb51e939c2adb7f SHA512 69bc3e78e1d0bacbf166bc028baa42de73c318b12b838197a2bf8373794888e688c714500431b09e9105a9ec9263080398e55cf13395b514525840a275b2eacd
diff --git a/dev-java/openjdk/openjdk-11.0.27_p6.ebuild b/dev-java/openjdk/openjdk-11.0.27_p6.ebuild
index 72c8c940077c..ba7e3619b7b0 100644
--- a/dev-java/openjdk/openjdk-11.0.27_p6.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.27_p6.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-17.0.14_p7.ebuild b/dev-java/openjdk/openjdk-17.0.14_p7.ebuild
deleted file mode 100644
index f0982bf4f8a9..000000000000
--- a/dev-java/openjdk/openjdk-17.0.14_p7.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-	[[ ${cond} == elibc_musl* ]] && local musl=yes
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-MY_PV="${PV%_p*}-ga"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk17u/archive/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri x86 ${X86_XPAK})
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-	)
-"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-debug/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if has_version dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-	elif use !system-bootstrap ; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	else
-		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# bug 906987; append-cppflags doesnt work
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
-	# https://bugs.gentoo.org/833097
-	# https://bugs.gentoo.org/833098
-	filter-lto
-	filter-flags -fdevirtualize-at-ltrans
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--disable-warnings-as-errors
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-jvm-feature-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-
-	use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-	if use javafx; then
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	# Too brittle - gets confused by e.g. -Oline
-	export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset GNUMAKEFLAGS MAKEFLAGS
-
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-17.0.15_p6.ebuild b/dev-java/openjdk/openjdk-17.0.15_p6.ebuild
index a576db8e3e4c..f0982bf4f8a9 100644
--- a/dev-java/openjdk/openjdk-17.0.15_p6.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.15_p6.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-21.0.7_p6.ebuild b/dev-java/openjdk/openjdk-21.0.7_p6.ebuild
index 7658e00e79dc..642d38e436f8 100644
--- a/dev-java/openjdk/openjdk-21.0.7_p6.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.7_p6.ebuild
@@ -46,7 +46,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86"
 
 # lto temporarily disabled due to https://bugs.gentoo.org/916735
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
diff --git a/dev-java/openjdk/openjdk-8.452_p09.ebuild b/dev-java/openjdk/openjdk-8.452_p09.ebuild
index 3ec2e6c55bbf..26ed1d33fa31 100644
--- a/dev-java/openjdk/openjdk-8.452_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.452_p09.ebuild
@@ -47,7 +47,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${PV%%[.+]*}"
-KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
 
 COMMON_DEPEND="
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.3.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.3.ebuild
index 844a4daa0567..13293081531b 100644
--- a/dev-java/randomized-runner/randomized-runner-2.8.3.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.8.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ~ppc64"
 
 CP_DEPEND="dev-java/junit:4"
 
diff --git a/dev-java/snappy-java/snappy-java-1.1.10.7-r1.ebuild b/dev-java/snappy-java/snappy-java-1.1.10.7-r1.ebuild
index 49f3c61e5e13..c54292bfd938 100644
--- a/dev-java/snappy-java/snappy-java-1.1.10.7-r1.ebuild
+++ b/dev-java/snappy-java/snappy-java-1.1.10.7-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 CP_DEPEND="dev-java/osgi-core:0"
 
diff --git a/dev-java/swt/swt-4.35.ebuild b/dev-java/swt/swt-4.35.ebuild
index 8388c97341a9..2ee522306f53 100644
--- a/dev-java/swt/swt-4.35.ebuild
+++ b/dev-java/swt/swt-4.35.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/library"
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ~ppc64"
 IUSE="cairo opengl webkit"
 
 BDEPEND="
diff --git a/dev-java/woodstox-core/woodstox-core-7.1.0.ebuild b/dev-java/woodstox-core/woodstox-core-7.1.0.ebuild
index 090ee4592862..da9d59a7989d 100644
--- a/dev-java/woodstox-core/woodstox-core-7.1.0.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-7.1.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/woodstox-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ~ppc64"
 
 CP_DEPEND="
 	dev-java/bnd-annotation:0
diff --git a/dev-java/xom/xom-1.3.9.ebuild b/dev-java/xom/xom-1.3.9.ebuild
index c8bc766f9dd1..47c31f577c06 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 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Bug #905215 Without 'test_network',there are 14 test failures like:
 #java.net.UnknownHostException: raw.githubusercontent.com