diff --git a/metadata/md5-cache/virtual/jdk-1.6.0 b/metadata/md5-cache/virtual/jdk-1.6.0
deleted file mode 100644
index 191b165..0000000
--- a/metadata/md5-cache/virtual/jdk-1.6.0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for JDK
-KEYWORDS=amd64 ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-RDEPEND=|| ( amd64? ( dev-java/icedtea6-bin ) x86? ( dev-java/icedtea6-bin ) amd64-linux? ( dev-java/icedtea6-bin ) x86-linux? ( dev-java/icedtea6-bin ) amd64? ( =dev-java/icedtea-6* ) x86? ( =dev-java/icedtea-6* ) amd64? ( =dev-java/sun-jdk-1.6.0* ) x86? ( =dev-java/sun-jdk-1.6.0* ) amd64-linux? ( =dev-java/sun-jdk-1.6.0* ) x86-linux? ( =dev-java/sun-jdk-1.6.0* ) x64-solaris? ( =dev-java/sun-jdk-1.6.0* ) x86-solaris? ( =dev-java/sun-jdk-1.6.0* ) sparc-solaris? ( =dev-java/sun-jdk-1.6.0* ) sparc64-solaris? ( =dev-java/sun-jdk-1.6.0* ) =dev-java/ibm-jdk-bin-1.6.0* =dev-java/hp-jdk-bin-1.6.0* =dev-java/diablo-jdk-1.6.0* =dev-java/soylatte-jdk-bin-1.0* =dev-java/apple-jdk-bin-1.6.0* =dev-java/winjdk-bin-1.6.0* )
-SLOT=1.6
-_md5_=08be2dcdb5d07b4b7a62d96710f1e47d
diff --git a/metadata/md5-cache/virtual/jdk-1.6.0-r2 b/metadata/md5-cache/virtual/jdk-1.6.0-r2
new file mode 100644
index 0000000..4382a8c
--- /dev/null
+++ b/metadata/md5-cache/virtual/jdk-1.6.0-r2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Development Kit (JDK)
+EAPI=4
+KEYWORDS=amd64 arm ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+RDEPEND=|| ( ppc? ( || ( =dev-java/ibm-jdk-bin-1.6.0* =dev-java/icedtea-6* ) ) ppc64? ( || ( =dev-java/ibm-jdk-bin-1.6.0* =dev-java/icedtea-6* ) ) prefix? ( || ( =dev-java/icedtea-bin-6* =dev-java/icedtea-bin-1* ) ) =dev-java/icedtea-bin-6* =dev-java/icedtea-bin-1* =dev-java/icedtea-6* =dev-java/ibm-jdk-bin-1.6.0* =dev-java/hp-jdk-bin-1.6.0* =dev-java/diablo-jdk-1.6.0* =dev-java/soylatte-jdk-bin-1.0* =dev-java/apple-jdk-bin-1.6.0* =dev-java/winjdk-bin-1.6.0* )
+SLOT=1.6
+_md5_=6edcbf09a7d1477a1b67803b5d7771c1