From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-java/openjdk-jre-bin/Manifest | 12 +-- .../openjdk-jre-bin-11.0.4_p11.ebuild | 97 ---------------------- .../openjdk-jre-bin-11.0.5_p10.ebuild | 97 ---------------------- .../openjdk-jre-bin-11.0.6_p10.ebuild | 97 ++++++++++++++++++++++ .../openjdk-jre-bin-8.222_p10.ebuild | 84 ------------------- .../openjdk-jre-bin-8.232_p09.ebuild | 84 ------------------- .../openjdk-jre-bin-8.242_p08.ebuild | 2 +- 7 files changed, 101 insertions(+), 372 deletions(-) delete mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild delete mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild create mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild delete mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild delete mode 100644 dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild (limited to 'dev-java/openjdk-jre-bin') diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index 160116694f47..aea04686648b 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,13 +1,7 @@ AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d -DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz 42055392 BLAKE2B d9634ee9a47a9be67ae7bcb4f8a938b3d15ea40859b47ae0b078102ac1924957ac04492a0c11e9144ddbcd333733a6e2b6f997818f4a6144f594167e1b04e05b SHA512 d2e38e0d7536bfa2f05135e229e3fa35e0c9860f03077da61d77d1b6551f099c957b9a9f8a25f922261b47360f7e4f7b64c1e3796557d478a90945ff2820515b -DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.5_10.tar.gz 42132415 BLAKE2B f857b9618f653ce3df1a1f6b3a3f3fd0ceaaa2d66b9d58872817fdbb7846195459b0fd1d79cddb444e0cd17faafc46bcea85fa22b810d2e93b95a9829da6dad5 SHA512 b13ee8af718c701195765eb6c36c8a6dfc32a5a39f8da4118db4e5ef8ab2012f8952cea73a964fcac079487b6372c0be727f0f2df43b948ccdd4663e6b327d1d -DIST OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz 40934975 BLAKE2B e03bfb1896e140b79474a4c9004a97aa07bc9fb29c608b2320c05625a56936555ff8ffda7c9656a2d3ff7628bac769e4d14694b2be6d08e4c90b0e6802a05afb SHA512 e1810c4115206cf78c69b971354474098e853c786b472c2140b9e16187efcd3e15bfff26e743e7a532a6f0619f4728482348583662c1eeccd1ebbb82b980f8af -DIST OpenJDK8U-jre_x64_linux_hotspot_8u232b09.tar.gz 40963409 BLAKE2B 16f0cce76aad30ed27c84f5bf5e5469c947023d8ab07886013e50ce9af31c90df11dfdce6fa220ff5d59b511dcb7ef4df7dc73fa7a7648d2e92899a81eec6109 SHA512 5ce98215c36d2870ebf0112205dfae39c3d43528ebe175dd16ff54b16267b44ada5d5d26e7d7744db95c3c8faee2858fad59c92b065993397defa64cb58c294e +DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz 42198347 BLAKE2B e0022f46f0f3de41d28baf19bcea2c7d6237e80586b7a1e3fb2b97aced18d564fe03a6706b8a3fe97375ff6be395aceafd1e0dba6adaddaa7285b0b8eb24310b SHA512 0d1366c68ad12fafc76edddc7d385f612751182b5492cff4309d542a0e12b13c9b17ca89a0a8218ad0f8182b24285189158c43759db54645758c7ea8dc4d6ce9 DIST OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz 40987250 BLAKE2B ba3f15b938b4462a186c13ca8ea12c5e5e5bbfe5e716af1911e9525875e6956caf3155423f32433be05ebd1a3c873d94b33a797298d6d09577a775c7dfe2a658 SHA512 11dddf75813aa3b88b2bfb2ca89e186cc15601f75ec4f9cbe92c8b60f61438f75a76e45c26bc614eb54de16a584e906f8935cb2146937b96f2970eb89dddea09 -EBUILD openjdk-jre-bin-11.0.4_p11.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988 -EBUILD openjdk-jre-bin-11.0.5_p10.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988 -EBUILD openjdk-jre-bin-8.222_p10.ebuild 1966 BLAKE2B 79eeeca03c4287d8eb9b1030164629b4c960f2aac5e6fd8d69b838afdba76ee20754e3a09777b7d7a38aee49b3ee2e5bc87dc36a891a562b479679d266164566 SHA512 82b86291e524353691b2fffd99632c376b8cf8b68b0a35ba2ffaf6eab5a8cc91d8ea71918edc083df46c3835498ccab61d8016672598fc95ac89e195e02d292b -EBUILD openjdk-jre-bin-8.232_p09.ebuild 1967 BLAKE2B fe8b7db2a315b659b0d623d76b7aaf226b2c30a97faa3fb0c12986f65d8e9d676ea9a018884038509c1bd69e734b7222b706cde7583a730c250ec7ec460a7d0d SHA512 5089b1cb793dbd9518a25e733285866a01851bd84e3372615fe90b19cf3e4c9477766ccfb7834502b2b27ca46db3be017ca203f36ff5d785e478ace6eea56405 -EBUILD openjdk-jre-bin-8.242_p08.ebuild 1939 BLAKE2B f2653487a8bef53e3a2facfec51a25f62159c9e2310c18e4c3c201308a3e6fe2e21fad09defb52756b8804c2786bc2b444b47c352620de7482c8de6da3a6291e SHA512 9f2eb93d8cc3ca221786336f06818d03ddb6af8136e6576e89a6a2e8a6dc5af20e9cc755af0dc4c3aed32e9ca5b2596bbdee91a328b741dc9cb4140cc918ea6c +EBUILD openjdk-jre-bin-11.0.6_p10.ebuild 2726 BLAKE2B 147b9cb76e345b66a11641f25bc8619c6c375ed75bf252d4d5d1e41fb0b3de473647b34f89d1a7e90d742040aea9f8604cae1944469794cb8f80986c5dd7c688 SHA512 fb07d0c43999043f7e61eb4520965db912f956fa84d2476b8e228c690d6d5262f8a2db9b65c0af51b08249b74a5e5a0147bee20fe6d23bd86eeeda0d71f05e3f +EBUILD openjdk-jre-bin-8.242_p08.ebuild 1938 BLAKE2B fca0e6d5d6a49dbb60e02a791e92dfde869944c12ded952fbdd8673afff32a60a3b53c751b0091686000ad149d29c1116fcec2b84ff22c326a674f8b36eed282 SHA512 57c3af2a942d122d717be2abf285aac117f27bc78bd6695af08bf414c09e2d86e0b2dd63b9a2f9843381685765a6f7f6edc0862dd14e7db4240722314674fb6e MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00 diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild deleted file mode 100644 index 33938cb19738..000000000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.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}/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 nsplugin selinux webstart" - -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 - )" - -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}-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 - - 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-11.0.5_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild deleted file mode 100644 index 33938cb19738..000000000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.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}/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 nsplugin selinux webstart" - -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 - )" - -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}-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 - - 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-11.0.6_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild new file mode 100644 index 000000000000..ec55ede52337 --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild @@ -0,0 +1,97 @@ +# 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}/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 nsplugin selinux webstart" + +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 + )" + +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}-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 + + 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-8.222_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild deleted file mode 100644 index 7f255fa9c63f..000000000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2020 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-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz - )" -} - -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) -SLOT="$(ver_cut 1)" - -DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -SRC_URI=" - $(abi_uri x64 amd64) -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="amd64" - -IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart" - -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 - )" - -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}-jre" - -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 lib/*/libfreetype.so* || die - - if ! use alsa ; then - rm -v lib/*/libjsoundalsa.so* || die - fi - - if use headless-awt ; then - rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \ - bin/policytool || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../../etc/ssl/certs/java/cacerts \ - "${dest}"/jre/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - 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 -} diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild deleted file mode 100644 index 9801e4fd0609..000000000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2020 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-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz - )" -} - -MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) -SLOT="$(ver_cut 1)" - -DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -SRC_URI=" - $(abi_uri x64 amd64) -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" - -IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart" - -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 - )" - -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}-jre" - -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 lib/*/libfreetype.so* || die - - if ! use alsa ; then - rm -v lib/*/libjsoundalsa.so* || die - fi - - if use headless-awt ; then - rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \ - bin/policytool || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../../etc/ssl/certs/java/cacerts \ - "${dest}"/jre/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - 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 -} diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild index 64875594ac49..c01f117d1d4e 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild @@ -21,7 +21,7 @@ SRC_URI=" " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="alsa cups headless-awt nsplugin selinux webstart" -- cgit v1.2.3