From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- dev-java/openjdk/Manifest | 6 +++--- dev-java/openjdk/metadata.xml | 1 - dev-java/openjdk/openjdk-11.0.8_p10.ebuild | 7 +------ dev-java/openjdk/openjdk-8.265_p01.ebuild | 8 ++------ 4 files changed, 6 insertions(+), 16 deletions(-) (limited to 'dev-java/openjdk') diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 9f86ebbfc1db..6ab4509588ad 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -9,6 +9,6 @@ DIST openjdk-jaxws-8.265_p01.tar.bz2 2543597 BLAKE2B c83256ab68837cc44d65414343d DIST openjdk-jdk-8.265_p01.tar.bz2 48017864 BLAKE2B b30a573a79a06abfe98e5963521f762e3517bda2bf6849af758285b7ea61cc57d89290ec47538b1082eea99646d3dd6295b98ad65edd62d1b1fd2480c0928a74 SHA512 44ad75bf3b3c6fd6b782ee5383edfa60fb49ac2e40493b18487bcb8a4dac926ffcf5b663adbb8d3267021bd47d5b60652771a88257fbaff77aa2e1f627252418 DIST openjdk-langtools-8.265_p01.tar.bz2 2399426 BLAKE2B 550a3dcee38b41feaf8c5b6b88f700c52f870ed0c3f25fa23f34bb3f40c333965e911ac126f4b038057472acea2b684917692a6881e46e4aa68b05cd7e4346da SHA512 24d0978a8e6254a96a5399420831d320ea2b2f5b7055ceba030802b85fcb9630031499504ca72305361fa3a386c2ca0a8c38082ee2b15b8569fdf7e815730be6 DIST openjdk-nashorn-8.265_p01.tar.bz2 2852124 BLAKE2B 380202d487e62e08784b7fd5cb720c22a2b93d802898b90bf2686bac803fe2bc41d8d4b3d56b45bfb45686a2976d208359818b17b96ccce73fd55b389f4d04af SHA512 12522a06f16f1c63d6b6df525011d01ff91ba05f06ee7ade239faa31527ca9aaa9fa609c1ad261f0ae8d75cc195fe1af66e026815bdc0669fb6a286a49f86a5e -EBUILD openjdk-11.0.8_p10.ebuild 7785 BLAKE2B c777da7f26aa85dad821799fd32523e958d6e4f525f299dd49854892bbb4a01329d3a77ebfb60f0b12f006f0b0c1d34a553d5c6eceeb0ae8a9d8a1d52e524bd4 SHA512 89413c17eb82991b3b597e74b6097e3ffaaef5a7f18326a18188b2df7bd416055b094f91135ac9e1efb400432dd331a1565aefd993a47dd7f92ea1fcc048f044 -EBUILD openjdk-8.265_p01.ebuild 6044 BLAKE2B ef734afa0c13e6ce7fe43ab981466d0acb5816e561c1415539da2c911069cca62b327ff8e5d2e7d71f6056cfb17a8171965b0dea4602fe531520a21e31e791f9 SHA512 2cdb07b134decd2a17d0e316f1987e3b957ec80e1fd2b4a49a1785b208144477b4639b76211a4804d9ca05e30ca8a37005cc56deb3b5f56637aed6f6fea61c45 -MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959 +EBUILD openjdk-11.0.8_p10.ebuild 7652 BLAKE2B 9ab04d8e05b7ab65029db969bcfb828db8cb09e93e7e11076cd24f5e4907cc576be0242e1278e801648f26b58d7eeb9d87adc830cf615a433eaa2a72d1388f0e SHA512 2a4b8bbfac4ef720b3a5b29d0a8d5cf8ec09987722df791fecb45b1ca96837ff225bd6605b47073f819a53bb8cec7e2c701e464bc3ffb5dfeec93ae3e3f454c0 +EBUILD openjdk-8.265_p01.ebuild 5979 BLAKE2B d20e84a3cc26ae804c999aec9a0880631b8454cb2443c7af394c9e846916db28774010650e78b6a01325d65733db445cb6b76ca242d598c26a76059b8d07a94a SHA512 7f559217a67e6e86bf404c34c55a5f579b48aea6110548bda5dde6344167a29da446ff9cf4ffe5c62ae56e0171f21617004dadc46dd51ac9cc942b9b12170507 +MISC metadata.xml 1313 BLAKE2B 5642f3fd86732997585e5215e2adf9b9e10af572d86ec1eab1db31667ec027a170825fad97fbf2c9e42c6266036dae8219ff689cd361e14d6e31c9640becd1f0 SHA512 ad6667c6fc65f81754455fed779dff5a13920abd85905c750d9c3ed2d2f2dde6a02616518024cbc1dcd5204cb66c00a0b165f03ff039a59f69948b5c1c178bf5 diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml index c9555ad9e77e..ebcb18f58970 100644 --- a/dev-java/openjdk/metadata.xml +++ b/dev-java/openjdk/metadata.xml @@ -24,6 +24,5 @@ Build OpenJDK twice, the second time using the result of the first Install JVM sources Enable SystemTAP/DTrace tracing - Provide javaws command through symlink to icedtea-web diff --git a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild index 35a2c27c3f85..403654841b0e 100644 --- a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}. LICENSE="GPL-2" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart" +IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" COMMON_DEPEND=" media-libs/freetype:2= @@ -68,11 +68,6 @@ DEPEND=" ) " -PDEPEND=" - webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) -" - REQUIRED_USE="javafx? ( alsa !headless-awt )" S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild index d88de6a02a77..df934d0962ae 100644 --- a/dev-java/openjdk/openjdk-8.265_p01.ebuild +++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild @@ -28,7 +28,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="$(ver_cut 1)" KEYWORDS="amd64 ppc64 x86" -IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart" +IUSE="alsa debug cups doc examples headless-awt +jbootstrap +pch selinux source" COMMON_DEPEND=" media-libs/freetype:2= @@ -73,11 +73,6 @@ DEPEND=" ) " -PDEPEND=" - webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) -" - S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" # The space required to build varies wildly depending on USE flags, @@ -223,4 +218,5 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst + einfo "JavaWebStart functionality provided by icedtea-web package" } -- cgit v1.2.3