summaryrefslogtreecommitdiff
path: root/dev-java/openj9-openjdk-jre-bin
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/openj9-openjdk-jre-bin')
-rw-r--r--dev-java/openj9-openjdk-jre-bin/Manifest12
-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.21_p9.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.15.10.0.32.0.ebuild)7
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.3.7.0.32.0.ebuild)7
5 files changed, 15 insertions, 23 deletions
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index 11eda36..3c2aca6 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,6 +1,6 @@
-DIST ibm-semeru-open-jre_aarch64_linux_11.0.15_10_openj9-0.32.0.tar.gz 45000822 SHA256 69e4a0b383c7b4187478ddb196de3cdc91560e2be40b8ef66354591e87c36e85
-DIST ibm-semeru-open-jre_aarch64_linux_17.0.3_7_openj9-0.32.0.tar.gz 44737346 SHA256 f899948ea0c5dc80a66f801db585939a25a4ae7e1f21a9a8f3bf3749c3baa87f
-DIST ibm-semeru-open-jre_ppc64le_linux_11.0.15_10_openj9-0.32.0.tar.gz 47560053 SHA256 5e82f7df54786c557d2d9e9ac22df655fd94b9702c73261390903ac87532d545
-DIST ibm-semeru-open-jre_ppc64le_linux_17.0.3_7_openj9-0.32.0.tar.gz 47330809 SHA256 9c54166490ac55a6bd26249b57eae5df4531635f4871e6642e7979affc894875
-DIST ibm-semeru-open-jre_x64_linux_11.0.15_10_openj9-0.32.0.tar.gz 46879082 SHA256 25d4d5e2bbe3eb19bcb9a76aec4b43d4eef5ad66200df3122118f69da5325cf6
-DIST ibm-semeru-open-jre_x64_linux_17.0.3_7_openj9-0.32.0.tar.gz 46954980 SHA256 dad35fec82047e3a82c6e2dda8b53ee763b55aaedaed13b7b130856f4a3ffd35
+DIST ibm-semeru-open-jre_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 46724041 SHA256 5eb5d5d6006e1066b5c72d3b000f1c8fda572fa64189af103ef1176235cd3174
+DIST ibm-semeru-open-jre_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 46616927 SHA256 9760aa27a5790a8c20a702ff5f036535f3df51d3fb291bb5254b5ae76e096bad
+DIST ibm-semeru-open-jre_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 48848011 SHA256 0495d4d122dfb7ae160d9c76549f62fdd77b9c8ceddc9d4aced882c3c5157ba5
+DIST ibm-semeru-open-jre_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 49098475 SHA256 73b9baab2766191de5da00498f2dcfe9de90fff6c4c457bea4944f103c6dde6e
+DIST ibm-semeru-open-jre_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 48023048 SHA256 324f7e8d75490cc76d5cf6a46b43f50ec1206a97d49e1549d1c65f1583fc51d5
+DIST ibm-semeru-open-jre_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 47935029 SHA256 1caf409f33f7738efe37742197525b5ae6244d6383b2017e7b8e925dc0b6a329
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-11.0.15.10.0.32.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.21_p9.ebuild
index c121b1e..7aa42d8 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.15.10.0.32.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.21_p9.ebuild
@@ -11,8 +11,8 @@ abi_uri() {
)"
}
-JDK_PV=$(ver_cut 1-3)+$(ver_cut 4)
-DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7)
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.41.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-17.0.3.7.0.32.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild
index c121b1e..7aa42d8 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.3.7.0.32.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild
@@ -11,8 +11,8 @@ abi_uri() {
)"
}
-JDK_PV=$(ver_cut 1-3)+$(ver_cut 4)
-DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7)
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.41.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