From afb9284f1b14866d911748d0932347763cbf11de Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Mon, 25 Jan 2021 07:33:05 -0500 Subject: dev-java/*: bump, fixes --- dev-java/openj9-openjdk-jre-bin/Manifest | 18 ++-- .../openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild | 105 +++++++++++++++++++++ .../openj9-openjdk-jre-bin-11.0.9.11.0.23.0.ebuild | 104 -------------------- .../openj9-openjdk-jre-bin-15.0.1.9.0.23.0.ebuild | 104 -------------------- .../openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild | 105 +++++++++++++++++++++ 5 files changed, 220 insertions(+), 216 deletions(-) create mode 100644 dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild delete mode 100644 dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.9.11.0.23.0.ebuild delete mode 100644 dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.1.9.0.23.0.ebuild create mode 100644 dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild (limited to 'dev-java/openj9-openjdk-jre-bin') diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest index 94db01f..f97f382 100644 --- a/dev-java/openj9-openjdk-jre-bin/Manifest +++ b/dev-java/openj9-openjdk-jre-bin/Manifest @@ -1,8 +1,10 @@ -DIST OpenJDK11U-jre_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 42833384 SHA256 256a01e045867dcbbc541a6dd95ed315599f737b278319c4b936ce5a8a464424 -DIST OpenJDK11U-jre_ppc64le_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 42907228 SHA256 24bebd921510f1af6d2a87949943b3df70a180021bad2db868368a5e7d1bf6bb -DIST OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 42056640 SHA256 54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111 -DIST OpenJDK11U-jre_x64_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 42048354 SHA256 f596606e248b2937da5ac919c6911a1b24e113eab1d822c04d6a2e2590f226a0 -DIST OpenJDK15U-jre_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 49751865 SHA256 ea9e8225edb9fee7c425983fd8bb370327867dd06f4c9763834bde9977bfa81f -DIST OpenJDK15U-jre_ppc64le_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 49209503 SHA256 627b7ffaa3855bc49129117efaf92a66d9abb5a78df1d965d2470400d357cabd -DIST OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 49260702 SHA256 e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b -DIST OpenJDK15U-jre_x64_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 49248960 SHA256 72b8a98f3dce4b126b7d6a7d1d90ca910846ccd18d42d71a8366f5b35ba90c67 +DIST OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 40168672 SHA256 c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2 +DIST OpenJDK11U-jre_aarch64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 40143382 SHA256 45a01fe6f43cc64f852558701410910ef2318c392275a3e73309f950528753ce +DIST OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 42563320 SHA256 5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5 +DIST OpenJDK11U-jre_ppc64le_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 42447062 SHA256 8f1c5f0edb3d627098908515821f74f0815a6b6c493dfd98bb8b3f266aac0de0 +DIST OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 41736680 SHA256 7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a +DIST OpenJDK11U-jre_x64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 41724028 SHA256 f7395e402a56a3da3c9ecf192d72ccbfb57e259c399f58e9ed99a98f323b5850 +DIST OpenJDK15U-jre_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 49409848 SHA256 79f657141f1cd0e4a70d041b9215b8b00140d479ce73ed71bc4f3dd015157958 +DIST OpenJDK15U-jre_ppc64le_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 48747428 SHA256 425d79db40c0671edd21c78d9fce17be3f6d011b0b5ca4a35226194c6832d682 +DIST OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 48905528 SHA256 a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084 +DIST OpenJDK15U-jre_x64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 48896972 SHA256 e345e3896a312607235723816e53181383d6d9032240fa41079f3140e4d7c51e diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild new file mode 100644 index 0000000..4dee424 --- /dev/null +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-vm-2 toolchain-funcs versionator + +abi_uri() { + echo "${2-$1}? ( + large-heap? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz + ) + !large-heap? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_${DL_PV/+/_}.tar.gz + ) + )" +} + +JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) +DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) +SLOT=$(get_major_version) + +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" +HOMEPAGE="https://adoptopenjdk.net" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="alsa cups +gentoo-vm large-heap 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-${MY_PV}-jre" + +src_install() { + local dest="/opt/${P}" + 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 ../../../../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}-${SLOT}.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 + + if use gentoo-vm ; then + ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" + ewarn "recognised by the system. This will almost certainly break things." + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" + ewarn "will not be recognised by the system. For example, simply calling" + ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" + ewarn "fully supports Java 11. This JRE must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/opt/${P}." + fi +} diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.9.11.0.23.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.9.11.0.23.0.ebuild deleted file mode 100644 index 08c841c..0000000 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.9.11.0.23.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-vm-2 toolchain-funcs versionator - -abi_uri() { - echo "${2-$1}? ( - large-heap? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz - ) - !large-heap? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_${DL_PV/+/_}.tar.gz - ) - )" -} - -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) - -SRC_URI=" - $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" -IUSE="alsa cups +gentoo-vm large-heap 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-${MY_PV}-jre" - -src_install() { - local dest="/opt/${P}" - 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 ../../../../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}-${SLOT}.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 - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JRE must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.1.9.0.23.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.1.9.0.23.0.ebuild deleted file mode 100644 index 08c841c..0000000 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.1.9.0.23.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-vm-2 toolchain-funcs versionator - -abi_uri() { - echo "${2-$1}? ( - large-heap? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz - ) - !large-heap? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_${DL_PV/+/_}.tar.gz - ) - )" -} - -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) - -SRC_URI=" - $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" -IUSE="alsa cups +gentoo-vm large-heap 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-${MY_PV}-jre" - -src_install() { - local dest="/opt/${P}" - 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 ../../../../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}-${SLOT}.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 - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JRE must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild new file mode 100644 index 0000000..4dee424 --- /dev/null +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-vm-2 toolchain-funcs versionator + +abi_uri() { + echo "${2-$1}? ( + large-heap? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz + ) + !large-heap? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_${DL_PV/+/_}.tar.gz + ) + )" +} + +JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) +DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) +SLOT=$(get_major_version) + +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" +HOMEPAGE="https://adoptopenjdk.net" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="alsa cups +gentoo-vm large-heap 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-${MY_PV}-jre" + +src_install() { + local dest="/opt/${P}" + 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 ../../../../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}-${SLOT}.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 + + if use gentoo-vm ; then + ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" + ewarn "recognised by the system. This will almost certainly break things." + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" + ewarn "will not be recognised by the system. For example, simply calling" + ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" + ewarn "fully supports Java 11. This JRE must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/opt/${P}." + fi +} -- cgit v1.2.3-70-g09d2