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/Manifest15
-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.17_p8.ebuild)5
-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.5_p8.ebuild)5
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild86
6 files changed, 13 insertions, 110 deletions
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index 51ce6a8..3c2aca6 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,9 +1,6 @@
-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.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.17_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.21_p9.ebuild
index 624390d..7aa42d8 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-11.0.21_p9.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.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.5_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild
index 624390d..7aa42d8 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-17.0.9_p9.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.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-18.0.2_p9.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild
deleted file mode 100644
index febf680..0000000
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.33.1
-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 +gentoo-vm 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
- 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
-}
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-18 11:46:34 +0000