summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/openj9-openjdk-bin/Manifest36
-rw-r--r--dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh5
-rw-r--r--dev-java/openj9-openjdk-bin/metadata.xml1
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild)6
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild)6
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.7_p6.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild)6
-rw-r--r--dev-java/openj9-openjdk-jre-bin/Manifest18
-rw-r--r--dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh11
-rw-r--r--dev-java/openj9-openjdk-jre-bin/metadata.xml1
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.5_p8.ebuild)5
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild)5
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.17_p8.ebuild)5
-rw-r--r--dev-java/openj9-openjdk/Manifest8
-rw-r--r--dev-java/openj9-openjdk/metadata.xml1
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild)52
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild)36
16 files changed, 112 insertions, 90 deletions
diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index a9be015..998cf94 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,18 +1,18 @@
-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.27_6_openj9-0.51.0.tar.gz 392541433 SHA256 db6da3a6b41410a4a2e75aa5b733e2500730baa480be0f60f4bf79273e0dabe1
+DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 388670023 SHA256 48514a5a6a42589221360a31086ef17962cbffb6161d7e2644c6bada110480d2
+DIST ibm-semeru-open-debugimage_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 392473040 SHA256 ea43a44ca03734f6616e9cddc7c85fac0a46cca094b2ba77e853eac8c9f08e7d
+DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 406192866 SHA256 23a3b21a54649fbab4bce711571fbac747ea746782350f11b61b0027a98bd8bd
+DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 402615768 SHA256 6f0843adb3685e3a9debf6e18253748c8bf8e309075903a847e99668f44b7e3f
+DIST ibm-semeru-open-debugimage_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 406680845 SHA256 46c066f829cd752fe9d3c35f48df3269f9539655499b0f67c7497a6cb25afb16
+DIST ibm-semeru-open-debugimage_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 416188045 SHA256 49987b5f8c9cf9d4d9a267c7c735b6e9674608af7c3669765354e0600a552c14
+DIST ibm-semeru-open-debugimage_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 411832363 SHA256 fadb8e67da8af2201dde91d959f1698e5724b3ec1e4e0f5b8e3482e175fc19f7
+DIST ibm-semeru-open-debugimage_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 416057502 SHA256 747fa72c225040b1128e9d3311b5f89441730eae43132cf7b1dd4715243c5ae4
+DIST ibm-semeru-open-jdk_aarch64_linux_11.0.27_6_openj9-0.51.0.tar.gz 206134841 SHA256 41aa50c53f899ff3ae49fa84cf5e5ef218b5670ffd3822ed13df136339190417
+DIST ibm-semeru-open-jdk_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 209490355 SHA256 08a982b6fbca457718bc43d14f1e836d7aa93eeaec7cd308793f990f8a5755ed
+DIST ibm-semeru-open-jdk_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 223101860 SHA256 a2bd932fc2737f7605172dbfc4f6a1dfa262cbf9606a21cb83ba1ea94c5898e0
+DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 216745194 SHA256 e6e9fde688965274b025b998d44a84d03d27428bcb2116dc38ddfd2dd25c7699
+DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 220764693 SHA256 41831486054fab00e1ea925b465ee162ba9ad8b65420d50ff7b3dbccd11e1542
+DIST ibm-semeru-open-jdk_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 234557620 SHA256 7e094e5a25b46452ef2067be50a8b5137a1a00d9fddf47993b0a1f56e70c1632
+DIST ibm-semeru-open-jdk_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 213541898 SHA256 13aa056c7f6b4bdee89d98b319fc5894f02deb2e019023f44699928281b6df69
+DIST ibm-semeru-open-jdk_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 217452384 SHA256 7df65eeedda313cd73d28e6f46029f48b96e4d329066f0438b9b2b43aaafad59
+DIST ibm-semeru-open-jdk_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 231105498 SHA256 70228be801934a3a51761cc6ec5531b4ab52a8942efd2f0f5033ae6b24ae1423
diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh
index 2e200d9..f4e3c9a 100644
--- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh
+++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh
@@ -1,7 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="AdoptOpenJDK ${DL_PV}"
+VERSION="IBM Semeru JDK ${DL_PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openj9-openjdk-bin/metadata.xml b/dev-java/openj9-openjdk-bin/metadata.xml
index 4c0b1aa..532f0f1 100644
--- a/dev-java/openj9-openjdk-bin/metadata.xml
+++ b/dev-java/openj9-openjdk-bin/metadata.xml
@@ -8,7 +8,6 @@
</longdescription>
<use>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
- <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
<flag name="source">Install JVM sources</flag>
</use>
</pkgmetadata>
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.27_p6.ebuild
index 8da6a88..023e8ec 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.27_p6.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.51.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -28,7 +28,7 @@ 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"
+IUSE="alsa cups debug headless-awt selinux source"
RDEPEND="
>=sys-apps/baselayout-java-0.1.0-r1
@@ -110,7 +110,7 @@ src_install() {
# provide stable symlink
dosym "${P}" "/opt/${PN}-${SLOT}"
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ 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
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.15_p6.ebuild
index 8da6a88..023e8ec 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.15_p6.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.51.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -28,7 +28,7 @@ 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"
+IUSE="alsa cups debug headless-awt selinux source"
RDEPEND="
>=sys-apps/baselayout-java-0.1.0-r1
@@ -110,7 +110,7 @@ src_install() {
# provide stable symlink
dosym "${P}" "/opt/${PN}-${SLOT}"
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ 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
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-21.0.7_p6.ebuild
index 83b69ab..023e8ec 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.7_p6.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
}
JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.33.1
+DL_PV=${JDK_PV}_openj9-0.51.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -28,7 +28,7 @@ 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"
+IUSE="alsa cups debug headless-awt selinux source"
RDEPEND="
>=sys-apps/baselayout-java-0.1.0-r1
@@ -110,7 +110,7 @@ src_install() {
# provide stable symlink
dosym "${P}" "/opt/${PN}-${SLOT}"
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ 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
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index 51ce6a8..d3babd8 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,9 +1,9 @@
-DIST ibm-semeru-open-jre_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 45395879 SHA256 ab7f01a961559b49ce9b0a76af20191b7c047c6c1b6e5258e38f6c38de8cdc3f
-DIST ibm-semeru-open-jre_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 45322621 SHA256 8f934ce1745f52a067bdeb56b3b9e9192f51e674ff2956a1e53b33e44ea5ca42
-DIST ibm-semeru-open-jre_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 45244476 SHA256 cf42a289c53e6098223223326cd21a152d7102859030e23c52287d82d6d9560e
-DIST ibm-semeru-open-jre_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 48098550 SHA256 fba1dd9c25b0cce7efe124151b006624eeb2d2b0764284ca892d0e50ee457a41
-DIST ibm-semeru-open-jre_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 48355201 SHA256 d54972fb938f655a3665512c7181c2c5813e3bfe742650d6081e2f480388ef2f
-DIST ibm-semeru-open-jre_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 48263242 SHA256 57726d73c644107de26fe6c252a58f477e691b9aa81de0c23251318f87aa621b
-DIST ibm-semeru-open-jre_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 47254074 SHA256 b1d31a4165cabcad66771a05acf8ff750f40953558494ba8d88e97fac55af6a9
-DIST ibm-semeru-open-jre_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 47171747 SHA256 759f9c507e0faf53b260ee9f492bab8fdeb8091bdecad904134861714e4d913b
-DIST ibm-semeru-open-jre_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 47105731 SHA256 4fb19cedab5967359991b9bcb3be09744fc9ac027d0b773870ee7f7aaf539666
+DIST ibm-semeru-open-jre_aarch64_linux_11.0.27_6_openj9-0.51.0.tar.gz 47804344 SHA256 7aa093df03eb825d62a72a64a60e238e9fde2d36ed18f6e5418e07318ad155a2
+DIST ibm-semeru-open-jre_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 47146898 SHA256 9a44da58055525719ddb87b2fe21a02562a0897b8b537a65b7a94b1ab28f7eb0
+DIST ibm-semeru-open-jre_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 51681810 SHA256 8a140dc3806d8e0ae23ca37cff6b4cf225eea45bc82b0749c05ad5f05b9cff36
+DIST ibm-semeru-open-jre_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 52978070 SHA256 81c7c9ee709939cc66d5122f096cd36a4d1630851d275881799746b8f9d050da
+DIST ibm-semeru-open-jre_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 52265472 SHA256 e852a334a4a3f59bd8478ffe3190bbdb520fa37d8954e17fc7842ede979b15fa
+DIST ibm-semeru-open-jre_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 56894775 SHA256 c3e5287710e9a30a905e82cd0bb67a114cec08fc4a03f82798e76d22a1a7137e
+DIST ibm-semeru-open-jre_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 51392477 SHA256 73b79ace5c4e01cf5b0c002799185a5db4a601b3158c690cb204e3b618ad7b6e
+DIST ibm-semeru-open-jre_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 50712179 SHA256 c4cc045bfd63fc6412251fef184c91a1acad76d74ee48561fd48c174fb1278d3
+DIST ibm-semeru-open-jre_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 55276782 SHA256 1c439bacc90f3a119edc3a7f313512b49b21d583a960cb318094974fe5006246
diff --git a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh
index 1ad9132..ba4b8a2 100644
--- a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh
+++ b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh
@@ -1,10 +1,5 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="AdoptOpenJDK JRE ${DL_PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
+VERSION="IBM Semeru JRE ${DL_PV}"
+JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
PATH="\${JAVA_HOME}/bin"
ROOTPATH="\${JAVA_HOME}/bin"
LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
@@ -13,4 +8,4 @@ PROVIDES_TYPE="JRE"
PROVIDES_VERSION="${SLOT}"
BOOTCLASSPATH=""
GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openj9-openjdk-jre-bin/metadata.xml b/dev-java/openj9-openjdk-jre-bin/metadata.xml
index b21a054..96526d8 100644
--- a/dev-java/openj9-openjdk-jre-bin/metadata.xml
+++ b/dev-java/openj9-openjdk-jre-bin/metadata.xml
@@ -8,6 +8,5 @@
</longdescription>
<use>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
- <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
</use>
</pkgmetadata>
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.5_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild
index 624390d..3f1b111 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.5_p8.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
}
JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.35.0
+DL_PV=${JDK_PV}_openj9-0.51.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -25,12 +25,11 @@ 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 +gentoo-vm headless-awt selinux"
+IUSE="alsa cups headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
media-libs/freetype:2
- >net-libs/libnet-1.1
>=sys-apps/baselayout-java-0.1.0-r1
>=sys-libs/glibc-2.2.5:*
sys-libs/zlib
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild
index febf680..3f1b111 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
}
JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.33.1
+DL_PV=${JDK_PV}_openj9-0.51.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -25,12 +25,11 @@ 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 +gentoo-vm headless-awt selinux"
+IUSE="alsa cups headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
media-libs/freetype:2
- >net-libs/libnet-1.1
>=sys-apps/baselayout-java-0.1.0-r1
>=sys-libs/glibc-2.2.5:*
sys-libs/zlib
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.17_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild
index 624390d..3f1b111 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.17_p8.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
}
JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.35.0
+DL_PV=${JDK_PV}_openj9-0.51.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -25,12 +25,11 @@ 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 +gentoo-vm headless-awt selinux"
+IUSE="alsa cups headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
media-libs/freetype:2
- >net-libs/libnet-1.1
>=sys-apps/baselayout-java-0.1.0-r1
>=sys-libs/glibc-2.2.5:*
sys-libs/zlib
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index ffc3344..533a846 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,4 @@
-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.48.0.tar.gz 18480709 BLAKE2B 4d3d593ce295c0ba40ef32cc79f0e00b4864d2bc5d36e26c0bd0e2c3aa3406888e8a764472c212ff45ab59d092055e9e9775231fd8d979643d91d022911bd147 SHA512 28247eb763056becf881f1a3f431a073f4605d062e26bfc30a8cad86cab7b7a9a114a44faff40743957315d808a42ff7636554ff794dac640578ec75e9328749
+DIST openj9-omr-0.48.0.tar.gz 8126272 BLAKE2B d343b0129d639cd2887c98fe64b92c66ff2932537520158faa2dbaa465cfb32d6ff0c5c7bf0a5591a8f57e25f85cfc1a85f34c7f6bd9f07e04a35d5b50eb09f7 SHA512 090aee202bb7dd46fcc93f94a7168d22f3b2546d86456d40ba12aba7d76699345502aafc25ca5b675ba7683cfa2414564113c91ba31ad720d1f6867d63f70aab
+DIST openj9-openjdk-jdk11-openj9-0.48.0.tar.gz 102800187 BLAKE2B 82a04892e389a5e24c59a17d2efa95a37e092480dfbbf89f47da965179aaead0b56c1cbe26efcd905bfeb018667880faf077e410bf0d689a1b99178acf398fb4 SHA512 9288f83706aeb945a479b4478b365911408a92ac703f43418f3f98fc1beaefb008c8d0b46dd055200122a9d549da89cd727a2eef8598b7ba069cf36055d1207d
+DIST openj9-openjdk-jdk21-openj9-0.48.0.tar.gz 100484633 BLAKE2B c23d1325c8db43a7076cc589ea0a485cae2d0d26668f8da5cb2a2db2cc6b43052a7e848d04e7c66f03f7696a19690a0812f9aff92deedf7c426ede03b9aa36c7 SHA512 5b4a390c53643ee10affd5b0c6277f5ac6be873f34035c28fb7b75fca04f9e08e91b66ed505e8a5c0eb114f0cf00d6af2bb8c42f2495e3b6913cc253a7969836
diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml
index 7148c44..dadf469 100644
--- a/dev-java/openj9-openjdk/metadata.xml
+++ b/dev-java/openj9-openjdk/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="ddr">Enable Direct Dump Reader</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
- <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
<flag name="javafx">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
<flag name="jitserver">OpenJ9 JITServer support</flag>
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild
index 11e1f9f..4e7eb58 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
SLOT="$(ver_cut 1)"
OPENJ9_PV="$(ver_cut 2-4)"
@@ -18,16 +18,16 @@ 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
"
fi
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-classpath-exception"
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 )
@@ -41,7 +41,7 @@ COMMON_DEPEND="
media-libs/lcms:2=
sys-libs/zlib
media-libs/libjpeg-turbo:0=
- systemtap? ( dev-util/systemtap )
+ systemtap? ( dev-debug/systemtap )
dev-libs/elfutils
ddr? ( dev-libs/libdwarf )
@@ -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
@@ -162,9 +162,18 @@ src_prepare() {
}
src_configure() {
- # Work around stack alignment issue, bug #647954. in case we ever have x86
+ # Work around stack alignment issue, bug #647954.
use x86 && append-flags -mincoming-stack-boundary=2
+ # 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.
@@ -202,7 +211,14 @@ src_configure() {
$(use_enable jitserver)
)
+ use lto && myconf+=( --with-jvm-features=link-time-opt )
+
if use javafx; then
+ # this is not useful for users, just for upstream developers
+ # build system compares mesa version in md file
+ # https://bugs.gentoo.org/822612
+ export LEGAL_EXCLUDES=mesa3d.md
+
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
if [[ -r ${zip} ]]; then
myconf+=( --with-import-modules="${zip}" )
@@ -220,6 +236,10 @@ src_configure() {
}
src_compile() {
+ # Too brittle - gets confused by e.g. -Oline
+ export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+ unset GNUMAKEFLAGS MAKEFLAGS
+
local mycmakeargsx=(
"-DCMAKE_C_FLAGS='${CFLAGS}'"
"-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'"
@@ -282,6 +302,10 @@ src_install() {
if use doc ; then
docinto html
dodoc -r "${S}"/build/*-release/images/docs/*
- dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+ dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild
index 8a7494e..6bf8ca9 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
SLOT="$(ver_cut 1)"
OPENJ9_PV="$(ver_cut 2-4)"
@@ -18,16 +18,16 @@ 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
"
fi
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-classpath-exception"
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 lto numa selinux source systemtap"
REQUIRED_USE="
javafx? ( alsa !headless-awt )
@@ -41,7 +41,7 @@ COMMON_DEPEND="
media-libs/lcms:2=
sys-libs/zlib
media-libs/libjpeg-turbo:0=
- systemtap? ( dev-util/systemtap )
+ systemtap? ( dev-debug/systemtap )
dev-libs/elfutils
ddr? ( dev-libs/libdwarf )
@@ -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
@@ -193,6 +193,12 @@ src_configure() {
# Work around stack alignment issue, bug #647954. in case we ever have x86
use x86 && append-flags -mincoming-stack-boundary=2
+ # /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/codert_vm/thunkcrt.c:95: error: function 'icallVMprJavaSendVirtualL' redeclared as variable
+ # 95 | extern void * icallVMprJavaSendVirtualL;
+ # /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/compiler/runtime/Runtime.cpp:341:1: note: previously declared here
+ # 341 | JIT_HELPER(icallVMprJavaSendVirtualL);
+ filter-lto
+
# 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.
@@ -221,7 +227,7 @@ src_configure() {
--with-vendor-version-string="${PVR}"
--with-version-pre=""
--with-zlib=system
- --enable-dtrace=$(usex systemtap yes no)
+ --enable-jvm-feature-dtrace=$(usex systemtap yes no)
--enable-headless-only=$(usex headless-awt yes no)
$(tc-is-clang && echo "--with-toolchain-type=clang")
@@ -230,6 +236,8 @@ src_configure() {
$(use_enable jitserver)
)
+ 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
@@ -269,7 +277,7 @@ src_compile() {
OPENJ9_TAG=${OPENJ9_P}
OPENJ9OMR_SHA=${OPENJ9_P}
)
- emake "${myemakeargs[@]}" -j1 #nowarn
+ emake "${myemakeargs[@]}" -j1
}
src_install() {
@@ -298,12 +306,12 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# 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 +321,7 @@ src_install() {
dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
generated by cgit v1.2.3-70-g09d2 (git 2.50.0) at 2025-07-01 07:34:16 +0000