From 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Jul 2021 19:04:28 +0100 Subject: gentoo resync : 17.07.2021 --- virtual/jdk/Manifest | 6 +++--- virtual/jdk/jdk-1.8.0-r5.ebuild | 15 --------------- virtual/jdk/jdk-1.8.0-r6.ebuild | 16 ++++++++++++++++ virtual/jdk/jdk-11-r1.ebuild | 13 ------------- virtual/jdk/jdk-11-r2.ebuild | 14 ++++++++++++++ virtual/jdk/metadata.xml | 3 +++ 6 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 virtual/jdk/jdk-1.8.0-r5.ebuild create mode 100644 virtual/jdk/jdk-1.8.0-r6.ebuild delete mode 100644 virtual/jdk/jdk-11-r1.ebuild create mode 100644 virtual/jdk/jdk-11-r2.ebuild (limited to 'virtual/jdk') diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest index 7b500dd9b40d..b92d566685fd 100644 --- a/virtual/jdk/Manifest +++ b/virtual/jdk/Manifest @@ -1,3 +1,3 @@ -EBUILD jdk-1.8.0-r5.ebuild 401 BLAKE2B ff964f93a5917410534587538f59c0dec6861e044c8b159d0ae6b0164cb5bcdbdb3e35128dfbb523d13c7fef66614754d557f0bd866b900c406bf5830ea72bc8 SHA512 55fcfacd3ddc255cc936c2a4c761ff7962acebc3c1197076851b90de29e421a8119a7467a9228d7bbd142a6124532d5a2325c6285dac20ef1fe19ae372492cda -EBUILD jdk-11-r1.ebuild 320 BLAKE2B afe18794e5b998b9c09ba77b554a160c0ee4041f9ee87cbc32d17242c03bed968fae47413760da5474d204f974365f95a8ee4d3c12bfa2413cc4f3c2d22bae7a SHA512 e6093468ac7127de8bafb4b4f5309dee990b1916bc6e835d4eafb9c9c9b0686fd6805dd02dbb260262eb64147772900321165793da858c50e66e49df86728444 -MISC metadata.xml 260 BLAKE2B b37eb6d2d2182a4b64e7c3a9881a08a7072533de1f0920927c3c197f53db2a0ad57a44bdf47cf75cf08a93d6c55b2f6e0694227bcf07a606e337345131719cee SHA512 c4b63e127973fa92d06e9e1efb5d42571a9963a23c60e50039d8a4fc31b2ddfeac407deae9e03c2c1636957b3b3c53ba3944c03978958bada06a7996337fbb7c +EBUILD jdk-1.8.0-r6.ebuild 481 BLAKE2B 4dceecb033e5ac793574de2b244c3562690d17b8c8fbdca133d70810904a715d61f9ac440ce023011c6c4057a95cad88facaccaf98f3e0c45f56e31672afd3e3 SHA512 5e0fa11e168efa9cdf3d9ccdd76b2e3da8b240a419505e93eb28d6d83cd39e0629855674ab5a737c19d1157d352234a0b5fa7a852c75ded74848b8eafbe057bd +EBUILD jdk-11-r2.ebuild 368 BLAKE2B cee739058d7440f90d7df0dcd51852d760f05f7bf7a358ea3b46d12563bf946e0379ba78d87e358816bcd133c089c6e684d8377aafee24bbb37b3f01dfbeb10b SHA512 c98d5bf5af5ad469dcdc00da7aa89e8888f9bed61a1578a635ee3aead34f2374e1bd0a23e1b82b8ad6f666783c292930b49c0fe43181e1b2113740362f8ecee4 +MISC metadata.xml 367 BLAKE2B 80910cdb666e867df5c978ec9023f5efeff97090011483ba43a203c17d1d7448d2c1badf16e2285ed95d9b04383dbea73bc82ea0e1d9136cbbdea9580f2cf6e1 SHA512 35453938f1c92944314b416ad3a24bc7015b3146ea5fb650d82ab05dc6b161982e81f4a5ca432773227de2896c6dcdc9594bca8d85f626d9d195bdf9c2818974 diff --git a/virtual/jdk/jdk-1.8.0-r5.ebuild b/virtual/jdk/jdk-1.8.0-r5.ebuild deleted file mode 100644 index f20b926921f3..000000000000 --- a/virtual/jdk/jdk-1.8.0-r5.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for Java Development Kit (JDK)" -SLOT="1.8" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" - -RDEPEND="|| ( - dev-java/openjdk-bin:8 - dev-java/openjdk:8 - dev-java/icedtea-bin:8 - dev-java/icedtea:8 -)" diff --git a/virtual/jdk/jdk-1.8.0-r6.ebuild b/virtual/jdk/jdk-1.8.0-r6.ebuild new file mode 100644 index 000000000000..62bdccc8153a --- /dev/null +++ b/virtual/jdk/jdk-1.8.0-r6.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Virtual for Java Development Kit (JDK)" +SLOT="1.8" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" +IUSE="headless-awt" + +RDEPEND="|| ( + dev-java/openjdk-bin:8[headless-awt=] + dev-java/openjdk:8[headless-awt=] + dev-java/icedtea-bin:8[headless-awt=] + dev-java/icedtea:8[headless-awt=] +)" diff --git a/virtual/jdk/jdk-11-r1.ebuild b/virtual/jdk/jdk-11-r1.ebuild deleted file mode 100644 index 4548106d09bf..000000000000 --- a/virtual/jdk/jdk-11-r1.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for Java Development Kit (JDK)" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -RDEPEND="|| ( - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] -)" diff --git a/virtual/jdk/jdk-11-r2.ebuild b/virtual/jdk/jdk-11-r2.ebuild new file mode 100644 index 000000000000..d7963a0f6c84 --- /dev/null +++ b/virtual/jdk/jdk-11-r2.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Virtual for Java Development Kit (JDK)" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +IUSE="headless-awt" + +RDEPEND="|| ( + dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=] + dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=] +)" diff --git a/virtual/jdk/metadata.xml b/virtual/jdk/metadata.xml index e6adb0833e2b..f07a294e100c 100644 --- a/virtual/jdk/metadata.xml +++ b/virtual/jdk/metadata.xml @@ -5,5 +5,8 @@ java@gentoo.org Java + + Don't install the X backend for AWT, needed by some GUIs + -- cgit v1.2.3