diff options
author | Georgy Yakovlev <gyakovlev@gentoo.org> | 2019-05-09 14:43:21 -0700 |
---|---|---|
committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2019-05-09 16:04:55 -0700 |
commit | 058aae49c68c2e4c30961da6c15fa4b95b0b1cde (patch) | |
tree | ffbf9e48d9d24b0d85e3badce45cfe39d4d3a719 /dev-java | |
parent | dev-java/openjdk-bin: revbump :8, use system-wide ca-certificates (diff) | |
download | gentoo-058aae49c68c2e4c30961da6c15fa4b95b0b1cde.tar.gz gentoo-058aae49c68c2e4c30961da6c15fa4b95b0b1cde.tar.bz2 gentoo-058aae49c68c2e4c30961da6c15fa4b95b0b1cde.zip |
dev-java/openjdk-bin: revbump :11, use system-wide ca-certificates
Bug: https://bugs.gentoo.org/682308
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild | 108 | ||||
-rw-r--r-- | dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild | 6 |
2 files changed, 113 insertions, 1 deletions
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild new file mode 100644 index 000000000000..a70143ee9f51 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2019 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}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) +" + +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 doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart" + +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 ) + doc? ( dev-java/java-sdk-docs:${SLOT} ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) + nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}" + +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 examples ; then + rm -vr demo/ || 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 + + mv lib/security/cacerts lib/security/cacerts.orig || die + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + 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 things." + 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-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild index ad6e3e5d68c6..aa4a0aeb2e88 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild @@ -53,7 +53,7 @@ S="${WORKDIR}/jdk-${MY_PV}" src_install() { local dest="/opt/${P}" - local ddest="${ED}${dest#/}" + 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 @@ -78,9 +78,13 @@ src_install() { rm -v lib/src.zip || die fi + mv lib/security/cacerts lib/security/cacerts.orig || die + dodir "${dest}" cp -pPR * "${ddest}" || die + dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask |