4 files changed, 96 insertions, 8 deletions
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index b5f1556..9c4e476 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,6 +1,9 @@
-DIST ibm-semeru-open-jre_aarch64_linux_11.0.25_9_openj9-0.48.0.tar.gz 47322074 SHA256 3ebe7dc3fc6d7a0145d8834d01ca5adda19c1812af9a4f63655bc4de463377b6
-DIST ibm-semeru-open-jre_aarch64_linux_21.0.5_11_openj9-0.48.0.tar.gz 50933676 SHA256 27fb02bb8e409c5330bbed15f6dce74c3f8255c1f2ef937a697c1b903ca9477a
-DIST ibm-semeru-open-jre_ppc64le_linux_11.0.25_9_openj9-0.48.0.tar.gz 52469157 SHA256 451c6da5d286af654d857c2383698c19e9f05070b8e018f73f82ab1df1c51ba3
-DIST ibm-semeru-open-jre_ppc64le_linux_21.0.5_11_openj9-0.48.0.tar.gz 56106709 SHA256 ab533e7d609382cda4e5abee38102f8a467f24db77886fa0f4c680d681cdf87f
-DIST ibm-semeru-open-jre_x64_linux_11.0.25_9_openj9-0.48.0.tar.gz 51220370 SHA256 7d8407bbc68303e84615d1981abbdda690236edfcff5535789dc7915a3c4f629
-DIST ibm-semeru-open-jre_x64_linux_21.0.5_11_openj9-0.48.0.tar.gz 55086666 SHA256 3cd0ac0e28ad83fe9097569c6ba0c84772d697c1a34fa5b93c9fcbe0493d43c8
+DIST ibm-semeru-open-jre_aarch64_linux_11.0.26_4_openj9-0.49.0.tar.gz 47702776 SHA256 2425d0daa7c0ef6603910c1c51ed7f3d8dbeb4dff8e1542957771ac5045fc21e
+DIST ibm-semeru-open-jre_aarch64_linux_17.0.14_7_openj9-0.49.0.tar.gz 47041849 SHA256 f26b2b2d8654a09fade4c0ce5819e72e00f1e751bb11a4731537e834900c3282
+DIST ibm-semeru-open-jre_aarch64_linux_21.0.6_7_openj9-0.49.0.tar.gz 51591397 SHA256 1090db3f7b30b4a45e3d5f228ac529ace87000bd9b342d91a639f0181a0058f5
+DIST ibm-semeru-open-jre_ppc64le_linux_11.0.26_4_openj9-0.49.0.tar.gz 52506982 SHA256 d013d38e03a3455c6867b10544dc30041bf7afdb595d60ee09af43d46cdb5720
+DIST ibm-semeru-open-jre_ppc64le_linux_17.0.14_7_openj9-0.49.0.tar.gz 51677267 SHA256 578a651e9e26de4ec30612afbd69c2530c8ed37db2c46bc62eb6a39dfa35c080
+DIST ibm-semeru-open-jre_ppc64le_linux_21.0.6_7_openj9-0.49.0.tar.gz 56159039 SHA256 ece962ee7ce419e25048a89228b61c4ce8c318ec6fade470484d6537bb87ea3f
+DIST ibm-semeru-open-jre_x64_linux_11.0.26_4_openj9-0.49.0.tar.gz 51312021 SHA256 08586859b8a53aa9d5424a38838e8332664622049c3c33b1b0e5ea88b56ce2d9
+DIST ibm-semeru-open-jre_x64_linux_17.0.14_7_openj9-0.49.0.tar.gz 50639277 SHA256 e2469f16a616ee467d6a590ec043ee9464b039d2f9859327dd36d50953cd60bf
+DIST ibm-semeru-open-jre_x64_linux_21.0.6_7_openj9-0.49.0.tar.gz 55202515 SHA256 cca7d1599ff83063dd16965dcbf91915a7654e5086f3b3b71744adf7769d11de
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.25_p9.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.26_p4.ebuild
index 8e9a88f..4f5ad3b 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.25_p9.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.26_p4.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.48.0
+DL_PV=${JDK_PV}_openj9-0.49.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.5_p11.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.14_p7.ebuild
index 8e9a88f..4f5ad3b 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.5_p11.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.14_p7.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.48.0
+DL_PV=${JDK_PV}_openj9-0.49.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild
new file mode 100644
index 0000000..4f5ad3b
--- /dev/null
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+		https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jre_${1}_linux_${DL_PV/+/_}.tar.gz
+	)"
+}
+
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.49.0
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM"
+HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${JDK_PV}-jre"
+
+src_install() {
+	local dest="/opt/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}