gentoo auto-resync : 02:10:2024 - 01:26:10

10 files changed, 353 insertions, 6 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 92372af2bf94..f014685bed6c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 524241d0fb9c..10df6ee9ceba 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,3 +1,4 @@
+AUX openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch 608 BLAKE2B ae49ac440d0f3c73f9afb31f4b80ba18fb739ee914841d31919827ecfcb7962ed2a7388897091b443ff57b241abd2faa0e8138fb37288f6f43a1e9befe0f5335 SHA512 1e4bb26489f72a1c40d1032ce76ecce3f30b22e33cb0e05bba8abbd4accddf951423fc16a0e747af03bdb9f3d036868b87e8d09c1a969b27d223653e4dcd926f
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
 AUX openjdk-8.402_p06-0001-Fix-Wint-conversion.patch 1457 BLAKE2B bf40827358b66f4f74ed506daec28f90c2c36609e28bbdd1a1df289a7a7b6b837c58f4978fffd18e580e0d49a6caaba31e54c3fcfbc66a218203cc2e05ec595d SHA512 4c2c9a6b99f833318fdd955ad015813326f8f9a5ad7e5327b74ccd2b638f1c7f8935223c3a1af26946f470b5d7c19ac130c72291b3a5ce0ec4a729df3a3915b9
 AUX openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch 2254 BLAKE2B 6e8e008b6735262d9447605e60fbf0a5937068d5efbac014dad86910d55320cba048b88dd2a4436bcac407d1660137f94eab037b8b99453c9a5cf6721e22f4bc SHA512 8f6659dcbc63c0fa637a636b0e09141a09eecb31e2296f863f3446ce1c820922d2be12063822f6b12ce4702e920fcd5a6573494e4b88224cd3505be46574e8ba
@@ -9,6 +10,7 @@ DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f
 DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3
 DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc
 DIST openjdk-21.0.4_p7.tar.gz 112506384 BLAKE2B d58636bc9221d56afcf118a91e41326d2e086c9fe22675429ec50d0b62fefd9e2040140a9d99682547e8bf0d40fa4ca2cbcdf8be55b9a0556b95c90fc0a08d56 SHA512 507524d842fb7c371cf7d3163cdce87e9266d613998b797f2828178b35c087354ae30941384d5afd1d6e3982eddf5c9067553bc2b918a9e223b93893f7f27e76
+DIST openjdk-23_p37.tar.gz 116630157 BLAKE2B 38f1beed2f840b89aa7375cda657cd769472324a52293a11911f4b96cb62a5a6882814c0d31a0fbde560ac167468afd6bbee84389f0c61956ad80596702214d0 SHA512 1f03849cdb1a603848de0516ac2f736f4665efee4bc9a67b66b1e3a8138fa2dcf1828471b423585f07be3ffa94e6bdbd5752bbc456b8bd0306a8cb30d6127754
 DIST openjdk-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
@@ -24,5 +26,6 @@ DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c
 EBUILD openjdk-11.0.24_p8.ebuild 9003 BLAKE2B e8b0c87b9fb1322893cb137cf7eb94c29e0b4d33720d40d464c5d4c171297642eedcbcb66f637c963c07d83db84d551f7d536e5ba6c8510f6140f6051fa15134 SHA512 3ed25ec77e46faf8843085a3eceabf801a242ed0471eed32d344c871cb1e006477009d9a19db748ff1fd083ac0b7874f364d48360ee258bb57e3bdfcdd79227b
 EBUILD openjdk-17.0.12_p7.ebuild 9423 BLAKE2B 269c2108f9807cac55c140e93901566537d99c865238da907be7e2542664eebde575e02fa425414e786cde43ec804937819e4311036ac9b74c4c81cce964b0fc SHA512 d1c49ce3d13496a945a362fe52b1b6cebe43280b82e41a32180c077e0c9c0e60ef5f4c752a3288331ac33e659e92bdb98f7e54c64d31414cdb600161766c68df
 EBUILD openjdk-21.0.4_p7.ebuild 9534 BLAKE2B 16ec3a58ac789c46f3527b72da86a282916e9dc9774f8fbddea40a66763f35eebbb545493682f869ecf03bb3d2d86829bb3d0c7e2c61ec879d9c722eb6a9806d SHA512 3ed2814c35176848b3ec882f2c679c62be126091945008a12945041d24bc6e2941bcd6c975661c9dde6bfbd596a702123c017a7f74d9b79deadf9aa87ce37b4a
