gentoo resync : 23.09.2020

4 files changed, 9 insertions, 25 deletions

diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index 1350293aad15..b5cfc14d28e2 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,4 +1,3 @@
-EBUILD jre-1.8.0-r1.ebuild 379 BLAKE2B 4e35789a6f87dd7e76a62a2b8a8a477a59a13968ac0e613c419bfb90d72d2372082e5948cb5086b33117c5ba391b2f1102055bdc3e23aa8e4b3ae089e92ed105 SHA512 43cda60d964ea06a6ed494c4a3a8f067802d258f09be50edfa111c2fb04a7c1c86310339d39a38b67b661647505bd8d386fb5d645c543554a886a818fb5a5d8c
-EBUILD jre-1.8.0-r2.ebuild 418 BLAKE2B cce3fde916d2647aefbc8a0742f573ff42c42293294355128649846e0a70f47c799c98cb827402a5b24ac4ecebef1887dd373c14726664543359aca244bda884 SHA512 55cc9f0ff22991428d021e4a139695a90be5acf9a7b1a07e9905f1a8eda3e25c6c53e2b6e5eb601762134d844aa46909326b6d098e7a43bd349267b90c3f99bb
-EBUILD jre-11-r1.ebuild 353 BLAKE2B a5860fd569169adf49eabe2f23012af6054bf8fe8e28070bc0cfdc3365e02b10acc601056698022d154ba7d77e72a2f54c83dbc094a7572e0ee7d1cadc55416f SHA512 cc797f854731cf1fdb3b1001dd71b2e6234f2567a00ca1f1b8f3ffa3f6493fb976107d04380e135e951a1420dc21811b8dec95f75646937d4d88ad281231e2fa
+EBUILD jre-1.8.0-r3.ebuild 371 BLAKE2B 95d02d7c33aa27da97f1c0a606ae7cdf98c44780553afdeea9c1849a4a5b7db325a8255a1cf332667fcc73ed84d410b6d0395a37153e89e152e0fb9ee8540976 SHA512 062c9795c48a27d479a5eb49fe34c7d957a90950178209b055e5246c97d15b16807436e759aab063344cf9cea7a514c2d2ed544d898e9680a0f80985720d0ca3
+EBUILD jre-11-r2.ebuild 309 BLAKE2B 8e7122f9553999b5be2e96b35b8f27f1725335722dbe6e9ca600c6f0fd35fded12e3b1d52a9c2226a3ebcfba1caeb62359d7e184637792ee63e29f94ad1c3157 SHA512 67c40b8ccbcf03ff91d834bb03fb5f51a0ee7b453e9b116d4120839484669bb610f9acfd9c9180d24dd399e99b9e7db0828fb52a34598256363dbe49028c469f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/virtual/jre/jre-1.8.0-r1.ebuild b/virtual/jre/jre-1.8.0-r1.ebuild
deleted file mode 100644
index 119ffbd103c7..000000000000
--- a/virtual/jre/jre-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-
-RDEPEND="|| (
-		virtual/jdk:1.8
-		dev-java/oracle-jre-bin:1.8
-	)"
diff --git a/virtual/jre/jre-1.8.0-r2.ebuild b/virtual/jre/jre-1.8.0-r3.ebuild
index 4b0e1e98bd24..225cc8dbc8fa 100644
--- a/virtual/jre/jre-1.8.0-r2.ebuild
+++ b/virtual/jre/jre-1.8.0-r3.ebuild
@@ -1,7 +1,7 @@
-# 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 Runtime Environment (JRE)"
 SLOT="1.8"
@@ -9,6 +9,5 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 
 RDEPEND="|| (
 		virtual/jdk:1.8
-		dev-java/openjdk-jre-bin:8[gentoo-vm(+)]
-		dev-java/oracle-jre-bin:1.8
-	)"
+		dev-java/openjdk-jre-bin:8
+)"
diff --git a/virtual/jre/jre-11-r1.ebuild b/virtual/jre/jre-11-r2.ebuild
index fbc640b49acc..53052a2bd68c 100644
--- a/virtual/jre/jre-11-r1.ebuild
+++ b/virtual/jre/jre-11-r2.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 RDEPEND="|| (
 		virtual/jdk:${SLOT}
 		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/oracle-jre-bin:${SLOT}[gentoo-vm(+)]
-	)"
+)"