[gentoo-commits] repo/gentoo:master commit in: virtual/jdk/

[Miroslav Šulc]

commit:     91b9d579cdfc6a92c37f85a7beb82e80b05dccc3
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 06:58:01 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 06:58:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b9d579

virtual/jdk: copied stable to 1.8.0-r6, dropped old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 virtual/jdk/jdk-1.8.0-r5.ebuild | 15 ---------------
 virtual/jdk/jdk-1.8.0-r6.ebuild |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

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 f20b926921f..00000000000
--- 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
index e284632739b..62bdccc8153 100644
--- a/virtual/jdk/jdk-1.8.0-r6.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r6.ebuild
@@ -5,7 +5,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="headless-awt"
 
 RDEPEND="|| (