dev-java/openj9-openjdk-bin: upgrade to 0.36.x, drop 18

4 files changed, 14 insertions, 137 deletions

diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index a9be015..3e60021 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,18 +1,12 @@
-DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 266165569 SHA256 56c56a608a017213c7691044dc21b301e0ad14cf4836ade0c530ac3a16511318
-DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 278563585 SHA256 d44cadcd0aaf4b43ae2052a5bbfa110086da9b466f0fce08e32c2e938ed741d1
-DIST ibm-semeru-open-debugimage_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 276015436 SHA256 419ad53dea8d29818c923a84f58060dd979beb6231b6ed19f17b1d980d10c235
-DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 334833532 SHA256 76eb77ce53a0241082946b056e191e96f3d090eac391c93569ae1a734aef37ab
-DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 349451254 SHA256 d049f1844bac2c17ca708857c02da11e0d8836e18936c0816ca11398325f2217
-DIST ibm-semeru-open-debugimage_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 343357345 SHA256 ed5005276244a06c51f0ab916ae19ce77536ba1eff6ff329424e10c609a1c015
-DIST ibm-semeru-open-debugimage_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 343385445 SHA256 a092faaee2fc7dc98549f1c90adc6e97da059fc8b03eb229c9322497fa4ce14f
-DIST ibm-semeru-open-debugimage_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 361884479 SHA256 cfba718579c05ec2ecf43eeff78930d8c4c1feb521187b0519f85ce7a1b6bccd
-DIST ibm-semeru-open-debugimage_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 355530873 SHA256 e0a3fa9021b20ca4d64bab1f4e0c123ab50ee4842fd7b34acae9dfdf642ce12b
-DIST ibm-semeru-open-jdk_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 199269440 SHA256 1fb196b4eb3e45e2337883e252955ec56a6cdeb3d7200c95ded75ab0e4f3aefa
-DIST ibm-semeru-open-jdk_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 203852153 SHA256 693604e48eef24c20d785f3a7e81e538a30e436ed36b7539a5e23e0008b2c405
-DIST ibm-semeru-open-jdk_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 205000099 SHA256 00e46a2b8be005eb03e3e4d939d4cf9b8331f22ee50ed75b84136d3f0ead7498
-DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 204694186 SHA256 b384c25ab6b5ab9787777eff2bceb6c5837765f2d5760055518d9a98810ad93d
-DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 210025609 SHA256 3158c8e46be057ddacab25a52c2ded470102f994719025ccfa77c23d1106daa9
-DIST ibm-semeru-open-jdk_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 211212622 SHA256 e111cee65c1487eb3421763f7d0fd69850e0dda34fbe295cae8b15c8219f1647
-DIST ibm-semeru-open-jdk_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 203782113 SHA256 9c5cbca0a171c7e573047744e9a753923c341f6afb38606ae68f29d6209f2c9c
-DIST ibm-semeru-open-jdk_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 207765361 SHA256 b46de9cd00af8a0223f4b50deb2627ab91fe515a69383a96fd2c12757cef24fe
-DIST ibm-semeru-open-jdk_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 209237550 SHA256 b694d47666035b1f7870bc3749aa7c1903d50976eab3772fd81c32dab2aa8e64
+DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.18_10_openj9-0.36.1.tar.gz 268253883 SHA256 c5280685c7485a5237eb559d5dae569be8daf5c990466fb3f3dd0c5669424836
+DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.6_10_openj9-0.36.0.tar.gz 281361373 SHA256 d683e6431bf51e789d371dcbbaf766689f912d2abf278178d40a0f87aac865a3
+DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.18_10_openj9-0.36.1.tar.gz 335470878 SHA256 404534d655aeb8ad519bee238032338e278b5ae0e7188f3a0d5d26505c7dc12f
+DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.6_10_openj9-0.36.0.tar.gz 350520166 SHA256 abaa23215719734a7b11e7b5b906daa580e886c64273df5b6f9f0eda78f5f18f
+DIST ibm-semeru-open-debugimage_x64_linux_11.0.18_10_openj9-0.36.1.tar.gz 346763116 SHA256 9708bc52e7236c492208c630434b19bdfd73296153087f32420aa6fc754c534a
+DIST ibm-semeru-open-debugimage_x64_linux_17.0.6_10_openj9-0.36.0.tar.gz 362929269 SHA256 1f59e42167568f83354e059131b001626d8d316d5e18c9c9cdfa6fb41b93fd58
+DIST ibm-semeru-open-jdk_aarch64_linux_11.0.18_10_openj9-0.36.1.tar.gz 199493739 SHA256 499594963aeb85293992f1ee95856f0f1642fd4de350e36766616fc47098fd02
+DIST ibm-semeru-open-jdk_aarch64_linux_17.0.6_10_openj9-0.36.0.tar.gz 204148367 SHA256 7c6ef5b4989313b2e64b77613c13ec66a3fe85429732f63b6fe9f410d9e37d3c
+DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.18_10_openj9-0.36.1.tar.gz 204988723 SHA256 8a50a75f0d01eebcec4becf1fdfc6d9dd0e3d0be1804737a529f39af44daff13
+DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.6_10_openj9-0.36.0.tar.gz 210289686 SHA256 2c9066ec2a9e759b28f2c9e3dd1a72a3b4452216443c4bec5be0ce6d1bffca84
+DIST ibm-semeru-open-jdk_x64_linux_11.0.18_10_openj9-0.36.1.tar.gz 204027251 SHA256 256135d0992f23acaf61cf955325e6a899ebbd41bb2c7fdd2fe7ac4c2ee55e38
+DIST ibm-semeru-open-jdk_x64_linux_17.0.6_10_openj9-0.36.0.tar.gz 208066877 SHA256 ce39a4f7c2e08e56083f17f3e44c05e0fbbeba775e670f015a337679c99c54c6
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.18_p10.ebuild
index 8da6a88..3eed182 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.18_p10.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.35.0
+DL_PV=${JDK_PV}_openj9-0.36.1
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.6_p10.ebuild
index 8da6a88..e3fbc59 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.6_p10.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
 }
 
 JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.35.0
+DL_PV=${JDK_PV}_openj9-0.36.0
 SLOT=$(ver_cut 1)
 
 SRC_URI="
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild
deleted file mode 100644
index 83b69ab..0000000
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-		debug? (
-			https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz
-		)
-		https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz
-	)"
-}
-
-JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.33.1
-SLOT=$(ver_cut 1)
-
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt IBM Semeru JDK 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 debug +gentoo-vm headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		media-libs/harfbuzz
-		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
-		elibc_musl? ( sys-libs/musl )
-		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}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_unpack() {
-	default
-	if [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# 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
-
-		# prefer system copy # https://bugs.gentoo.org/776676
-		rm -vf lib/libharfbuzz.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
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || 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
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && 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
-}