From a14240e133a60c2a0b2dadcd5a6d7b27c0580f3c Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sun, 25 Oct 2020 09:06:59 -0400 Subject: dev-java/*openjdk*, virtual/{jdk,jre}: bump, rm old --- dev-java/openjdk-bin/Manifest | 8 +- dev-java/openjdk-bin/openjdk-bin-14.0.2_p12.ebuild | 111 --------------------- dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild | 111 +++++++++++++++++++++ 3 files changed, 115 insertions(+), 115 deletions(-) delete mode 100644 dev-java/openjdk-bin/openjdk-bin-14.0.2_p12.ebuild create mode 100644 dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild (limited to 'dev-java/openjdk-bin') diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index 35c8b2d..797c24b 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -1,4 +1,4 @@ -DIST OpenJDK14U-jdk_aarch64_linux_hotspot_14.0.2_12.tar.gz 208174601 BLAKE2B b721417687095109ff6eebdf366df5fb6f3f36393bd9681aa8246213363459c54ef2e7a2ff9b1555ce84572eb29c9c1bb671cd7705fe85f3b2822942138a7957 SHA512 dde5b262092abce8da1aff63cda75c9e47cd9d11597d3ccf8595f8c24a2299da9a161bf827e47480ce74daa60625a30502f894497b03217c7724f6ff19603b95 -DIST OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz 196776784 BLAKE2B 36d43f63ea0a1b30a62fffe72c542110cc9f3f0824a09c03a2c481b8d43d8459554e6585bf5a80f6e35f1d01e423038f40a0352812c167c9892242bd3cca7af1 SHA512 52a38a7a95e7ed7a385ecef33c6667ddec4e2b49652c1ca482c314fc528edb0c4322326f3839da22454058f950058433ad1465bc75da7e516d6b159ead45e55d -DIST OpenJDK14U-jdk_ppc64le_linux_hotspot_14.0.2_12.tar.gz 192668722 BLAKE2B e883354d400169b2252c35f1af63ce90413b0bfff686ef5e0222a5f22cb7443627035ee52b93cb63cebc66f4f4d670eacfbee896ee2431c26cfd9822435f58a3 SHA512 4115be505b0a2ebde43385bea53b119edae2ece62db87ca0c256040e4c2051163f5c307867edd145d617fc4776988777322034830328c8977bffa281620bfa8e -DIST OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz 210764986 BLAKE2B 6a9613aa109197dd0e9b23097238da49dbb649cb5c5eac032534be80b4bbcd972548a84b4fb31e8a0dd3011268733d23d5c6b6660da7282d94a6a19cc128f0e4 SHA512 2701f7e08bc1f03f13bbea2b3567c12d96b23a27e5a7420addd696397f1fbee7e84283df64976c647218f1b321cda8ae0ca3b2eda057f5ebe335a17aae71917a +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_x64_linux_hotspot_15.0.1_9.tar.gz 206689671 SHA256 61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e diff --git a/dev-java/openjdk-bin/openjdk-bin-14.0.2_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-14.0.2_p12.ebuild deleted file mode 100644 index 3f169a3..0000000 --- a/dev-java/openjdk-bin/openjdk-bin-14.0.2_p12.ebuild +++ /dev/null @@ -1,111 +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 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" -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.1_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild new file mode 100644 index 0000000..3f169a3 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild @@ -0,0 +1,111 @@ +# 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 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" +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 +} -- cgit v1.2.3-54-g00ecf