+EBUILD openjdk-23_p37.ebuild 9596 BLAKE2B d07179bb04a9cae85f1c89f7271a960d6a6df7a65376ce50f9358e99f686849722b4ff1f39a045e971400e5a7ab08ee41daa0c5b0413261cc663bbfb644d2204 SHA512 2e655c7bfffa213f6e88cb9fbd4dc258bf48b849d65335ca2f16928a42d213b33482e7057d0d150e915d33b4fc5e12c701acafd9d97de6b7599a3c6c0f1c1b88
 EBUILD openjdk-8.422_p05.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
 MISC metadata.xml 1549 BLAKE2B 6c922cbe1dd4261036670a176be092d495024dd25e2ffb83cc1af1e3ad0dda3491e8973cdd7f8688f1c0854acf55cdc11e9d80ac5b9a16b544455d2cd1bdcbfe SHA512 57cd1a08f0479e8b11d37665c1d905255685ed2d8d27f469a9689ffe070c7ee6cd5944a1baf87cb19722b31af56b1a4692f7967e817d1e4ffbf7c4d97881d838
diff --git a/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch b/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
new file mode 100644
index 000000000000..bc4d96dfc141
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
@@ -0,0 +1,12 @@
+src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c:27:10: fatal error: hb.h: No such file or directory
+
+--- jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk~	2024-08-20 17:57:04.000000000 +0200
++++ jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk	2024-09-20 10:00:52.460817053 +0200
+@@ -279,6 +279,7 @@ endif
+ ################################################################################
+
+ ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
++   LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
+    LIBFONTMANAGER_EXTRA_SRC =
+    LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
+ else
diff --git a/dev-java/openjdk/openjdk-23_p37.ebuild b/dev-java/openjdk/openjdk-23_p37.ebuild
new file mode 100644
index 000000000000..47f8df8e9c6c
--- /dev/null
+++ b/dev-java/openjdk/openjdk-23_p37.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2024 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
+PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
+X86_XPAK="21.0.0_p35"
+
+# 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}/jdk23u/archive/jdk-${MY_PV}.tar.gz
+		-> ${P}.tar.gz
+	!system-bootstrap? (
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+		$(bootstrap_uri x86 ${X86_XPAK})
+	)
+"
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+
+LICENSE="GPL-2-with-classpath-exception"
+#	SLOT="${MY_PV%%[.+]*}"
+SLOT="23"
+#	KEYWORDS="" # not LTS
+
+# 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"
+
+REQUIRED_USE="
+	javafx? ( alsa !headless-awt )
+	!system-bootstrap? ( jbootstrap )
+	!system-bootstrap? ( || ( ppc64 x86 ) )
+"
+
+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}
+		)
+	)
+"
+
+PATCHES=( "${FILESDIR}/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch" )
+
+# 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 riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
+
+	# Werror=odr
+	# https://bugs.gentoo.org/916735
+	#
+	# Disable it for now.
+	#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/owasp-java-encoder/Manifest b/dev-java/owasp-java-encoder/Manifest
index 56fa569ba601..d9d31d826e13 100644
--- a/dev-java/owasp-java-encoder/Manifest
+++ b/dev-java/owasp-java-encoder/Manifest
@@ -2,5 +2,5 @@ AUX owasp-java-encoder-1.2.3-BenchmarkTest.patch 1971 BLAKE2B 1a4d60fb1b16b98878
 DIST owasp-java-encoder-1.3.0.tar.gz 150029 BLAKE2B 31e350f02a7374f809e435d90ee9b4b1424cd9cb2da7d4062dfe0fc5898e02623496e464483bafd550b82b926260ab4df918f9be776e47f66587c6bc3829ebba SHA512 0ccdd6ae63e657ee28a4d9de7664269eff57802bddb03c7163fdb27326668256573d995b0111dc83cc1e5a6acc247e03da443f4b34c08cf99b085ec0a383a439
 DIST owasp-java-encoder-1.3.1.tar.gz 150103 BLAKE2B 6fc372364a13df497b1f5380d1d9b1c90e0981bfa059c31f2d138a3d0db3210105d0055b2a39a341cb3374b8149c5d61e1f967677e1159e843bb0143713e58b2 SHA512 9a75dea53e2859a4a213e2a511440c1bcbaea6c7a13fece674d155bc859f049fd45bbbd83fd6869a792af3b0e3f447e90ab450545684aa5ccc5b88a051114cdc
 EBUILD owasp-java-encoder-1.3.0.ebuild 1243 BLAKE2B 0d6c11e5bc38fe119d0be612698890767c1a6b81f47ce4da37d4a45785e33c458da02e8a431c89d0ca5c8a6da9ae8a4d0a34b30ab3eee6f4be9f7be79fe49fd7 SHA512 88b9aa0c1b6474d3dd12264d699026e68586763b759471dae7dcb1cf27481cd378c3294d6c6e5ae38ebe5c2ca7007d72ed09d71a01eb85223b81d51190ff8f0a
