dev-java/openj9-openjdk: upgrade to 0.36.x, sync ::gentoo

3 files changed, 21 insertions, 15 deletions

diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index ffc3344..e6f3473 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,6 @@
-DIST openj9-0.33.1.tar.gz 17354965 BLAKE2B c5b9c64ea45eefb2a0c67cd414844e52486481b939b8c62c68444f28f9490ebc2bf04913229576e4fff616b63ef6c242e4748a7ad9dea212714e40d9dbb3bd17 SHA512 fdb75916c868473465687c4fc15eafc1abf02ecff4c88b9998bcbc88e6583868ae3012be89f75734c08b636cf41d04946ec3e7bf29afef0575c8b1146616c9a5
-DIST openj9-omr-0.33.1.tar.gz 7932300 BLAKE2B 9fe2d80119dd7a61058d88ea04220db884e95d781f140247a95014acc80da90783849999f6fbe4e0cfb02e95675265875cbf3dfc1309c09e79226bc4d3b5c603 SHA512 b9322aba18bd487407e77f97a751c9e268577e6a03762070bb7c612276ee149891f6177affb2cabfccdacb2eb1e95c500f4a4473095651cc3f30debe10897d10
-DIST openj9-openjdk-jdk11-openj9-0.33.1.tar.gz 109332234 BLAKE2B c289f81a3fdeb4331fe11f0de7e0a6b78f784025048844b3118e5cff12c68623e989b8d776388956c8c5ed056dd91799d06e20410b0036ca7e50ffdba054eb21 SHA512 fb7e4627d1505887aeb67a1feccd3260f2f997190b9081acd5f22fbad395683e3fbefadab4073b119317744bb7afad54befa7bf9f9ceb15db59c806a5d1e4f81
-DIST openj9-openjdk-jdk17-openj9-0.33.1.tar.gz 94013661 BLAKE2B f5f4155fa3b449b09582782ac2c64a69cd37caa10dd731c6fdb0441b87149f1c867a3d622fd04c242e45a5ad9e07f55c824db1c77baa83493ef7314f63c509b9 SHA512 d5a2cefa683b2ec254db0bf636e02f312db4153c25daff41afdd41c8d8aa529aa87f60476edd229dfb5bb5cb9a67030ab67efac44282f355a9b6d5128a169a2e
+DIST openj9-0.36.0.tar.gz 17735233 BLAKE2B 5575fb674aa36c1962fbae908f96fb33a014faa3d8413ccb4e7c90d2c3c2978b3a8da2c8a7d51984e31aad48af96c6f7da2b23f6e18cd86c775c1ab9d1693d80 SHA512 d344ffb457ba28f489e200e86f381099e45cae23ae1715119236e79ec24d44fecf5b90a4db3c9f53df4e0aee0eafc5bb2813ec3f561c09771bb186195d944e1b
+DIST openj9-0.36.1.tar.gz 17735548 BLAKE2B 75bbeebcd75cbf5a198bbd69a988e0cfb6cf66c81b5268b3d1b54285957b04ee46a0fbbf5933b8ac2b2fb2891355c3433bd7cf6b24c824cbfb513c181aeb6d68 SHA512 35991f16ad39d1cb442fcbeef7de63f9131118549980630fc70d1e9f0ce41078bebb3506508b320330be3155441750952aefaf9c7e39e6ee538b9fe0cddbab5e
+DIST openj9-omr-0.36.0.tar.gz 8013184 BLAKE2B 936b2608e67a1e3787a995f48835c7b00f907c3922ac68050f40354b8fb0da2cce05b48e6689ba8c704ec3efdd5b0f1137717616a094995a4a242993739b00dc SHA512 4754636fc526eb520110a08bc0ba7194d1375af80ff1ad1b23ec99fd3c8a149c85b696ba137740e1df79c620c1377e6606c08fc6931e1b0681356d51da986cf4
+DIST openj9-omr-0.36.1.tar.gz 8013180 BLAKE2B 652d33ed82872ac97782468af75755014492e44183a127d8582731a281f1c8f57e012ba20130641a3720c8eceb1211a0f039a54b6d3c1ae98dc7df38cfa113cc SHA512 0c1c72879173812a1d7737c1c338e6cef30c2ec60ef6695616236f56bd16cde537ecce5b57efa951819bc112edc028fee643d3b4e153eb73766a3cf58bab8544
+DIST openj9-openjdk-jdk11-openj9-0.36.1.tar.gz 109563999 BLAKE2B 0d13ec90a625a57d91a7261555360e64ca0bf22798bd063461845d56ef71214a783893a55b1c2b280a986310b5daa64572d83f7195901ad45b76397e8ff589fb SHA512 77b22adc3385e5c4f1f4ac5ee4ab1980e00897862156ec7c1f78ca2286e4a61d1641cfa3b0a83d1eec8314194bb54c94f50ff5279a986bb32f06acae6bd986eb
+DIST openj9-openjdk-jdk17-openj9-0.36.0.tar.gz 94358932 BLAKE2B 6a93fb149843df526e810fa2d63409906c45d53bb4de242dfcb45a626b179d5af5ef16374d41c3fff8f00249fa0ed8f33ad96827e6f64338c97648a52c1ddd64 SHA512 b37c7a7875ac731a8df7f3ec3c28404e5a165b8cd27777fa893ff63e5e730f8992fc06d7470c448d6bb2c0e8c0b4484b33b5439915f020ec5bb4462234cca1a0
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.36.1.ebuild
index 11e1f9f..35bc082 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.36.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
 	OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
 else
 	SRC_URI="
-		https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
+		https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
 		https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz
 		https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
 	"
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
 
-IUSE="alsa cups ddr debug doc +gentoo-vm headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
+IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
 
 REQUIRED_USE="
 	javafx? ( alsa !headless-awt )
@@ -83,14 +83,14 @@ DEPEND="
 	x11-libs/libXtst
 	javafx? ( dev-java/openjfx:${SLOT}= )
 	|| (
-		dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)]
-		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+		dev-java/openj9-openjdk-bin:${SLOT}
+		dev-java/openj9-openjdk:${SLOT}
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
 	)
 "
 
-S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
+S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}"
 
 # The space required to build varies wildly depending on USE flags,
 # ranging from 3GB to 16GB. This function is certainly not exact but
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.36.0.ebuild
index 8a7494e..ca64ddd 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.36.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
 	OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
 else
 	SRC_URI="
-		https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
+		https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
 		https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz
 		https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
 	"
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
 
-IUSE="alsa cups ddr debug doc +gentoo-vm headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
+IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
 
 REQUIRED_USE="
 	javafx? ( alsa !headless-awt )
@@ -90,7 +90,7 @@ DEPEND="
 	)
 "
 
-S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
+S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}"
 
 # The space required to build varies wildly depending on USE flags,
 # ranging from 3GB to 16GB. This function is certainly not exact but
@@ -303,7 +303,7 @@ src_install() {
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
 
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
@@ -313,3 +313,7 @@ src_install() {
 		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}