diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
| commit | 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch) | |
| tree | 230f3135ceaace633cf93e9838b185c4a6664c2e /virtual/jdk | |
| parent | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff) | |
gentoo resync : 23.09.2020
Diffstat (limited to 'virtual/jdk')
| -rw-r--r-- | virtual/jdk/Manifest | 5 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.8.0-r4.ebuild | 16 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.8.0-r5.ebuild (renamed from virtual/jdk/jdk-1.8.0-r3.ebuild) | 9 | ||||
| -rw-r--r-- | virtual/jdk/jdk-11-r1.ebuild (renamed from virtual/jdk/jdk-11.ebuild) | 7 |
4 files changed, 10 insertions, 27 deletions
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest index 6b883554bd82..8fb175de5b10 100644 --- a/virtual/jdk/Manifest +++ b/virtual/jdk/Manifest @@ -1,4 +1,3 @@ -EBUILD jdk-1.8.0-r3.ebuild 399 BLAKE2B 1f8011caa1acb3c714998f0d2f85657c0233e97c967cd4eaacc8f7dd86b2a2c38d3aab684ea59cf2f08ffb127ec612b72a637b07e5d89ae6edcf383029a6707f SHA512 800077616fbc5101605143dd2d2cefb296de0cf9f54bb41ab3f09f6672bb6bac7ae2cef6a5ba65aa73b93bd5b518c2eda8ad30c9b7fbcef9d1785db2dde2dc8d -EBUILD jdk-1.8.0-r4.ebuild 474 BLAKE2B 7432bc5a55ec3e59254d389a8d9bbff22611a30fbfc3e15464b0d171432e84ab8974413516c48c38f660e3e1aabc8f1b0e834d8091d4e4cdcccb8b9f07f6a936 SHA512 bba3bcb4849aeba88b5d5f2ebc3428393813b03579182d7b5cf971b1a6aeaa458924e0da8cf40621662db1a6bbb1afa682b76331a600ff6c37c994c21bfd96d8 -EBUILD jdk-11.ebuild 364 BLAKE2B c44c4a193945dd07f271e5894235577d86453961fd5fb0251f9ca9202e405835ed5d460e8d871864a8dcdec6896c89c0a714c2a78af37c4c7230dfc0984b5c0a SHA512 4edd6302773a65eaa581e05032a1a7f8c867f566ed122c7bb8ee1dccbf588823e54a9908386aa0711478273bae0077a2f4fde8fd1c55a9ac14e3a03573b0f916 +EBUILD jdk-1.8.0-r5.ebuild 412 BLAKE2B 199dff482faa3f17b9f3f41e9e4ceb5f31f47b4a8da74a9310fef8c0e1cbcc935ef5d386e131bc2306d28a3c61bcf7870ad1e878ebd932b22184ff3d659d84e7 SHA512 3946a668bc116beeddf9608304279cc941825fc16991470be52aff7f86d79c4796fdda071272cd1933c3b78b0b36f4b715a5d4ed7193c102e37303651ce6385a +EBUILD jdk-11-r1.ebuild 320 BLAKE2B afe18794e5b998b9c09ba77b554a160c0ee4041f9ee87cbc32d17242c03bed968fae47413760da5474d204f974365f95a8ee4d3c12bfa2413cc4f3c2d22bae7a SHA512 e6093468ac7127de8bafb4b4f5309dee990b1916bc6e835d4eafb9c9c9b0686fd6805dd02dbb260262eb64147772900321165793da858c50e66e49df86728444 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 diff --git a/virtual/jdk/jdk-1.8.0-r4.ebuild b/virtual/jdk/jdk-1.8.0-r4.ebuild deleted file mode 100644 index 4c4dec17876a..000000000000 --- a/virtual/jdk/jdk-1.8.0-r4.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Virtual for Java Development Kit (JDK)" -SLOT="1.8" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" - -RDEPEND="|| ( - dev-java/icedtea-bin:8 - dev-java/icedtea:8 - dev-java/openjdk-bin:8[gentoo-vm(+)] - dev-java/openjdk:8[gentoo-vm(+)] - dev-java/oracle-jdk-bin:1.8 - )" diff --git a/virtual/jdk/jdk-1.8.0-r3.ebuild b/virtual/jdk/jdk-1.8.0-r5.ebuild index 29946e2b7fac..714e6853a531 100644 --- a/virtual/jdk/jdk-1.8.0-r3.ebuild +++ b/virtual/jdk/jdk-1.8.0-r5.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +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 ~x86-macos ~sparc64-solaris ~x64-solaris" RDEPEND="|| ( + dev-java/openjdk-bin:8 + dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 - dev-java/oracle-jdk-bin:1.8 - )" +)" diff --git a/virtual/jdk/jdk-11.ebuild b/virtual/jdk/jdk-11-r1.ebuild index ece992cf94d9..4548106d09bf 100644 --- a/virtual/jdk/jdk-11.ebuild +++ b/virtual/jdk/jdk-11-r1.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2018 Gentoo Authors +# 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 ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" RDEPEND="|| ( dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] dev-java/openjdk:${SLOT}[gentoo-vm(+)] - dev-java/oracle-jdk-bin:${SLOT}[gentoo-vm(+)] - )" +)" |