-EBUILD owasp-java-encoder-1.3.1.ebuild 1244 BLAKE2B 3c78a5ff087f17578b40c66bf7ac9b320eedb3e7b41dbc8851571241513ca587d8d1782c5aa5ff9623e067751b45b2da4874d194e4f8b3934e38872c3682b472 SHA512 cf37a0865cd38f85ae39d291bc15765ae28260b3ffb26da4b4cd7f95b6b0158975e6751c8be83e6d6af610ea64b51dfaf9e08dbe2677abb1a4c21af3ae381ec5
+EBUILD owasp-java-encoder-1.3.1.ebuild 1243 BLAKE2B 0d6c11e5bc38fe119d0be612698890767c1a6b81f47ce4da37d4a45785e33c458da02e8a431c89d0ca5c8a6da9ae8a4d0a34b30ab3eee6f4be9f7be79fe49fd7 SHA512 88b9aa0c1b6474d3dd12264d699026e68586763b759471dae7dcb1cf27481cd378c3294d6c6e5ae38ebe5c2ca7007d72ed09d71a01eb85223b81d51190ff8f0a
 MISC metadata.xml 306 BLAKE2B 8dfe8c2f01f21e1e865973e9865f3a9439a7a378d2acc52a6e148dcf70e3ef0f0fcce4efff20d89c0e2872e5d23fb0795b2d669eb18c278abf3ae6406db8f84a SHA512 c696a3c2763ff1868b3b80ee7c4b47fc697679a0539c2b9b300f0a969ad3bcd168e75f5d0275c10bac5b1ba7052e2e498c2c7daf3290f593cd0be8c9f35940fd
diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild
index 84640fdb1e59..d97245755a5f 100644
--- a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild
+++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}/core"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 5fa7aedd61de..6da11f62c6fd 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -2,5 +2,5 @@ DIST poi-src-5.2.3-20220909.tgz 117839114 BLAKE2B 8b62f212dbbb6c7c20900dad97eaee
 DIST poi-src-5.2.5-20231118.tgz 120325373 BLAKE2B a998b874040ac2fb136b9ffa59d30cf5939434efe59d51fc2e79c63f6fd1f3ad1679b532840f0e1975aa0fe79368951ecf2ddc0259e3dfce9fc2c34d95cb7216 SHA512 d46e94cfadc3a843d8e06033a618098dde738830f20146c6e39abd8f467aa88987719363ee2b91ecf6812e604cdc72a5c0a799676e264a6f9d3799aa4639a6c9
 DIST poi-src-5.2.5-20231118.tgz.asc 488 BLAKE2B 634ed5e3bacd71213a96b9da147348deb3dd2837f6cf47f4d76c254442504815e41b1d9a3facfaa27c927f11f1ba552acf4dc94c4ffbfd11cc70eefd054a1523 SHA512 3588d60ad1c5e59540f19e345f2cfd6600a592fda313ab53bfd280599906e9d3c44aedae8fb72409ebae67c0285b257290bdca9128a632379db894143585dd1e
 EBUILD poi-5.2.3.ebuild 1556 BLAKE2B 37fbff909c5dd7dddb27bcd15c68ebdb532f47ded30a074f8dd3a3aed1e9c210dfd3beeac35ed9323d71369e74e41630bd237f2d8de139808336d16b64ced8b3 SHA512 44e6d1c826a9b9decbd1f79668c7166f5e5f4e727bdb123810744e579964acf0d81531c2ca71a811c25cbc1083659c4404e4b704574389cc58a61a3a9f0a4e17
-EBUILD poi-5.2.5.ebuild 1644 BLAKE2B 4c94a3db0d700838da77b67572df54b0761935122fcd2ab581707bc922975e985a397e84a0d7905cca08df8d565103763e15cf1349dc9356eb9922b632599de6 SHA512 e261c124a17779a1aa5c1abc5ee7ed1ef491d5c227dc6aa59a03477d73910573c2e896e5516b70a962d97c29c0342f7cc417ec6c73f2490925e908fbc3b55921
+EBUILD poi-5.2.5.ebuild 1641 BLAKE2B 8936deacbf013c8bcb518ba586726463d18633616b655ca148cc3b028f0babd2b1ad6f7831efae4f23a6de44dbe90b0fb4128f4521bf58f9c0dfec245345a9c7 SHA512 3e8ad8be900cec7a47c7fb08010fff7eed3c33302f65c8bf5b4d2facb364783dc6770207ae97a9fb0223a9db564f45b225c8d90f86f9620e738b5f06ab6e4648
 MISC metadata.xml 429 BLAKE2B 5de897522625a2c4ff05fcbd8f1ffc1e58bf734febe26f28a23e9f1a3a93d3acb1d099d9cc50d329c14bf9c586e15b74bfe061ccab493ce1627161ebce46a845 SHA512 a8b3da8273c10239b9bde465b67dd818d74910bb9303462b68df5ee9487aaeefbfec324bd0492601c75adb4e9fa163bf99ca7ececf2684f4778a61041a98e75c
