diff --git a/virtual/jdk/jdk-1.7.0-r3.ebuild b/virtual/jdk/jdk-1.7.0-r3.ebuild
deleted file mode 100644
index 5961632d4..000000000
--- a/virtual/jdk/jdk-1.7.0-r3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="1.7"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="|| (
-		dev-java/icedtea:7
-		dev-java/icedtea-bin:7
-	)"
diff --git a/virtual/jdk/jdk-1.8.0-r4.ebuild b/virtual/jdk/jdk-1.8.0-r5.ebuild
similarity index 57%
rename from virtual/jdk/jdk-1.8.0-r4.ebuild
rename to virtual/jdk/jdk-1.8.0-r5.ebuild
index eed1ab020..c350fd332 100644
--- a/virtual/jdk/jdk-1.8.0-r4.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r5.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="6"
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.8"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="|| (
 		dev-java/icedtea:8
 		dev-java/icedtea-bin:8
+		dev-java/openjdk:8[gentoo-vm(+)]
+		dev-java/openjdk-bin:8[gentoo-vm(+)]
 		dev-java/oracle-jdk-bin:1.8
 	)"