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-bin/Manifest | 40 ++- .../openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild | 129 ++++++++ .../openj9-openjdk-bin-11.0.9.11.0.23.0.ebuild | 128 -------- .../openj9-openjdk-bin-15.0.1.9.0.23.0.ebuild | 128 -------- .../openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild | 129 ++++++++ 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 +++++++ dev-java/openj9-openjdk/Manifest | 8 +- .../files/openjdk-src-doubledollar.patch | 28 -- .../openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild | 341 --------------------- .../openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild | 341 +++++++++++++++++++++ .../openj9-openjdk/openj9-openjdk-11.9999.ebuild | 4 +- .../openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild | 300 ------------------ .../openj9-openjdk/openj9-openjdk-15.0.24.0.ebuild | 299 ++++++++++++++++++ .../openj9-openjdk/openj9-openjdk-15.9999.ebuild | 3 +- dev-java/openjdk-bin/Manifest | 10 +- dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild | 112 ------- dev-java/openjdk-bin/openjdk-bin-15.0.2_p7.ebuild | 112 +++++++ dev-java/openjdk-jre-bin/Manifest | 5 +- .../openjdk-jre-bin-15.0.1_p9.ebuild | 97 ------ .../openjdk-jre-bin-15.0.2_p7.ebuild | 100 ++++++ dev-java/openjdk/Manifest | 2 +- .../openjdk/files/openjdk-src-doubledollar.patch | 28 -- dev-java/openjdk/openjdk-15.0.1_p9.ebuild | 243 --------------- dev-java/openjdk/openjdk-15.0.2_p7.ebuild | 242 +++++++++++++++ 28 files changed, 1613 insertions(+), 1652 deletions(-) create mode 100644 dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild delete mode 100644 dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.9.11.0.23.0.ebuild delete mode 100644 dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.1.9.0.23.0.ebuild create mode 100644 dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild 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 delete mode 100644 dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch delete mode 100644 dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild create mode 100644 dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild delete mode 100644 dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild create mode 100644 dev-java/openj9-openjdk/openj9-openjdk-15.0.24.0.ebuild delete mode 100644 dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild create mode 100644 dev-java/openjdk-bin/openjdk-bin-15.0.2_p7.ebuild delete mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.1_p9.ebuild create mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.2_p7.ebuild delete mode 100644 dev-java/openjdk/files/openjdk-src-doubledollar.patch delete mode 100644 dev-java/openjdk/openjdk-15.0.1_p9.ebuild create mode 100644 dev-java/openjdk/openjdk-15.0.2_p7.ebuild diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest index c9b3495..acf123f 100644 --- a/dev-java/openj9-openjdk-bin/Manifest +++ b/dev-java/openj9-openjdk-bin/Manifest @@ -1,16 +1,24 @@ -DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 274330919 SHA256 ce49978d6a43d7386b5446a7d89e417bdd3b59d1fa9373ee3be82ade5cf7bf73 -DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 275050948 SHA256 950e49597c3eda231a842290faebc804ba3b12f78be2e72945101b4a525aa993 -DIST OpenJDK11U-debugimage_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 283655449 SHA256 b3ff0ffa6261552344d1f0e9a70764fc364c8a86f4363d02215483953f28da41 -DIST OpenJDK11U-debugimage_x64_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 283696856 SHA256 f9d6f4b5e1a980cc18cf2134ed97a64125576a952f9f974ca6401f0df17a402f -DIST OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 198038055 SHA256 acef470ed75f6938168c39b4397fc80ef0d4e12adf1b73e359c84233c08d30e3 -DIST OpenJDK11U-jdk_ppc64le_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 198026528 SHA256 15aa2aed41894145bbfa75c902167506245b9e1e4d8137001e5c05f3cd5bbeae -DIST OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 196214601 SHA256 812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091 -DIST OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 196194229 SHA256 65242e4aeb0162fb92c1d3903eda0fdd4b1b05277dbd2c4c9910cfeb48a79063 -DIST OpenJDK15U-debugimage_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 78543674 SHA256 b5c362e6fcfe80030dd7092872f3d33d4c1ab72f3ec832294a8815fab7190ad4 -DIST OpenJDK15U-debugimage_ppc64le_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 78477900 SHA256 bde5846162ba53a347e434b9f83708eda22377b44e8e331be5deac07e5add7f8 -DIST OpenJDK15U-debugimage_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 76894599 SHA256 7182fa71785a774762310fe2ac3d23de1860902001f153d70dc167709e4ec51a -DIST OpenJDK15U-debugimage_x64_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 76953451 SHA256 26aaf1c7d02417a9b1f0b033468b68526d79dc391124d8d43a56d9cd1f2028f8 -DIST OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 197776302 SHA256 26b083d7b1bcb31040210c02ce33b4fb28ed5ad92de72a3e681e51e04d6beb5c -DIST OpenJDK15U-jdk_ppc64le_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 196711663 SHA256 6bd3af790febbf1080dd3bbc4ae985d6bf7b4b47dc59fd649cca0b384d0eddd4 -DIST OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 196800767 SHA256 b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d -DIST OpenJDK15U-jdk_x64_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 196771540 SHA256 2dd1dac8526a07440fc890a3269b4bd9250e1c01c5120c3f36381204541eca23 +DIST OpenJDK11U-debugimage_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 225447217 SHA256 78b4a686078de9430afd87150ceb67b7cfab860785879828fbfa3fe8aa4f37af +DIST OpenJDK11U-debugimage_aarch64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 225507764 SHA256 84cc44c6b375d0a43098b56cdd52d62eee3f9a95fa545d4fa6f3ea6330c0d87f +DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 275321533 SHA256 95f6d118d3d1dc935f5b38e129ad72c77af687f041577926f629ddf5e7b0fce3 +DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 274781433 SHA256 dba2c391708c04b42fd17f9cd6ef33096aea17c8a4d420560e9ce69f96e88091 +DIST OpenJDK11U-debugimage_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 284307056 SHA256 cd7febf1e729dc0f100f582d43e4107d85a98309f6cad80da9630f1ead597051 +DIST OpenJDK11U-debugimage_x64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 284367698 SHA256 cb62d12a4a026875cd5c6d6232682e516cf89a10ae9609afbc17a34802bd4e37 +DIST OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 192322461 SHA256 0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41 +DIST OpenJDK11U-jdk_aarch64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 192280518 SHA256 b7e91059b608d91bb90a6dcf228189bbae83af40fbc498ce6859aef03e61268a +DIST OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 197354935 SHA256 858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed +DIST OpenJDK11U-jdk_ppc64le_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 197335380 SHA256 761828b59cf1626bb8b466f3ae241aa9c0f66799d8871145a789f45b646da73b +DIST OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 195601773 SHA256 941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f +DIST OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 195586375 SHA256 d43052b83965d966db8d308e3b2043a17134255dbcd4837c312fe9dcc10dccf9 +DIST OpenJDK15U-debugimage_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 72517210 SHA256 5a9526e6fdc2ba1e1d549bd8bb27425769cc8e6b236e091a2e8e99e08e8c0c40 +DIST OpenJDK15U-debugimage_aarch64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 72577472 SHA256 5c6c1dce95ffc07d6259bd40f832b0b73fb0d712990461c4ff12d6fbdaba8550 +DIST OpenJDK15U-debugimage_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 78084770 SHA256 775faa914c682d3f948260d7542c0fabf5f133ebbc5dcc0207c49c6c2874a3ef +DIST OpenJDK15U-debugimage_ppc64le_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 77821851 SHA256 bcacd5a3c7b9ae60ebe2d2861dacc9df959b2320a529d1aa3629e809883852b9 +DIST OpenJDK15U-debugimage_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 76427443 SHA256 2a28a900213dc773d801d416d5bf2c3da37fb2754791e3c728421e830e308506 +DIST OpenJDK15U-debugimage_x64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 76476865 SHA256 fddce9de2ce1314fa3f7a80f89cc5de6a2394717cbfe679531ad7b931da30536 +DIST OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 192179566 SHA256 b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314 +DIST OpenJDK15U-jdk_aarch64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 192160332 SHA256 0ad9c9938764b82e4b449689335d53b3e1f34268465d73b2596b4ca4dadb10a2 +DIST OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 197145939 SHA256 5b2158268de0be247801b7823ee3e7f739254d77718a1879848627181feee2f4 +DIST OpenJDK15U-jdk_ppc64le_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 196100186 SHA256 6e4134862273400f00a6512c09888f513be570cd18f728aadb857ae086326694 +DIST OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 196165917 SHA256 5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816 +DIST OpenJDK15U-jdk_x64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 196145159 SHA256 216246eed35a53486601d0fbf8c085ac4916f7c8fd270ca5cdeb3ec47882a2df diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild new file mode 100644 index 0000000..757cfbb --- /dev/null +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild @@ -0,0 +1,129 @@ +# 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? ( + debug? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_linuxXL_${DL_PV//+/_}.tar.gz + ) + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_linuxXL_${DL_PV//+/_}.tar.gz + ) + !large-heap? ( + debug? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_${DL_PV//+/_}.tar.gz + ) + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-jdk_${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 JDK binaries provided by AdoptOpenJDK" +HOMEPAGE="https://adoptopenjdk.net" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="alsa cups debug +gentoo-vm headless-awt large-heap selinux source" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >=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}" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +do_rm() { + rm -v $1 || die + if use debug ; then + rm -v "${S}-debug-image"/$1 || die + fi +} + +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. + do_rm 'lib/libfreetype.*' + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + do_rm 'lib/libjsound.*' + fi + + if use headless-awt ; then + do_rm 'lib/lib*{[jx]awt,splashscreen}*' + fi + + if ! use source ; then + rm -v lib/src.zip || 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 JDK" + ewarn "recognised by the system. This will almost certainly break" + ewarn "many java ebuilds as they are not ready for openjdk-11" + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" + 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 JDK must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/opt/${P}." + fi +} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.9.11.0.23.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.9.11.0.23.0.ebuild deleted file mode 100644 index be69cfd..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.9.11.0.23.0.ebuild +++ /dev/null @@ -1,128 +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? ( - debug? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_linuxXL_${DL_PV//+/_}.tar.gz - ) - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_linuxXL_${DL_PV//+/_}.tar.gz - ) - !large-heap? ( - debug? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_${DL_PV//+/_}.tar.gz - ) - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-jdk_${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 JDK binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt large-heap selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=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}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -do_rm() { - rm -v $1 || die - if use debug ; then - rm -v "${S}-debug-image"/$1 || die - fi -} - -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. - do_rm 'lib/libfreetype.*' - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - do_rm 'lib/libjsound.*' - fi - - if use headless-awt ; then - do_rm 'lib/lib*{[jx]awt,splashscreen}*' - fi - - if ! use source ; then - rm -v lib/src.zip || 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 JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - 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 JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.1.9.0.23.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.1.9.0.23.0.ebuild deleted file mode 100644 index c3b8f55..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.1.9.0.23.0.ebuild +++ /dev/null @@ -1,128 +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? ( - debug? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz - ) - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz - ) - !large-heap? ( - debug? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_${DL_PV/+/_}.tar.gz - ) - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${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 JDK binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt large-heap selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=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}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -do_rm() { - rm -v $1 || die - if use debug ; then - rm -v "${S}-debug-image"/$1 || die - fi -} - -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. - do_rm 'lib/libfreetype.*' - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - do_rm 'lib/libjsound.*' - fi - - if use headless-awt ; then - do_rm 'lib/lib*{[jx]awt,splashscreen}*' - fi - - if ! use source ; then - rm -v lib/src.zip || 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 JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - 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 JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild new file mode 100644 index 0000000..2f0299a --- /dev/null +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild @@ -0,0 +1,129 @@ +# 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? ( + debug? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz + ) + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz + ) + !large-heap? ( + debug? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_${DL_PV/+/_}.tar.gz + ) + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${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 JDK binaries provided by AdoptOpenJDK" +HOMEPAGE="https://adoptopenjdk.net" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="alsa cups debug +gentoo-vm headless-awt large-heap selinux source" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >=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}" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +do_rm() { + rm -v $1 || die + if use debug ; then + rm -v "${S}-debug-image"/$1 || die + fi +} + +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. + do_rm 'lib/libfreetype.*' + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + do_rm 'lib/libjsound.*' + fi + + if use headless-awt ; then + do_rm 'lib/lib*{[jx]awt,splashscreen}*' + fi + + if ! use source ; then + rm -v lib/src.zip || 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 JDK" + ewarn "recognised by the system. This will almost certainly break" + ewarn "many java ebuilds as they are not ready for openjdk-11" + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" + 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 JDK must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/opt/${P}." + fi +} 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 +} diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest index 25edd77..52352f6 100644 --- a/dev-java/openj9-openjdk/Manifest +++ b/dev-java/openj9-openjdk/Manifest @@ -1,4 +1,4 @@ -DIST openj9-0.23.0.tar.gz 16294665 BLAKE2B 315224fe6fff758cf9994e9673b3ab744f15803ef6ebfb3c68526bff248a8f64dc87102eef3e65702e15ceeda87ca0c5862d0b87867795f183b0ee63bd3e2638 SHA512 ac14e2a77f0c7cc5b637004fd6fa976730b7dc3f95102fee7ccec233d17836c1bf02790a900702d1c72929191f8cbf458a6ebfd85babc7c292fbb173c7f6e2e3 -DIST openj9-omr-0.23.0.tar.gz 7817276 BLAKE2B 541e377043b311deebb0d0bfb67dbb82911582459a21839b392fe1bf25b6bb3727b129e1ffce8a6219b903d27779b208371c709848de747123ed9ecb00c9b58c SHA512 324d0a715aba7a6ad9da534b4214f7d4fff6abefafdf7214acb2722a3e6f8d01dfb9671362c839e6db9aa2d73430887f7a54ed2d393ad56c19cb9c9526968d46 -DIST openj9-openjdk-jdk11-openj9-0.23.0.tar.gz 104445879 BLAKE2B df045eb377c426153a6010ee02dc6f66b525a32453b7f66cbbe65439a65481145d7506391cf4748b534710792f5396c210aa827efc3a85fa28684e8c2839fdc0 SHA512 905abc83a1a6594dcbd1b5e127404e6fcacfa9478000d46ec1211bbc59558825df884d39437d77102029a7b312043920a865e0b5a0d71640ab1efec41d9e3671 -DIST openj9-openjdk-jdk15-openj9-0.23.0.tar.gz 88610962 BLAKE2B 4c201d46765d360efcb219924f5b0c028f036097bf2fa8a8953a8830bb5c88c2eeae735b26ebfec8e63e728c427be9dadfbc80750587d9ac01916ea10982a59c SHA512 7c7d76302ad7674b1ce3d64f0e1184d9150c3fb433ae5c2176bd1e2d5b22f4c7bd0b157ee3900ffdb32a227f1a0e932e34c677038502e270adfdc018eac3918a +DIST openj9-0.24.0.tar.gz 16399910 BLAKE2B e2f5e03abe0c87fb175bdbdfd4b1b4b7167460eab1d41f4afe9ede962dfb68c60314262c4cb4dc90360787d67c97e8b9a99cf4b167e249038cd6c4dc0392284e SHA512 c42faa4d10a509d20e14fc915c352f52423cf6f2ec0930a43feb12e910bbbd672bd3a8674851252410c80eb8a7a649198167364e5053bdf4649bf6927189bbd0 +DIST openj9-omr-0.24.0.tar.gz 7799995 BLAKE2B b1937e579d4611dc7bd6d9f747f7e443b5ebbdc108ae3346c7dd494023fa998f9c6d2c0cd5f65dd1fb38d6c3212d4a22fca7b05973135f83b29e26babbb5c959 SHA512 c1cf0366fd1f14436bb66b4c928792a1485330940a6d8fc97be9b7a31bc5c5f28c48d06d7600263d203665ad4882955bb66da2af00ee4e59e57d97c811242be0 +DIST openj9-openjdk-jdk11-openj9-0.24.0.tar.gz 108666016 BLAKE2B 683265b1f26ef2d568cd1df8fae7d20e5e612668f5bdbd624d916a8a0017a71102568e222967a63d88796ca574a21a2c1c3d69dc8e29ab207de74a65290b8ba2 SHA512 e75cd99d20fd672695475d53a42e2843fb90d178744e1fd65fc1b52a0f30b13ab9a2bf7c413a01bea9e45136283039095cc108fe7ead9dca7ade7608dea06e7c +DIST openj9-openjdk-jdk15-openj9-0.24.0.tar.gz 88602073 BLAKE2B b3cc1abe06f18ff6e8e42905be2611b2fe237105e6ecfe5610c6454a50d10a1ed940b89088444567c59aba5d86eace2263d76f72157cb4034c9371dd6cfed256 SHA512 4f08e79422f41b2bb53041b729c0620912b6b714b6318ff78047594e822f9d495412e522f0b760443ef44f7de42a457b6790f2b6d4853fe11da0704ab54be45e diff --git a/dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch b/dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch deleted file mode 100644 index c1497d5..0000000 --- a/dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0601ac847afc86e9010685bb85d82a00a33355b5 Mon Sep 17 00:00:00 2001 -From: erikj -Date: Mon, 2 Nov 2020 06:18:08 -0800 -Subject: [PATCH] Add DoubleDollar call to protect java class file names with - dollar in them - ---- - make/common/JavaCompilation.gmk | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk -index 444ded0fc06..bedb971115b 100644 ---- a/make/common/JavaCompilation.gmk -+++ b/make/common/JavaCompilation.gmk -@@ -311,9 +311,11 @@ define SetupJavaCompilationBody - ifneq ($$($1_KEEP_DUPS), true) - # Remove duplicate source files by keeping the first found of each duplicate. - # This allows for automatic overrides with custom or platform specific versions -- # source files. -+ # source files. Need to call DoubleDollar as we have java classes with '$' in -+ # their names. - $1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \ -- $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \ -+ $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), \ -+ $$(call DoubleDollar, $$(s)))) \ - $$(if $$($1_$$(relative_src)), \ - , \ - $$(eval $1_$$(relative_src) := 1) $$(s)))) diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild deleted file mode 100644 index 73e6a3e..0000000 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild +++ /dev/null @@ -1,341 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs versionator - -SLOT="$(get_major_version)" -OPENJ9_PV="$(get_version_component_range 2-4)" -OPENJ9_P=openj9-${OPENJ9_PV} -FREEMARKER_PV=2.3.30 - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" -if [[ ${OPENJ9_PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git" - OPENJ9_EGIT_REPO_URI="https://github.com/eclipse/openj9.git" - OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git" -else - SRC_URI=" - 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 -> ${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" -KEYWORDS="~amd64" - -IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) - - dev-libs/elfutils - dev-libs/libdwarf - sys-process/numactl -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - dev-lang/nasm - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) - || ( - virtual/jdk:${SLOT} - dev-java/openj9-openjdk-bin:${SLOT} - dev-java/openj9-openjdk:${SLOT} - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) - || ( - dev-java/freemarker-bin - dev-java/freemarker - ) -" - -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -if [[ ${OPENJ9_PV} == 9999 ]]; then - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}" -else - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}" -fi - -# The space required to build varies wildly depending on USE flags, -# ranging from 3GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=3192 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - JAVA_PKG_WANT_BUILD_VM="openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT} openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ -z ${JDK_HOME} ]]; then - for slot in ${SLOT} $((SLOT-1)); do - for variant in openj9- ''; do - if has_version --host-root dev-java/${variant}openjdk:${slot}; then - JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${slot} - break - elif has_version --host-root dev-java/${variant}openjdk-bin:${slot}; then - JDK_HOME=$(best_version --host-root dev-java/${variant}openjdk-bin:${slot}) - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - break - fi - done - done - fi - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - export JDK_HOME - fi -} - -src_unpack() { - if [[ ${OPENJ9_PV} == 9999 ]]; then - EGIT_CHECKOUT_DIR=openj9 EGIT_REPO_URI=${OPENJ9_EGIT_REPO_URI} git-r3_src_unpack - EGIT_CHECKOUT_DIR=openj9-omr EGIT_REPO_URI=${OPENJ9_OMR_EGIT_REPO_URI} git-r3_src_unpack - # unpack openjdk last to save correct EGIT_VERSION - EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack - else - default - fi -} - -src_prepare() { - if [[ ${OPENJ9_PV} == 9999 ]]; then - ln -s ../openj9 openj9 || die - ln -s ../openj9-omr omr || die - else - ln -s ../openj9-${OPENJ9_P} openj9 || die - ln -s ../openj9-omr-${OPENJ9_P} omr || die - fi - - default - - eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch" - eapply -d omr -- "${FILESDIR}/omr-fam.patch" - - if [[ ${OPENJ9_PV} != 9999 ]]; then - sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ - -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \ - -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ - closed/OpenJ9.gmk - fi - - chmod +x configure || die -} - -src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - if has_version dev-java/freemarker; then - local freemarker=freemarker - else - local freemarker=freemarker-bin - fi - - # 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. - - local myconf=( - --disable-ccache - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-stdc++lib=dynamic - --with-giflib=system - --with-lcms=system - --with-libjpeg=system - --with-libpng=system - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PVR}" - --with-version-pre="" - --with-version-opt="" - --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - - --with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar) - --disable-warnings-as-errors{,-omr,-openj9} - $(use_enable ddr) - $(use_with large-heap noncompressedrefs) - ) - - if use javafx; then - local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -src_compile() { - local myemakeargs=( - JOBS=$(makeopts_jobs) - # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 - #LOG=debug - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 #nowarn -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym ../../../../../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_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - 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 ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi -} diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild new file mode 100644 index 0000000..df02e9d --- /dev/null +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild @@ -0,0 +1,341 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs versionator + +SLOT="$(get_major_version)" +OPENJ9_PV="$(get_version_component_range 2-4)" +OPENJ9_P=openj9-${OPENJ9_PV} +FREEMARKER_PV=2.3.30 + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.java.net" +if [[ ${OPENJ9_PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git" + OPENJ9_EGIT_REPO_URI="https://github.com/eclipse/openj9.git" + 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/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" +KEYWORDS="~amd64" + +IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + media-libs/libpng:0= + media-libs/lcms:2= + sys-libs/zlib + virtual/jpeg:0= + systemtap? ( dev-util/systemtap ) + + dev-libs/elfutils + dev-libs/libdwarf + sys-process/numactl +" + +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + dev-lang/nasm + media-libs/alsa-lib + net-print/cups + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + javafx? ( dev-java/openjfx:${SLOT}= ) + || ( + virtual/jdk:${SLOT} + dev-java/openj9-openjdk-bin:${SLOT} + dev-java/openj9-openjdk:${SLOT} + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) + || ( + dev-java/freemarker-bin + dev-java/freemarker + ) +" + +REQUIRED_USE="javafx? ( alsa !headless-awt )" + +if [[ ${OPENJ9_PV} == 9999 ]]; then + S="${WORKDIR}/openj9-openjdk-jdk${SLOT}" +else + S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}" +fi + +# The space required to build varies wildly depending on USE flags, +# ranging from 3GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=3192 + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + fi +} + +pkg_setup() { + openjdk_check_requirements + java-vm-2_pkg_setup + + JAVA_PKG_WANT_BUILD_VM="openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT} openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + + # The nastiness below is necessary while the gentoo-vm USE flag is + # masked. First we call java-pkg-2_pkg_setup if it looks like the + # flag was unmasked against one of the possible build VMs. If not, + # we try finding one of them in their expected locations. This would + # have been slightly less messy if openjdk-bin had been installed to + # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env + # file but disable it so that it would not normally be selectable. + + local vm + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then + java-pkg-2_pkg_setup + return + fi + done + + if [[ ${MERGE_TYPE} != binary ]]; then + if [[ -z ${JDK_HOME} ]]; then + for slot in ${SLOT} $((SLOT-1)); do + for variant in openj9- ''; do + if has_version --host-root dev-java/${variant}openjdk:${slot}; then + JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${slot} + break + elif has_version --host-root dev-java/${variant}openjdk-bin:${slot}; then + JDK_HOME=$(best_version --host-root dev-java/${variant}openjdk-bin:${slot}) + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} + break + fi + done + done + fi + [[ -n ${JDK_HOME} ]] || die "Build VM not found!" + export JDK_HOME + fi +} + +src_unpack() { + if [[ ${OPENJ9_PV} == 9999 ]]; then + EGIT_CHECKOUT_DIR=openj9 EGIT_REPO_URI=${OPENJ9_EGIT_REPO_URI} git-r3_src_unpack + EGIT_CHECKOUT_DIR=openj9-omr EGIT_REPO_URI=${OPENJ9_OMR_EGIT_REPO_URI} git-r3_src_unpack + # unpack openjdk last to save correct EGIT_VERSION + EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack + else + default + fi +} + +src_prepare() { + if [[ ${OPENJ9_PV} == 9999 ]]; then + ln -s ../openj9 openj9 || die + ln -s ../openj9-omr omr || die + else + ln -s ../openj9-${OPENJ9_P} openj9 || die + ln -s ../openj9-omr-${OPENJ9_P} omr || die + fi + + default + + eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch" + eapply -d omr -- "${FILESDIR}/omr-fam.patch" + + if [[ ${OPENJ9_PV} != 9999 ]]; then + sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ + -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \ + -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ + closed/OpenJ9.gmk + fi + + chmod +x configure || die +} + +src_configure() { + # Work around stack alignment issue, bug #647954. in case we ever have x86 + use x86 && append-flags -mincoming-stack-boundary=2 + + if has_version dev-java/freemarker; then + local freemarker=freemarker + else + local freemarker=freemarker-bin + fi + + # 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. + + local myconf=( + --disable-ccache + --enable-full-docs=no + --with-boot-jdk="${JDK_HOME}" + --with-extra-cflags="${CFLAGS}" + --with-extra-cxxflags="${CXXFLAGS}" + --with-extra-ldflags="${LDFLAGS}" + --with-stdc++lib=dynamic + --with-giflib=system + --with-lcms=system + --with-libjpeg=system + --with-libpng=system + --with-native-debug-symbols=$(usex debug internal none) + --with-vendor-name="Gentoo" + --with-vendor-url="https://gentoo.org" + --with-vendor-bug-url="https://bugs.gentoo.org" + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" + --with-vendor-version-string="${PVR}" + --with-version-pre="" + --with-version-opt="" + --with-zlib=system + --enable-dtrace=$(usex systemtap yes no) + --enable-headless-only=$(usex headless-awt yes no) + + --with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar) + --disable-warnings-as-errors{,-omr,-openj9} + $(use_enable ddr) + $(use_with large-heap noncompressedrefs) + ) + + if use javafx; then + local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + if [[ -r ${zip} ]]; then + myconf+=( --with-import-modules="${zip}" ) + else + die "${zip} not found or not readable" + fi + fi + + # PaX breaks pch, bug #601016 + if use pch && ! host-is-pax; then + myconf+=( --enable-precompiled-headers ) + else + myconf+=( --disable-precompiled-headers ) + fi + + ( + unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS + CFLAGS= CXXFLAGS= LDFLAGS= \ + CONFIG_SITE=/dev/null \ + econf "${myconf[@]}" + ) +} + +src_compile() { + local myemakeargs=( + JOBS=$(makeopts_jobs) + # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 + #LOG=debug + $(usex doc docs '') + $(usex jbootstrap bootcycle-images product-images) + ) + emake "${myemakeargs[@]}" -j1 #nowarn +} + +src_install() { + local dest="/usr/$(get_libdir)/${PN}-${SLOT}" + local ddest="${ED}${dest#/}" + + cd "${S}"/build/*-release/images/jdk || die + + # Create files used as storage for system preferences. + mkdir .systemPrefs || die + touch .systemPrefs/.system.lock || die + touch .systemPrefs/.systemRootModFile || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but OpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if ! use examples ; then + rm -vr demo/ || die + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym ../../../../../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_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter + + if use doc ; then + docinto html + dodoc -r "${S}"/build/*-release/images/docs/* + dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + fi +} + +pkg_postinst() { + java-vm-2_pkg_postinst + + if use gentoo-vm ; then + ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" + ewarn "recognised by the system. This will almost certainly break" + ewarn "many java ebuilds as they are not ready for openjdk-11" + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" + 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 ${SLOT}. This JDK must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." + fi +} diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild index 388a762..ead108a 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild @@ -19,8 +19,8 @@ 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/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz - https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz + 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/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 diff --git a/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild deleted file mode 100644 index 23ae86f..0000000 --- a/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs versionator - -SLOT="$(get_major_version)" -OPENJ9_PV="$(get_version_component_range 2-4)" -OPENJ9_P=openj9-${OPENJ9_PV} -FREEMARKER_PV=2.3.30 - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" -if [[ ${OPENJ9_PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git" - OPENJ9_EGIT_REPO_URI="https://github.com/eclipse/openj9.git" - OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git" -else - SRC_URI=" - 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 -> ${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" -KEYWORDS="~amd64" - -IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) - - dev-libs/elfutils - dev-libs/libdwarf - sys-process/numactl -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - dev-lang/nasm - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) - || ( - virtual/jdk:${SLOT} - virtual/jdk:$((SLOT-1)) - ) - || ( - dev-java/freemarker-bin - dev-java/freemarker - ) -" - -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -if [[ ${OPENJ9_PV} == 9999 ]]; then - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}" -else - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}" -fi - -# The space required to build varies wildly depending on USE flags, -# ranging from 3GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=3192 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - if [[ ${OPENJ9_PV} == 9999 ]]; then - EGIT_CHECKOUT_DIR=openj9 EGIT_REPO_URI=${OPENJ9_EGIT_REPO_URI} git-r3_src_unpack - EGIT_CHECKOUT_DIR=openj9-omr EGIT_REPO_URI=${OPENJ9_OMR_EGIT_REPO_URI} git-r3_src_unpack - # unpack openjdk last to save correct EGIT_VERSION - EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack - else - default - fi -} - -src_prepare() { - if [[ ${OPENJ9_PV} == 9999 ]]; then - ln -s ../openj9 openj9 || die - ln -s ../openj9-omr omr || die - else - ln -s ../openj9-${OPENJ9_P} openj9 || die - ln -s ../openj9-omr-${OPENJ9_P} omr || die - fi - - default - - eapply "${FILESDIR}/openjdk-src-doubledollar.patch" - eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch" - eapply -d omr -- "${FILESDIR}/omr-fam.patch" - - if [[ ${OPENJ9_PV} != 9999 ]]; then - sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ - -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \ - -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ - closed/OpenJ9.gmk - fi - - chmod +x configure || die -} - -src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - if has_version dev-java/freemarker; then - local freemarker=freemarker - else - local freemarker=freemarker-bin - fi - - # 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. - - local myconf=( - --disable-ccache - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-stdc++lib=dynamic - --with-giflib=system - --with-lcms=system - --with-libjpeg=system - --with-libpng=system - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PVR}" - --with-version-pre="" - --with-version-opt="" - --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - - --with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar) - --disable-warnings-as-errors{,-omr,-openj9} - $(use_enable ddr) - $(use_with large-heap noncompressedrefs) - ) - - if use javafx; then - local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -src_compile() { - local myemakeargs=( - JOBS=$(makeopts_jobs) - # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 - #LOG=debug - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 #nowarn -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym ../../../../../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_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - 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 ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi -} diff --git a/dev-java/openj9-openjdk/openj9-openjdk-15.0.24.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.0.24.0.ebuild new file mode 100644 index 0000000..585f194 --- /dev/null +++ b/dev-java/openj9-openjdk/openj9-openjdk-15.0.24.0.ebuild @@ -0,0 +1,299 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs versionator + +SLOT="$(get_major_version)" +OPENJ9_PV="$(get_version_component_range 2-4)" +OPENJ9_P=openj9-${OPENJ9_PV} +FREEMARKER_PV=2.3.30 + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.java.net" +if [[ ${OPENJ9_PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git" + OPENJ9_EGIT_REPO_URI="https://github.com/eclipse/openj9.git" + 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/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${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" +KEYWORDS="~amd64" + +IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + media-libs/libpng:0= + media-libs/lcms:2= + sys-libs/zlib + virtual/jpeg:0= + systemtap? ( dev-util/systemtap ) + + dev-libs/elfutils + dev-libs/libdwarf + sys-process/numactl +" + +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + dev-lang/nasm + media-libs/alsa-lib + net-print/cups + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + javafx? ( dev-java/openjfx:${SLOT}= ) + || ( + virtual/jdk:${SLOT} + virtual/jdk:$((SLOT-1)) + ) + || ( + dev-java/freemarker-bin + dev-java/freemarker + ) +" + +REQUIRED_USE="javafx? ( alsa !headless-awt )" + +if [[ ${OPENJ9_PV} == 9999 ]]; then + S="${WORKDIR}/openj9-openjdk-jdk${SLOT}" +else + S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}" +fi + +# The space required to build varies wildly depending on USE flags, +# ranging from 3GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=3192 + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + fi +} + +pkg_setup() { + openjdk_check_requirements + java-vm-2_pkg_setup + java-pkg-2_pkg_setup +} + +src_unpack() { + if [[ ${OPENJ9_PV} == 9999 ]]; then + EGIT_CHECKOUT_DIR=openj9 EGIT_REPO_URI=${OPENJ9_EGIT_REPO_URI} git-r3_src_unpack + EGIT_CHECKOUT_DIR=openj9-omr EGIT_REPO_URI=${OPENJ9_OMR_EGIT_REPO_URI} git-r3_src_unpack + # unpack openjdk last to save correct EGIT_VERSION + EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack + else + default + fi +} + +src_prepare() { + if [[ ${OPENJ9_PV} == 9999 ]]; then + ln -s ../openj9 openj9 || die + ln -s ../openj9-omr omr || die + else + ln -s ../openj9-${OPENJ9_P} openj9 || die + ln -s ../openj9-omr-${OPENJ9_P} omr || die + fi + + default + + eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch" + eapply -d omr -- "${FILESDIR}/omr-fam.patch" + + if [[ ${OPENJ9_PV} != 9999 ]]; then + sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ + -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \ + -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ + closed/OpenJ9.gmk + fi + + chmod +x configure || die +} + +src_configure() { + # Work around stack alignment issue, bug #647954. in case we ever have x86 + use x86 && append-flags -mincoming-stack-boundary=2 + + if has_version dev-java/freemarker; then + local freemarker=freemarker + else + local freemarker=freemarker-bin + fi + + # 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. + + local myconf=( + --disable-ccache + --enable-full-docs=no + --with-boot-jdk="${JDK_HOME}" + --with-extra-cflags="${CFLAGS}" + --with-extra-cxxflags="${CXXFLAGS}" + --with-extra-ldflags="${LDFLAGS}" + --with-stdc++lib=dynamic + --with-giflib=system + --with-lcms=system + --with-libjpeg=system + --with-libpng=system + --with-native-debug-symbols=$(usex debug internal none) + --with-vendor-name="Gentoo" + --with-vendor-url="https://gentoo.org" + --with-vendor-bug-url="https://bugs.gentoo.org" + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" + --with-vendor-version-string="${PVR}" + --with-version-pre="" + --with-version-opt="" + --with-zlib=system + --enable-dtrace=$(usex systemtap yes no) + --enable-headless-only=$(usex headless-awt yes no) + + --with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar) + --disable-warnings-as-errors{,-omr,-openj9} + $(use_enable ddr) + $(use_with large-heap noncompressedrefs) + ) + + if use javafx; then + local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + if [[ -r ${zip} ]]; then + myconf+=( --with-import-modules="${zip}" ) + else + die "${zip} not found or not readable" + fi + fi + + # PaX breaks pch, bug #601016 + if use pch && ! host-is-pax; then + myconf+=( --enable-precompiled-headers ) + else + myconf+=( --disable-precompiled-headers ) + fi + + ( + unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS + CFLAGS= CXXFLAGS= LDFLAGS= \ + CONFIG_SITE=/dev/null \ + econf "${myconf[@]}" + ) +} + +src_compile() { + local myemakeargs=( + JOBS=$(makeopts_jobs) + # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 + #LOG=debug + $(usex doc docs '') + $(usex jbootstrap bootcycle-images product-images) + ) + emake "${myemakeargs[@]}" -j1 #nowarn +} + +src_install() { + local dest="/usr/$(get_libdir)/${PN}-${SLOT}" + local ddest="${ED}${dest#/}" + + cd "${S}"/build/*-release/images/jdk || die + + # Create files used as storage for system preferences. + mkdir .systemPrefs || die + touch .systemPrefs/.system.lock || die + touch .systemPrefs/.systemRootModFile || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but OpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if ! use examples ; then + rm -vr demo/ || die + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym ../../../../../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_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter + + if use doc ; then + docinto html + dodoc -r "${S}"/build/*-release/images/docs/* + dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + fi +} + +pkg_postinst() { + java-vm-2_pkg_postinst + + if use gentoo-vm ; then + ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" + ewarn "recognised by the system. This will almost certainly break" + ewarn "many java ebuilds as they are not ready for openjdk-11" + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" + 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 ${SLOT}. This JDK must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." + fi +} diff --git a/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild index f1ba818..7b02c94 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild @@ -19,7 +19,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/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz + 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/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz " @@ -144,7 +144,6 @@ src_prepare() { default - eapply "${FILESDIR}/openjdk-src-doubledollar.patch" eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch" eapply -d omr -- "${FILESDIR}/omr-fam.patch" diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index 694a29c..371f99b 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -1,5 +1,5 @@ -DIST OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz 204293353 SHA256 84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e -DIST OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz 190092254 SHA256 bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2 -DIST OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.1_9.tar.gz 188859845 SHA256 bc5347c011025f9830a420f943f52b97ebf0fc642ebff9a25bf465d0a6f3f3b9 -DIST OpenJDK15U-jdk_s390x_linux_hotspot_15.0.1_9.tar.gz 180555190 SHA256 d402e322841abc3c5c8b0352f08d54d6b5c25b7d6f81716401da266bcb1d1ff0 -DIST OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz 206689671 SHA256 61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e +DIST OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz 203662871 SHA256 6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4 +DIST OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz 189527214 SHA256 ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368 +DIST OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz 188162894 SHA256 486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9 +DIST OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz 179870692 SHA256 7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a +DIST OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz 206039221 SHA256 94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d diff --git a/dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild deleted file mode 100644 index 8814074..0000000 --- a/dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild +++ /dev/null @@ -1,112 +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 - -abi_uri() { - echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV/+/_}.tar.gz - )" -} - -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri arm) - $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390x) - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390x" -IUSE="alsa cups doc +gentoo-vm headless-awt selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=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}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -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 - - if ! use source ; then - rm -v lib/src.zip || 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 JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - 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 JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openjdk-bin/openjdk-bin-15.0.2_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-15.0.2_p7.ebuild new file mode 100644 index 0000000..6a82f20 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-15.0.2_p7.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-vm-2 toolchain-funcs + +abi_uri() { + echo "${2-$1}? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV/+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri arm) + $(abi_uri ppc64le ppc64) + $(abi_uri s390x s390) + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" +HOMEPAGE="https://adoptopenjdk.net" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390" +IUSE="alsa cups doc +gentoo-vm headless-awt selinux source" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >=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}" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +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 + + if ! use source ; then + rm -v lib/src.zip || 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 JDK" + ewarn "recognised by the system. This will almost certainly break" + ewarn "many java ebuilds as they are not ready for openjdk-11" + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" + 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 JDK must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/opt/${P}." + fi +} diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index 8b471de..3a090fd 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1 +1,4 @@ -DIST OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz 57983975 SHA256 e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411 +DIST OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz 56464691 SHA256 1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2 +DIST OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz 52841906 SHA256 304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e +DIST OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz 53505440 SHA256 dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67 +DIST OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz 57646869 SHA256 31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.1_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.1_p9.ebuild deleted file mode 100644 index 2540719..0000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.1_p9.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-vm-2 - -abi_uri() { - echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV/+/_}.tar.gz - )" -} - -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} - -SRC_URI=" - $(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 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/openjdk-jre-bin/openjdk-jre-bin-15.0.2_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.2_p7.ebuild new file mode 100644 index 0000000..b157010 --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.2_p7.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV/+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri arm) + $(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 ~arm ~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-${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/openjdk/Manifest b/dev-java/openjdk/Manifest index 0028d21..e2fe888 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1 +1 @@ -DIST openjdk-15.0.1_p9.tar.bz2 77426210 BLAKE2B 4334d43cdd51c7899c9746a728cf6855c1c05cb78c0543d966c6b1150b67540aac504777f4756d4abf05a1b229bdb2bb36ca17b8ca14f9d2c81be023775bf472 SHA512 41b947cc0be1635e2de330c5289ed436f79bf23221f1a00350f8f80f5b4c27610658930e86bcdc35dd8a6babd860ad8d5792e414340e82e4f44da148b22b4b40 +DIST openjdk-15.0.2_p7.tar.bz2 77419602 BLAKE2B 43d7a286e38677b3b53a76b7306bc0881795ea65ef40c7513adbd3f96a095e6196c3a4d3bee77a4047acd427e6490d2150b8f2570850ec5c80a670dcb411f34a SHA512 65692c8018247e6589325836213dc5a09df8b3d8fb91a67b1c3e3ccd1a34c7235f0b3af557ead840fdd0fb998f0558fce32ee5a26598115cae6601ad5e60eb7e diff --git a/dev-java/openjdk/files/openjdk-src-doubledollar.patch b/dev-java/openjdk/files/openjdk-src-doubledollar.patch deleted file mode 100644 index c1497d5..0000000 --- a/dev-java/openjdk/files/openjdk-src-doubledollar.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0601ac847afc86e9010685bb85d82a00a33355b5 Mon Sep 17 00:00:00 2001 -From: erikj -Date: Mon, 2 Nov 2020 06:18:08 -0800 -Subject: [PATCH] Add DoubleDollar call to protect java class file names with - dollar in them - ---- - make/common/JavaCompilation.gmk | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk -index 444ded0fc06..bedb971115b 100644 ---- a/make/common/JavaCompilation.gmk -+++ b/make/common/JavaCompilation.gmk -@@ -311,9 +311,11 @@ define SetupJavaCompilationBody - ifneq ($$($1_KEEP_DUPS), true) - # Remove duplicate source files by keeping the first found of each duplicate. - # This allows for automatic overrides with custom or platform specific versions -- # source files. -+ # source files. Need to call DoubleDollar as we have java classes with '$' in -+ # their names. - $1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \ -- $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \ -+ $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), \ -+ $$(call DoubleDollar, $$(s)))) \ - $$(if $$($1_$$(relative_src)), \ - , \ - $$(eval $1_$$(relative_src) := 1) $$(s)))) diff --git a/dev-java/openjdk/openjdk-15.0.1_p9.ebuild b/dev-java/openjdk/openjdk-15.0.1_p9.ebuild deleted file mode 100644 index 16e914f..0000000 --- a/dev-java/openjdk/openjdk-15.0.1_p9.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs - -# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to -# set build version properly -MY_PV="${PV%_p*}-ga" -SLOT="${MY_PV%%[.+]*}" - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" -SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - virtual/jdk:15 - javafx? ( dev-java/openjfx:${SLOT}= ) -" - -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" - -# The space required to build varies wildly depending on USE flags, -# ranging from 2GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" - fi -} - -pkg_setup() { - openjdk_check_requirements - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}/openjdk-src-doubledollar.patch" - default - chmod +x configure || die -} - -src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - # Work around -fno-common ( GCC10 default ), bug #713180 - append-flags -fcommon - - # 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. - - local myconf=( - --disable-ccache - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-giflib=system - --with-lcms=system - --with-libjpeg=system - --with-libpng=system - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PVR}" - --with-version-pre="" - --with-version-string="${PV%_p*}" - --with-version-build="${PV#*_p}" - --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - ) - - if use javafx; then - local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -src_compile() { - local myemakeargs=( - JOBS=$(makeopts_jobs) - LOG=debug - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 #nowarn -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - # must be done before running itself - java-vm_set-pax-markings "${ddest}" - - einfo "Creating the Class Data Sharing archives and disabling usage tracking" - "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - 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 ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi -} diff --git a/dev-java/openjdk/openjdk-15.0.2_p7.ebuild b/dev-java/openjdk/openjdk-15.0.2_p7.ebuild new file mode 100644 index 0000000..d41bc00 --- /dev/null +++ b/dev-java/openjdk/openjdk-15.0.2_p7.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs + +# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to +# set build version properly +MY_PV="${PV%_p*}-ga" +SLOT="${MY_PV%%[.+]*}" + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.java.net" +SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" + +IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + media-libs/libpng:0= + media-libs/lcms:2= + sys-libs/zlib + virtual/jpeg:0= + systemtap? ( dev-util/systemtap ) +" + +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + media-libs/alsa-lib + net-print/cups + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + virtual/jdk:15 + javafx? ( dev-java/openjfx:${SLOT}= ) +" + +REQUIRED_USE="javafx? ( alsa !headless-awt )" + +S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" + +# The space required to build varies wildly depending on USE flags, +# ranging from 2GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=2048 + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + fi +} + +pkg_setup() { + openjdk_check_requirements + + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + + java-vm-2_pkg_setup + java-pkg-2_pkg_setup +} + +src_prepare() { + default + chmod +x configure || die +} + +src_configure() { + # Work around stack alignment issue, bug #647954. in case we ever have x86 + use x86 && append-flags -mincoming-stack-boundary=2 + + # Work around -fno-common ( GCC10 default ), bug #713180 + append-flags -fcommon + + # 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. + + local myconf=( + --disable-ccache + --enable-full-docs=no + --with-boot-jdk="${JDK_HOME}" + --with-extra-cflags="${CFLAGS}" + --with-extra-cxxflags="${CXXFLAGS}" + --with-extra-ldflags="${LDFLAGS}" + --with-giflib=system + --with-lcms=system + --with-libjpeg=system + --with-libpng=system + --with-native-debug-symbols=$(usex debug internal none) + --with-vendor-name="Gentoo" + --with-vendor-url="https://gentoo.org" + --with-vendor-bug-url="https://bugs.gentoo.org" + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" + --with-vendor-version-string="${PVR}" + --with-version-pre="" + --with-version-string="${PV%_p*}" + --with-version-build="${PV#*_p}" + --with-zlib=system + --enable-dtrace=$(usex systemtap yes no) + --enable-headless-only=$(usex headless-awt yes no) + ) + + if use javafx; then + local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + if [[ -r ${zip} ]]; then + myconf+=( --with-import-modules="${zip}" ) + else + die "${zip} not found or not readable" + fi + fi + + # PaX breaks pch, bug #601016 + if use pch && ! host-is-pax; then + myconf+=( --enable-precompiled-headers ) + else + myconf+=( --disable-precompiled-headers ) + fi + + ( + unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS + CFLAGS= CXXFLAGS= LDFLAGS= \ + CONFIG_SITE=/dev/null \ + econf "${myconf[@]}" + ) +} + +src_compile() { + local myemakeargs=( + JOBS=$(makeopts_jobs) + LOG=debug + CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror + $(usex doc docs '') + $(usex jbootstrap bootcycle-images product-images) + ) + emake "${myemakeargs[@]}" -j1 #nowarn +} + +src_install() { + local dest="/usr/$(get_libdir)/${PN}-${SLOT}" + local ddest="${ED}${dest#/}" + + cd "${S}"/build/*-release/images/jdk || die + + # Create files used as storage for system preferences. + mkdir .systemPrefs || die + touch .systemPrefs/.system.lock || die + touch .systemPrefs/.systemRootModFile || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but OpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if ! use examples ; then + rm -vr demo/ || die + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + # must be done before running itself + java-vm_set-pax-markings "${ddest}" + + einfo "Creating the Class Data Sharing archives and disabling usage tracking" + "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die + + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter + + if use doc ; then + docinto html + dodoc -r "${S}"/build/*-release/images/docs/* + dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + fi +} + +pkg_postinst() { + java-vm-2_pkg_postinst + + if use gentoo-vm ; then + ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" + ewarn "recognised by the system. This will almost certainly break" + ewarn "many java ebuilds as they are not ready for openjdk-11" + else + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" + 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 ${SLOT}. This JDK must therefore be invoked using its" + ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." + fi +} -- cgit v1.2.3-70-g09d2