From 7359a7b6102cfa764c2b64ff6c6401c0b79e8e4b Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Tue, 1 Oct 2019 16:54:38 -0700 Subject: dev-java/openjdk-bin: really remove libjawt.so for headless portage will fail to install binpkg of it with emerge: there are no binary packages to satisfy "x86_64: libawt_xawt.so" unless --ignore-soname-deps=y is passed Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev --- .../openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild | 108 +++++++++++++++++++++ dev-java/openjdk-bin/openjdk-bin-8.222_p10.ebuild | 108 --------------------- 2 files changed, 108 insertions(+), 108 deletions(-) create mode 100644 dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild delete mode 100644 dev-java/openjdk-bin/openjdk-bin-8.222_p10.ebuild (limited to 'dev-java/openjdk-bin') diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild new file mode 100644 index 000000000000..c9b8c2cf4c91 --- /dev/null +++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-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 eapi7-ver java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz + )" +} + +MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) +SLOT="$(ver_cut 1)" + +DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" +HOMEPAGE="https://adoptopenjdk.net" +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) +" + +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:1.${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 strip" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk${MY_PV}" + +src_install() { + local dest="/opt/${P}" + local ddest="${ED%/}/${dest#/}" + + rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die + + # this does not exist on arm64 hence -f + rm -fv jre/lib/*/libfreetype.so* || die + + if ! use alsa ; then + rm -v jre/lib/*/libjsoundalsa.so* || die + fi + + if ! use examples ; then + rm -vr sample || die + fi + + if use headless-awt ; then + rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ + {,jre/}bin/policytool bin/appletviewer || die + fi + + if ! use source ; then + rm -v src.zip || die + fi + + rm -v jre/lib/security/cacerts || die + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/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 OpenJDK 8. 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-8.222_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10.ebuild deleted file mode 100644 index 05ab88cb032b..000000000000 --- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver java-vm-2 - -abi_uri() { - echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz - )" -} - -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) -SLOT="$(ver_cut 1)" - -DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) -" - -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:1.${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 strip" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk${MY_PV}" - -src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" - - rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die - - # this does not exist on arm64 hence -f - rm -fv jre/lib/*/libfreetype.so* || die - - if ! use alsa ; then - rm -v jre/lib/*/libjsoundalsa.so* || die - fi - - if ! use examples ; then - rm -vr sample || die - fi - - if use headless-awt ; then - rm -fvr jre/lib/*/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/policytool bin/appletviewer || die - fi - - if ! use source ; then - rm -v src.zip || die - fi - - rm -v jre/lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/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 OpenJDK 8. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} -- cgit v1.2.3-65-gdbad