diff --git a/dev-java/poi/poi-5.2.5.ebuild b/dev-java/poi/poi-5.2.5.ebuild
index 7320886dbe8a..5e1b9e57e7e1 100644
--- a/dev-java/poi/poi-5.2.5.ebuild
+++ b/dev-java/poi/poi-5.2.5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/poi-src-${PV}-${RELEASE_DATE}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/poi.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-poi )"
diff --git a/dev-java/sparsebitset/Manifest b/dev-java/sparsebitset/Manifest
index 0d9035f89ad4..8f9068e40482 100644
--- a/dev-java/sparsebitset/Manifest
+++ b/dev-java/sparsebitset/Manifest
@@ -1,5 +1,5 @@
 DIST SparseBitSet-1.3.tar.gz 1670241 BLAKE2B e9d8ff537b65e4c2be68d66f02595048381c4a2574e3bdc5d05602d440a57a6c7a96edb23581741a6800516e3d571dce8e016e0ce477300ce7ad08c3e81bcad2 SHA512 6851613df21bcdccb28c24535fac886d6ad74d6feb37dea477dff1711218ecf30093d90ff78becb1159c6bd570a7afbd8c86482d72a5af8f0864d6e443cd603b
 DIST sparsebitset-1.2.tar.gz 1669439 BLAKE2B abfd88fb21f72d22bbb1f7bff11bd2a9b4e2af84689cbe8013f27f1f138512ecf843a60b8c5c196b622d024614e7f197b349a6cd510eb1c17bd757f7c1a0d90d SHA512 0c7c182556240886e0732626561401aa8695fd46ba90e5e95c5b28c90abaf5f6fd4c3b791171cdde71f61111c6b08ae8f56de105779f71d0448635cbe3b0b247
 EBUILD sparsebitset-1.2.ebuild 1049 BLAKE2B 5c5bc9eed6e197ef91af2c7f6ae4d268efe8506316663996ab4ef8b26bd4e0fce7006f61d7c806abf08287e20c545e47af19ec443e8476a35863f7e7387adf0e SHA512 37a458745a49af8d0d002c8c2043c640667550a4f6d48dc284db8bdfcde0e5bd5a5a1e8c89b9084be4bae81273ddcada01fbb3060883ffdb753493831a594b23
-EBUILD sparsebitset-1.3.ebuild 833 BLAKE2B 084ef3671caba40c6600fc68250bf1617d656b55b6d6875efb7b44ec823ee3a0cbe0def7a450f3d87773e7572388049182f2c341e42d025a4657cdae79e6e2cd SHA512 9ef32f2a21d0be3285674aaea315451d95649068cd641995f4d6090cc05bf8d1d8bf116424092469780cbb86e6176588d38eaa0cf471ad4e30341bf1051ad5ba
+EBUILD sparsebitset-1.3.ebuild 830 BLAKE2B 843578b47451fc5223b7e864dfbca2f723350059e152e9ff38cb21320ccadea7d294cd241309f32333a6b5280e6db0acbdfadee2c9b0a94b84badb1971905a06 SHA512 9d0d07a8f6697fd16942abe05177fbe6d019bee17c6333adf59221669d347e90ad425827f8e2be7039a119228f98db74ab716769bb4698dd0f1f7ad6f62d4c13
 MISC metadata.xml 386 BLAKE2B 96a18d38d4e85f0a567be644b6253a71abb11a301ca97bd2d40149586582c29844b3ad8ba2102c1959371661fc1ce1ab45767da3ba1b70a63032e1c1417db748 SHA512 6b79374b8bc3b7b69198c03cc65d954316e05efb1d5b93afcaea2bfddc371da3725272034b0893f648dd7607550ca1c7f20913de155f0c17c7b67766e472907b
diff --git a/dev-java/sparsebitset/sparsebitset-1.3.ebuild b/dev-java/sparsebitset/sparsebitset-1.3.ebuild
index 06c06a825139..d690ec5c2097 100644
--- a/dev-java/sparsebitset/sparsebitset-1.3.ebuild
+++ b/dev-java/sparsebitset/sparsebitset-1.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/SparseBitSet-SparseBitSet-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )"