2016-04-14 20:47:04 UTC

23 files changed, 7 insertions, 287 deletions

diff --git a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1 b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
deleted file mode 100644
index 97da3c527fbe..000000000000
--- a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=dev-lang/mono-2 dev-libs/glib !dev-dotnet/ikvm-bin >=dev-dotnet/nant-0.85 >=virtual/jdk-1.6 app-arch/unzip virtual/pkgconfig app-arch/sharutils >=dev-java/java-config-2.2.0
-DESCRIPTION=Java VM for .NET
-EAPI=4
-HOMEPAGE=http://www.ikvm.net/ http://weblog.ikvm.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=ZLIB GPL-2-with-linking-exception
-RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.1.zip
-_eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ca61ec2520b71b6f61139af878cde63a
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2 b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
deleted file mode 100644
index bd8b0a55e9b3..000000000000
--- a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=dev-lang/mono-2 dev-libs/glib !dev-dotnet/ikvm-bin >=dev-dotnet/nant-0.85 virtual/jdk:1.6 app-arch/unzip virtual/pkgconfig app-arch/sharutils >=dev-java/java-config-2.2.0
-DESCRIPTION=Java VM for .NET
-EAPI=4
-HOMEPAGE=http://www.ikvm.net/ http://weblog.ikvm.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=ZLIB GPL-2-with-linking-exception
-RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.2.zip
-_eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d87c81e839c4c46db2cd90a3da9c47e9
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2 b/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
deleted file mode 100644
index b9175228ac37..000000000000
--- a/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=dev-lang/mono-2 dev-libs/glib !dev-dotnet/ikvm-bin >=dev-dotnet/nant-0.85 virtual/jdk:1.7 app-arch/unzip virtual/pkgconfig app-arch/sharutils >=dev-java/java-config-2.2.0
-DESCRIPTION=Java VM for .NET
-EAPI=4
-HOMEPAGE=http://www.ikvm.net/ http://weblog.ikvm.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB GPL-2-with-linking-exception
-RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=http://www.frijters.net/openjdk-7u4-stripped.zip http://www.frijters.net/ikvmsrc-7.1.4532.2.zip
-_eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9bde0f2ff20bac8816138840241c8722
diff --git a/metadata/md5-cache/dev-java/apple-jdk-bin-1.6.0 b/metadata/md5-cache/dev-java/apple-jdk-bin-1.6.0
deleted file mode 100644
index d15541548825..000000000000
--- a/metadata/md5-cache/dev-java/apple-jdk-bin-1.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prerm setup
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=Links to Apple's version of Sun's J2SE Development Kit
-EAPI=0
-HOMEPAGE=http://java.sun.com/j2se/1.6.0/
-KEYWORDS=-* ~x64-macos ~x86-macos
-LICENSE=public-domain
-RDEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-SLOT=1.6
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_preinst:- pkg_postrm:java-vm-2 pkg_postinst:- pkg_setup:java-vm-2 src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=71b2e23e003a010b83d49f955e44f2f8
diff --git a/metadata/md5-cache/dev-java/hp-jdk-bin-1.6.0.05 b/metadata/md5-cache/dev-java/hp-jdk-bin-1.6.0.05
deleted file mode 100644
index 10cedb77c1bc..000000000000
--- a/metadata/md5-cache/dev-java/hp-jdk-bin-1.6.0.05
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup unpack
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=HP JDK/JRE and Plug-In
-EAPI=2
-HOMEPAGE=http://www.hp.com/go/java
-IUSE=doc examples nsplugin
-KEYWORDS=-* ~hppa-hpux ~ia64-hpux
-LICENSE=HP-JDKJRE6
-RDEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-RESTRICT=fetch
-SLOT=1.6
-SRC_URI=hppa-hpux? ( jdk6_16005_pa.depot ) ia64-hpux? ( jdk6_16005_ia.depot )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_unpack:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b17dba155b6e59a1386a7bbd7a32f3c5
diff --git a/metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p2 b/metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p2
deleted file mode 100644
index c0e8cdb48632..000000000000
--- a/metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm setup unpack
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=IBM Java SE Development Kit
-EAPI=0
-HOMEPAGE=http://www.ibm.com/developerworks/java/jdk/
-IUSE=X alsa doc examples javacomm nsplugin odbc selinux
-KEYWORDS=-* amd64 ppc64 x86
-LICENSE=IBM-J1.6
-RDEPEND=ppc? ( =virtual/libstdc++-3.3 ) ppc64? ( =virtual/libstdc++-3.3 ) X? ( x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXp x11-libs/libXtst x11-libs/libX11 x11-libs/libXt ) alsa? ( media-libs/alsa-lib ) doc? ( =dev-java/java-sdk-docs-1.6.0* ) odbc? ( dev-db/unixODBC ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-RESTRICT=fetch
-SLOT=1.6
-SRC_URI=x86? ( ibm-java-sdk-6.0-9.2-linux-i386.tgz ) amd64? ( ibm-java-sdk-6.0-9.2-linux-x86_64.tgz ) ppc? ( ibm-java-sdk-6.0-9.2-linux-ppc.tgz ) ppc64? ( ibm-java-sdk-6.0-9.2-linux-ppc64.tgz ) javacomm? ( x86? ( ibm-java-javacomm-6.0-9.0-linux-i386.tgz ) amd64? ( ibm-java-javacomm-6.0-9.0-linux-x86_64.tgz ) ppc? ( ibm-java-javacomm-6.0-9.0-linux-ppc.tgz ) ppc64? ( ibm-java-javacomm-6.0-9.0-linux-ppc64.tgz ) )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8c2e5332fd38ebfcbef993c80900a86d
diff --git a/metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p2-r1 b/metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p2-r1
deleted file mode 100644
index cc91b9337963..000000000000
--- a/metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare prerm setup unpack
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=IBM Java SE Development Kit
-EAPI=4
-HOMEPAGE=http://www.ibm.com/developerworks/java/jdk/
-IUSE=X alsa doc examples javacomm nsplugin odbc selinux
-KEYWORDS=-* ~amd64 ~ppc64 ~x86
-LICENSE=IBM-J1.6
-RDEPEND=ppc? ( =virtual/libstdc++-3.3 ) ppc64? ( =virtual/libstdc++-3.3 ) X? ( x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXp x11-libs/libXtst x11-libs/libX11 x11-libs/libXt ) alsa? ( media-libs/alsa-lib ) doc? ( =dev-java/java-sdk-docs-1.6.0* ) odbc? ( dev-db/unixODBC ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-RESTRICT=fetch
-SLOT=1.6
-SRC_URI=x86? ( ibm-java-sdk-6.0-9.2-linux-i386.tgz ) amd64? ( ibm-java-sdk-6.0-9.2-linux-x86_64.tgz ) ppc? ( ibm-java-sdk-6.0-9.2-linux-ppc.tgz ) ppc64? ( ibm-java-sdk-6.0-9.2-linux-ppc64.tgz ) javacomm? ( x86? ( ibm-java-javacomm-6.0-9.0-linux-i386.tgz ) amd64? ( ibm-java-javacomm-6.0-9.0-linux-x86_64.tgz ) ppc? ( ibm-java-javacomm-6.0-9.0-linux-ppc.tgz ) ppc64? ( ibm-java-javacomm-6.0-9.0-linux-ppc64.tgz ) )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_unpack:- src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e0cd40e766a87f9e531a09b71796411d
diff --git a/metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p2 b/metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p2
deleted file mode 100644
index ef18f08c1551..000000000000
--- a/metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=IBM Java SE Runtime Environment
-EAPI=0
-HOMEPAGE=http://www.ibm.com/developerworks/java/jdk/
-IUSE=X alsa nsplugin odbc selinux
-KEYWORDS=-* amd64 ppc64 x86
-LICENSE=IBM-J1.6
-RDEPEND=X? ( x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXp x11-libs/libXtst x11-libs/libX11 x11-libs/libXt ) alsa? ( media-libs/alsa-lib ) odbc? ( dev-db/unixODBC ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-RESTRICT=fetch
-SLOT=1.6
-SRC_URI=x86? ( ibm-java-jre-6.0-9.2-linux-i386.tgz ) amd64? ( ibm-java-jre-6.0-9.2-linux-x86_64.tgz ) ppc? ( ibm-java-jre-6.0-9.2-linux-ppc.tgz ) ppc64? ( ibm-java-jre-6.0-9.2-linux-ppc64.tgz )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ad156837cd52cd73a2e63e3a51439c3
diff --git a/metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p2-r1 b/metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p2-r1
deleted file mode 100644
index 9e8e4f84b00c..000000000000
--- a/metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm setup unpack
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=IBM Java SE Runtime Environment
-EAPI=4
-HOMEPAGE=http://www.ibm.com/developerworks/java/jdk/
-IUSE=X alsa nsplugin odbc selinux
-KEYWORDS=-* ~amd64 ~ppc64 ~x86
-LICENSE=IBM-J1.6
-RDEPEND=X? ( x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXp x11-libs/libXtst x11-libs/libX11 x11-libs/libXt ) alsa? ( media-libs/alsa-lib ) odbc? ( dev-db/unixODBC ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-RESTRICT=fetch
-SLOT=1.6
-SRC_URI=x86? ( ibm-java-jre-6.0-9.2-linux-i386.tgz ) amd64? ( ibm-java-jre-6.0-9.2-linux-x86_64.tgz ) ppc? ( ibm-java-jre-6.0-9.2-linux-ppc.tgz ) ppc64? ( ibm-java-jre-6.0-9.2-linux-ppc64.tgz )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5121692ccbb18f3a07627aef67132ae5
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2 b/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2
deleted file mode 100644
index 4488a166be50..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=media-libs/freetype-2.3.5:2= >=media-libs/lcms-2.5 >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= javascript? ( dev-java/rhino:1.6 ) kerberos? ( virtual/krb5 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXt >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.2 dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl sys-apps/lsb-release virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=5
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa cacao cjk +cups debug doc examples +gtk headless-awt javascript +jbootstrap kerberos nsplugin +nss pax_kernel pulseaudio selinux source systemtap test +webstart zero elibc_FreeBSD test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-PDEPEND=webstart? ( dev-java/icedtea-web:0 ) nsplugin? ( dev-java/icedtea-web:0[nsplugin] )
-RDEPEND=>=media-libs/freetype-2.3.5:2= >=media-libs/lcms-2.5 >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= javascript? ( dev-java/rhino:1.6 ) kerberos? ( virtual/krb5 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 !dev-java/icedtea-web:6 media-fonts/dejavu alsa? ( >=media-libs/alsa-lib-1.0 ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=x11-libs/gtk+-2.8:2 ) !headless-awt? ( >=media-libs/giflib-4.1.6:= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXt ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-RESTRICT=test
-SLOT=6
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.13.9.tar.xz https://java.net/downloads/openjdk6/openjdk-6-src-b37-11_nov_2015.tar.xz http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz -> icedtea-cacao-68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclass_exported_funcs=pkg_pretend:- pkg_prerm:java-vm-2 pkg_preinst:- pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:- src_unpack:- src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=decc61d505d65c10a0a6d2480ef4c999
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-6.1.13.9 b/metadata/md5-cache/dev-java/icedtea-bin-6.1.13.9
deleted file mode 100644
index dfd544335628..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-bin-6.1.13.9
+++ /dev/null
@@ -1,17 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare prerm setup
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=5
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa cjk +cups doc examples +gtk headless-awt nsplugin selinux source +webstart
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2-with-linking-exception
-PDEPEND=webstart? ( dev-java/icedtea-web:0 ) nsplugin? ( dev-java/icedtea-web:0[nsplugin] )
-RDEPEND=>=dev-libs/nss-3.12.5-r1 media-fonts/dejavu >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-devel/gcc-4.9.3 >=sys-libs/glibc-2.21 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) !headless-awt? ( >=media-libs/giflib-4.1.6-r1 media-libs/libpng:0/16 >=x11-libs/libX11-1.6 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=6
-SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-6.1.13.9.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-6.1.13.9.tar.xz ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-6.1.13.9-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-6.1.13.9-amd64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-6.1.13.9-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-6.1.13.9-x86.tar.xz ) )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_preinst:- pkg_postrm:java-vm-2 pkg_postinst:- pkg_setup:java-vm-2 src_prepare:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ff20ff3a07749e412a01cebb1e65a64d
diff --git a/metadata/md5-cache/dev-java/jcharts-0.7.5-r3 b/metadata/md5-cache/dev-java/jcharts-0.7.5-r3
deleted file mode 100644
index 66c2842351a7..000000000000
--- a/metadata/md5-cache/dev-java/jcharts-0.7.5-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/batik:1.8 java-virtuals/servlet-api:3.0 || ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=jCharts is a 100% Java based charting utility that outputs a variety of charts
-EAPI=5
-HOMEPAGE=http://jcharts.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/batik:1.8 java-virtuals/servlet-api:3.0 || ( virtual/jre:1.6 virtual/jre:1.5 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/jcharts/jCharts-0.7.5.zip
-_eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b78e46c484be101f3e60d578bbf0c638
diff --git a/metadata/md5-cache/dev-java/soylatte-jdk-bin-1.0.3 b/metadata/md5-cache/dev-java/soylatte-jdk-bin-1.0.3
deleted file mode 100644
index b7b9b9f68271..000000000000
--- a/metadata/md5-cache/dev-java/soylatte-jdk-bin-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm setup
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=Landon Fuller's Java 6 for Mac OS X 10.4 and 10.5
-EAPI=3
-HOMEPAGE=http://landonf.bikemonkey.org/static/soylatte/
-IUSE=examples
-KEYWORDS=~x86-macos ~x64-macos
-LICENSE=sun-jrl
-RDEPEND=dev-db/unixODBC >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-SLOT=1.6
-SRC_URI=x86-macos? ( http://landonf.bikemonkey.org/static/soylatte/bsd-dist/javasrc_1_6_jrl_darwin/soylatte16-i386-1.0.3.tar.bz2 ) x64-macos? ( http://landonf.bikemonkey.org/static/soylatte/bsd-dist/javasrc_1_6_jrl_darwin/soylatte16-amd64-1.0.3.tar.bz2 )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_prepare:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=ce9153ab0ba379d2e1c213b2810b2141
diff --git a/metadata/md5-cache/dev-java/soylatte-jdk-bin-7 b/metadata/md5-cache/dev-java/soylatte-jdk-bin-7
deleted file mode 100644
index 6bdf44c175d3..000000000000
--- a/metadata/md5-cache/dev-java/soylatte-jdk-bin-7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm setup
-DEPEND=>=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=Landon Fuller's OpenJDK 7 for Mac OS X 10.5/PPC
-EAPI=3
-HOMEPAGE=http://landonf.bikemonkey.org/static/soylatte/
-IUSE=examples
-KEYWORDS=~ppc-macos
-LICENSE=GPL-2-with-exceptions
-RDEPEND=dev-db/unixODBC >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-SLOT=1.7
-SRC_URI=http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk7_darwin/openjdk7-macppc-2009-12-16-b4.tar.bz2
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:java-vm-2 pkg_setup:java-vm-2 src_prepare:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=66b9bbe2a93f2e85bcc2157d72748f69
diff --git a/metadata/md5-cache/dev-java/sun-jce-bin-1.6.0 b/metadata/md5-cache/dev-java/sun-jce-bin-1.6.0
deleted file mode 100644
index 57cf16d68980..000000000000
--- a/metadata/md5-cache/dev-java/sun-jce-bin-1.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files 1.6.0
-EAPI=0
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/overview/index-jsp-136246.html
-KEYWORDS=amd64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=Oracle-BCLA-JavaSE
-RESTRICT=fetch
-SLOT=1.6
-SRC_URI=jce_policy-6.zip
-_eclass_exported_funcs=src_unpack:- src_install:-
-_md5_=932a460a2ea0cad9b6d82e09b7251014
diff --git a/metadata/md5-cache/dev-java/sun-jdk-1.6.0.45 b/metadata/md5-cache/dev-java/sun-jdk-1.6.0.45
deleted file mode 100644
index 4c991047f600..000000000000
--- a/metadata/md5-cache/dev-java/sun-jdk-1.6.0.45
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm setup unpack
-DEPEND=jce? ( app-arch/unzip ) kernel_SunOS? ( app-arch/unzip ) pax_kernel? ( sys-apps/paxctl ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=Oracle's Java SE Development Kit
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel selinux source
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) doc? ( dev-java/java-sdk-docs:1.6.0 ) selinux? ( sec-policy/selinux-java ) !prefix? ( sys-libs/glibc ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-RESTRICT=fetch strip
-SLOT=1.6
-SRC_URI=amd64? ( jdk-6u45-linux-x64.bin examples? ( jdk-6u45-linux-x64-demos.tar.gz ) ) ia64? ( jdk-6u45-linux-ia64.bin examples? ( jdk-6u45-linux-ia64-demos.tar.gz ) ) x86? ( jdk-6u45-linux-i586.bin examples? ( jdk-6u45-linux-i586-demos.tar.gz ) ) x64-solaris? ( jdk-6u45-solaris-i586.sh jdk-6u45-solaris-x64.sh examples? ( jdk-6u45-solaris-i586-demos.tar.Z jdk-6u45-solaris-x64-demos.tar.Z ) ) x86-solaris? ( jdk-6u45-solaris-i586.sh examples? ( jdk-6u45-solaris-i586-demos.tar.Z ) ) sparc-solaris? ( jdk-6u45-solaris-sparc.sh examples? ( jdk-6u45-solaris-sparc-demos.tar.Z ) ) sparc64-solaris? ( jdk-6u45-solaris-sparc.sh jdk-6u45-solaris-sparcv9.sh examples? ( jdk-6u45-solaris-sparc-demos.tar.Z jdk-6u45-solaris-sparcv9-demos.tar.Z ) ) jce? ( jce_policy-6.zip )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:- pkg_setup:java-vm-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c18f78767cbd476a0685bedd2147a9b2
diff --git a/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.45 b/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.45
deleted file mode 100644
index 06d52d1318e1..000000000000
--- a/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.45
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm setup unpack
-DEPEND=pax_kernel? ( sys-apps/paxctl ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=Oracle's Java SE Runtime Environment
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=X alsa jce nsplugin pax_kernel selinux
-KEYWORDS=amd64 x86
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=X? ( x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libX11 ) alsa? ( media-libs/alsa-lib ) jce? ( dev-java/sun-jce-bin:1.6 ) !prefix? ( sys-libs/glibc ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-RESTRICT=fetch strip
-SLOT=1.6
-SRC_URI=amd64? ( jre-6u45-linux-x64.bin ) ia64? ( jre-6u45-linux-ia64.bin ) x86? ( jre-6u45-linux-i586.bin )
-_eclass_exported_funcs=pkg_prerm:java-vm-2 pkg_postrm:java-vm-2 pkg_postinst:- pkg_setup:java-vm-2 src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	23ae8c186171e6476af098d2a50d0ee0	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=941201fc8532fea713e6df7bfeece9d5
diff --git a/metadata/md5-cache/virtual/jdk-1.6.0-r2 b/metadata/md5-cache/virtual/jdk-1.6.0-r2
deleted file mode 100644
index b5323323c6cd..000000000000
--- a/metadata/md5-cache/virtual/jdk-1.6.0-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Java Development Kit (JDK)
-EAPI=4
-KEYWORDS=amd64 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* ) ) =dev-java/icedtea-bin-6* =dev-java/icedtea-6* =dev-java/ibm-jdk-bin-1.6.0* =dev-java/hp-jdk-bin-1.6.0* =dev-java/soylatte-jdk-bin-1.0* =dev-java/apple-jdk-bin-1.6.0* )
-SLOT=1.6
-_eclass_exported_funcs=-
-_md5_=cf13e6085dca42b6f179dba089ad9267
diff --git a/metadata/md5-cache/virtual/jdk-1.7.0-r1 b/metadata/md5-cache/virtual/jdk-1.7.0-r1
index a0cae16da38d..cd7e1149d77b 100644
--- a/metadata/md5-cache/virtual/jdk-1.7.0-r1
+++ b/metadata/md5-cache/virtual/jdk-1.7.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Java Development Kit (JDK)
 EAPI=6
 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-bin:7 dev-java/icedtea:7 dev-java/oracle-jdk-bin:1.7 dev-java/soylatte-jdk-bin:1.7 )
+RDEPEND=|| ( dev-java/icedtea-bin:7 dev-java/icedtea:7 dev-java/oracle-jdk-bin:1.7 )
 SLOT=1.7
 _eclass_exported_funcs=-
-_md5_=27e4fe4132499fb316c24b251fa0a897
+_md5_=b28fe93d4749f62cee1c537764d61d70
diff --git a/metadata/md5-cache/virtual/jre-1.6.0-r1 b/metadata/md5-cache/virtual/jre-1.6.0-r1
deleted file mode 100644
index e8de8ba955cb..000000000000
--- a/metadata/md5-cache/virtual/jre-1.6.0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Java Runtime Environment (JRE)
-EAPI=5
-KEYWORDS=amd64 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=|| ( =virtual/jdk-1.6.0* =dev-java/ibm-jre-bin-1.6.0* )
-SLOT=1.6
-_eclass_exported_funcs=-
-_md5_=c0d6550aace27eebcaaef74ae338f61b
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 322ee5f31251..ee5dd0d8344d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -2981,7 +2981,6 @@ dev-dotnet/gtk-sharp-docs 2.12.10: GtkSharp's gtk-docs module of the gtk-sharp t
 dev-dotnet/gtk-sharp-gapi 2.12.10: GtkSharp's gtk-gapi module of the gtk-sharp tarball
 dev-dotnet/gtksourceview-sharp 2.24.0-r10: GtkSharp's gtksourceview module of the gnome-desktop-sharp tarball
 dev-dotnet/gudev-sharp 0.1: GUDEV API C# binding
-dev-dotnet/ikvm 0.46.0.1 0.46.0.2 7.1.4532.2: Java VM for .NET
 dev-dotnet/ikvm-bin 0.46.0.2 7.1.4532.2: Java VM for .NET
 dev-dotnet/libgdiplus 2.10.9 2.10.9-r1 2.10.9-r2 3.12 4.2-r1 4.2-r2: Library for using System.Drawing with mono
 dev-dotnet/log4net 1.2.11: tool to help the programmer output log statements to a variety of output targets
@@ -3729,7 +3728,6 @@ dev-java/antlr 2.7.7-r7 3.2 3.5.2 4.4 4.5.1: A parser generator for many languag
 dev-java/aopalliance 1.0-r2: Aspect-Oriented Programming (AOP) Alliance classes
 dev-java/appframework 1.03-r4: A small set of Java classes that simplify building desktop applications
 dev-java/apple-java-extensions-bin 1.5 1.5-r1: A pluggable jar of stub classes representing the new Apple eAWT and eIO APIs for Java on Mac OS X
-dev-java/apple-jdk-bin 1.6.0: Links to Apple's version of Sun's J2SE Development Kit
 dev-java/apt-mirror 1.0-r1: Annotation processing apt mirror API introduced in J2SE 5.0
 dev-java/args4j 2.32: args4j is a Java command line arguments parser
 dev-java/asm 2.0-r2 2.2.3-r2 3.3.1-r1 4.0-r1 5.0.3 5.0.4: Bytecode manipulation framework for Java
@@ -3895,17 +3893,14 @@ dev-java/helpgui 1.1-r2: HelpGUI is a simple library which develop a help viewer
 dev-java/hessian 4.0.37: Binary web service protocol
 dev-java/higlayout 1.0-r2: Java Swing layout manager that's powerful and easy to use
 dev-java/hoteqn 4.0.0-r1: Java applet to view and display LaTeX mathematical equations
-dev-java/hp-jdk-bin 1.6.0.05: HP JDK/JRE and Plug-In
 dev-java/htmlcleaner 2.13: HTML parser written in Java that can be used as a tool, library or Ant task
 dev-java/htmlparser 1.4-r1: Implementation of the HTML5 parsing algorithm in Java
 dev-java/htmlparser-org 1.6: Java library used to parse HTML (from htmlparser.org)
 dev-java/httpcomponents-client 4.5: A low level toolset of Java components focused on HTTP and associated protocols
 dev-java/httpcomponents-core 4.4.1-r1: A low level toolset of Java components focused on HTTP and associated protocols
-dev-java/ibm-jdk-bin 1.6.0.9_p2 1.6.0.9_p2-r1: IBM Java SE Development Kit
-dev-java/ibm-jre-bin 1.6.0.9_p2 1.6.0.9_p2-r1: IBM Java SE Runtime Environment
 dev-java/ical4j 1.0.5: a Java library for handling iCalendar data streams
-dev-java/icedtea 3.0.0 6.1.13.9-r2 7.2.6.5-r1: A harness to build OpenJDK using Free Software build tools and dependencies
-dev-java/icedtea-bin 3.0.0_pre10 3.0.0-r1 6.1.13.9 7.2.6.5: A Gentoo-made binary build of the IcedTea JDK
+dev-java/icedtea 3.0.0 7.2.6.5-r1: A harness to build OpenJDK using Free Software build tools and dependencies
+dev-java/icedtea-bin 3.0.0_pre10 3.0.0-r1 7.2.6.5: A Gentoo-made binary build of the IcedTea JDK
 dev-java/icedtea-sound 1.0.1: Plugins for javax.sound
 dev-java/icedtea-web 1.5.1-r1 1.6.1-r1: FOSS Java browser plugin and Web Start implementation
 dev-java/icu4j 54.1.1 55.1: A set of Java libraries providing Unicode and Globalization support
@@ -3973,7 +3968,6 @@ dev-java/jboss-modules 1.3.0 1.3.3: JBoss modular classloading system
 dev-java/jcalendar 1.4: Java date chooser bean for graphically picking a date
 dev-java/jchardet 1.1-r1: Java port of Mozilla's Automatic Charset Detection algorithm
 dev-java/jchart2d 3.2.2: A minimalistic realtime charting library for Java
-dev-java/jcharts 0.7.5-r3: jCharts is a 100% Java based charting utility that outputs a variety of charts
 dev-java/jcifs 1.3.17-r1: Library that implements the CIFS/SMB networking protocol in Java
 dev-java/jcip-annotations 1.0.1: Clean room implementation of the JCIP Annotations
 dev-java/jclasslib 3.0-r1: A bytecode viewer is a tool
@@ -4217,7 +4211,6 @@ dev-java/smack 2.2.1: An Open Source XMPP (Jabber) client library for instant me
 dev-java/snakeyaml 1.16: A YAML 1.1 parser and emitter for Java 5
 dev-java/snappy 1.0.3_rc3 1.1.0.1: Snappy compressor/decompressor for Java
 dev-java/snip 0.11-r1: an Apache ANT optional task that extracts snippets of code from text files
-dev-java/soylatte-jdk-bin 1.0.3 7: Landon Fuller's OpenJDK 7 for Mac OS X 10.5/PPC
 dev-java/spice-jndikit 1.2 1.4: JNDI Kit is a toolkit designed to help with the construction of JNDI providers
 dev-java/spin 1.5-r1: Transparent threading solution for non-freezing Swing applications
 dev-java/spring-aop 3.2.4: A comprehensive programming and configuration model for modern Java-based enterprise applications
@@ -4239,12 +4232,9 @@ dev-java/sun-jaf 1.1.1: Sun's JavaBeans Activation Framework (JAF)
 dev-java/sun-jai-bin 1.1.3 1.1.3-r1: JAI is a class library for managing images
 dev-java/sun-java3d-bin 1.3.2-r1 1.4.0_pre5-r1: Sun Java3D API Core
 dev-java/sun-javamail 1.4.3: A Java-based framework to build multiplatform mail and messaging applications
-dev-java/sun-jce-bin 1.6.0: Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files 1.6.0
-dev-java/sun-jdk 1.6.0.45: Oracle's Java SE Development Kit
 dev-java/sun-jimi 1.0-r3: Jimi is a class library for managing images
 dev-java/sun-jms 1.1-r2: The Java Message Service (JMS) API
 dev-java/sun-jmx 1.2.1-r3: Java Management Extensions for managing and monitoring devices, applications, and services
-dev-java/sun-jre-bin 1.6.0.45: Oracle's Java SE Runtime Environment
 dev-java/super-csv 2.3.1: A fast, programmer-friendly, free CSV library for Java
 dev-java/svgsalamander 0.0-r2: a SVG engine for Java
 dev-java/swarmcache 1.0_pre20050106-r1: SwarmCache is a simple but effective distributed cache
@@ -17353,9 +17343,9 @@ virtual/httpd-php 5.4-r1 5.5 5.6 7.0: Virtual to provide PHP-enabled webservers
 virtual/imap-c-client 0 1: Virtual for IMAP c-client
 virtual/inetd 0: Virtual for the internet super-server daemon
 virtual/jack 0: Virtual for JACK Audio Connection Kit
-virtual/jdk 1.6.0-r2 1.7.0-r1 1.8.0-r2 1.8.0-r3: Virtual for Java Development Kit (JDK)
+virtual/jdk 1.7.0-r1 1.8.0-r2 1.8.0-r3: Virtual for Java Development Kit (JDK)
 virtual/jpeg 0-r2 62: A virtual for the libjpeg.so.62 ABI for binary-only programs
-virtual/jre 1.6.0-r1 1.7.0-r1 1.8.0-r1: Virtual for Java Runtime Environment (JRE)
+virtual/jre 1.7.0-r1 1.8.0-r1: Virtual for Java Runtime Environment (JRE)
 virtual/krb5 0 0-r1: Virtual for Kerberos V implementation
 virtual/lapack 3.0 3.1: Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation
 virtual/latex-base 1.0: Virtual for basic LaTeX binaries
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c57d5ed121b1..b9289c6fef7f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Apr 2016 20:23:01 +0000
+Thu, 14 Apr 2016 20:47:05 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 523817dc7195..4d754ccb8ff6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1729,7 +1729,6 @@ dev-java/gnu-classpath:gstreamer - Build with GStreamer javax.sound.sampler prov
 dev-java/gnu-classpath:gtk - Build with Gtk+ AWT peers
 dev-java/gnu-classpath:qt4 - Build with Qt4 AWT peers
 dev-java/gnu-classpath:xml - Build with native XML backend
-dev-java/ibm-jdk-bin:javacomm - Enable Java Communications API support
 dev-java/icedtea:cacao - Use the CACAO virtual machine rather than HotSpot.
 dev-java/icedtea:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/icedtea:infinality - Enable better font rendering using fontconfig.
@@ -1741,7 +1740,6 @@ dev-java/icedtea:pax_kernel - Apply patch needed for pax enabled kernels.
 dev-java/icedtea:sctp - Build the SCTP NIO channel implementation against lksctp
 dev-java/icedtea:smartcard - Build the PCSC driver against pcsc-lite
 dev-java/icedtea:sunec - Build the SunEC provider against system NSS
-dev-java/icedtea:systemtap - Enable SystemTap probes in HotSpot.
 dev-java/icedtea:webstart - Enable Web Start support (via NetX).
 dev-java/icedtea:zero - Enable Zero assembler port (usually for non-HotSpot architectures)
 dev-java/icedtea-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
@@ -1784,11 +1782,6 @@ dev-java/proguard:ant - Ant task for using ProGuard in build.xml scripts
 dev-java/proguard:j2me - Adds support for J2ME Wireless Toolkit
 dev-java/rxtx:lfd - Installs and uses LockFileServer daemon (lfd)
 dev-java/sbt:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
-dev-java/sun-jdk:derby - Enable Installation of Bundled Derby (Java DB)
-dev-java/sun-jdk:jce - Enable Java Cryptographic Extension Unlimited Strength Policy files
-dev-java/sun-jdk:pax_kernel - Use paxctl to mark the JVM binaries.
-dev-java/sun-jre-bin:jce - Enable Java Cryptographic Extension Unlimited Strength Policy files
-dev-java/sun-jre-bin:pax_kernel - Use paxctl to mark the JVM binaries.
 dev-java/swt:webkit - Embedded browser support via net-libs/webkit-gtk:2, replacing former xulrunner-based browser.
 dev-lang/bas:lr0 - Use the LR0 parser instead of the recursive descending parser
 dev-lang/crystal:xml - Use the dev-libs/libxml2 library to enable Crystal xml module