Version bump.

Remove vulnerable.
Remove unused auxiliary files.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

8 files changed, 28 insertions, 1099 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 398ade7a0b46..3471120a9065 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.227 2012/10/23 05:04:57 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.228 2012/12/19 17:54:04 sera Exp $
+
+*sun-jre-bin-1.6.0.38 (19 Dec 2012)
+
+  19 Dec 2012; Ralph Sennhauser <sera@gentoo.org> -sun-jre-bin-1.6.0.33.ebuild,
+  -sun-jre-bin-1.6.0.33-r1.ebuild, -sun-jre-bin-1.6.0.33-r2.ebuild,
+  -sun-jre-bin-1.6.0.34.ebuild, -sun-jre-bin-1.6.0.35.ebuild,
+  +sun-jre-bin-1.6.0.38.ebuild, -files/sun-jre-bin-1.6.env,
+  -files/fontconfig.Gentoo.properties:
+  Version bump.
+  Remove vulnerable.
+  Remove unused auxiliary files
 
   23 Oct 2012; Andreas Schuerch <nativemad@gentoo.org>
   sun-jre-bin-1.6.0.37.ebuild:
diff --git a/dev-java/sun-jre-bin/files/fontconfig.Gentoo.properties b/dev-java/sun-jre-bin/files/fontconfig.Gentoo.properties
deleted file mode 100644
index 397229164b29..000000000000
--- a/dev-java/sun-jre-bin/files/fontconfig.Gentoo.properties
+++ /dev/null
@@ -1,161 +0,0 @@
-# Version
-
-version=1
-
-# Component Font Mappings
-
-allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0
-allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
-allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-
-serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-# Search Sequences
-
-sequence.allfonts=latin-1
-sequence.allfonts.Big5=latin-1,chinese-big5
-sequence.allfonts.GB2312=latin-1,chinese-gb18030
-sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208
-sequence.allfonts.EUC-KR=latin-1,korean
-sequence.allfonts.GB18030=latin-1,chinese-gb18030
-sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean
-
-# Exclusion Ranges
-
-exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be
-
-# Font File Names
-
-filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/share/fonts/arphicfonts/bsmi00lp.ttf
-filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/share/fonts/baekmuk-fonts/batang.ttf
-filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/share/fonts/baekmuk-fonts/gulim.ttf
-filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/share/fonts/hkscs-ming/min_uni.ttf
-
-# AWT X11 font paths
-awtfontpath.latin-1=/usr/share/fonts/Type1
-awtfontpath.chinese-big5=/usr/share/fonts/arphicfonts
-awtfontpath.chinese-gb18030=/usr/share/fonts/arphicfonts
-awtfontpath.japanese-x0208=/usr/share/fonts/kochi-substitute
-awtfontpath.korean=/usr/share/fonts/baekmuk-fonts
diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env b/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env
deleted file mode 100644
index c8e208e4d586..000000000000
--- a/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env,v 1.2 2007/06/02 16:23:14 betelgeuse Exp $
-
-VERSION="Sun JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/"
-MANPATH="/opt/@P@/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.6"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r1.ebuild
deleted file mode 100644
index 540bcb0d3769..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r1.ebuild,v 1.3 2012/08/03 13:53:49 ago Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-# This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-X86_AT="jre-${MY_PV}-linux-i586.bin"
-AMD64_AT="jre-${MY_PV}-linux-x64.bin"
-IA64_AT="jre-${MY_PV}-linux-ia64.bin"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AMD64_AT} )
-	ia64? ( ${IA64_AT} )
-	x86? ( ${X86_AT} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.6"
-KEYWORDS="amd64 x86"
-
-IUSE="X alsa jce nsplugin"
-
-RESTRICT="fetch strip"
-
-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 )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	elif use ia64; then
-		AT=${IA64_AT}
-	fi
-
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
-	einfo "has become fetch restricted again. Alternatives are switching to"
-	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
-	einfo ""
-	einfo "Please download ${AT} from:"
-	einfo "${JRE_URI}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	if use x86; then
-		bin/java -client -Xshare:dump || die
-	fi
-	# limit heap size for large memory on x86 #405239
-	# this is a workaround and shouldn't be needed.
-	bin/java -server -Xmx64m -Xshare:dump || die
-}
-
-src_install() {
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf lib/i386/libjavaplugin_oji.so \
-			lib/i386/libjavaplugin_nscp*.so
-		rm -vrf plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir /opt/${P}
-	cp -pPR bin lib man "${ED}"/opt/${P} || die
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use jce; then
-		dodir /opt/${P}/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
-			/opt/${P}/lib/security/US_export_policy.jar
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
-			/opt/${P}/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
-
-QA_TEXTRELS_x86="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/jexec"
-for java_system_arch in amd64 i386; do
-	QA_FLAGS_IGNORED+="
-		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
-		/opt/${P}/lib/${java_system_arch}/libawt.so
-		/opt/${P}/lib/${java_system_arch}/libcmm.so
-		/opt/${P}/lib/${java_system_arch}/libdcpr.so
-		/opt/${P}/lib/${java_system_arch}/libdeploy.so
-		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
-		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
-		/opt/${P}/lib/${java_system_arch}/libhprof.so
-		/opt/${P}/lib/${java_system_arch}/libinstrument.so
-		/opt/${P}/lib/${java_system_arch}/libioser12.so
-		/opt/${P}/lib/${java_system_arch}/libj2gss.so
-		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
-		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
-		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
-		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
-		/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so
-		/opt/${P}/lib/${java_system_arch}/libjava.so
-		/opt/${P}/lib/${java_system_arch}/libjawt.so
-		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
-		/opt/${P}/lib/${java_system_arch}/libjdwp.so
-		/opt/${P}/lib/${java_system_arch}/libjpeg.so
-		/opt/${P}/lib/${java_system_arch}/libjsig.so
-		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
-		/opt/${P}/lib/${java_system_arch}/libjsound.so
-		/opt/${P}/lib/${java_system_arch}/libmanagement.so
-		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod.so
-		/opt/${P}/lib/${java_system_arch}/libnet.so
-		/opt/${P}/lib/${java_system_arch}/libnio.so
-		/opt/${P}/lib/${java_system_arch}/libnpjp2.so
-		/opt/${P}/lib/${java_system_arch}/libnpt.so
-		/opt/${P}/lib/${java_system_arch}/librmi.so
-		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
-		/opt/${P}/lib/${java_system_arch}/libunpack.so
-		/opt/${P}/lib/${java_system_arch}/libverify.so
-		/opt/${P}/lib/${java_system_arch}/libzip.so
-		/opt/${P}/lib/${java_system_arch}/motif21/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
-		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
-		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
-done
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild
deleted file mode 100644
index f4e9feb2301f..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild,v 1.3 2012/07/09 07:15:18 jdhore Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-# This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-X86_AT="jre-${MY_PV}-linux-i586.bin"
-AMD64_AT="jre-${MY_PV}-linux-x64.bin"
-IA64_AT="jre-${MY_PV}-linux-ia64.bin"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AMD64_AT} )
-	ia64? ( ${IA64_AT} )
-	x86? ( ${X86_AT} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.6"
-KEYWORDS="amd64 x86"
-
-IUSE="X alsa jce nsplugin"
-
-RESTRICT="fetch strip"
-
-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 )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	elif use ia64; then
-		AT=${IA64_AT}
-	fi
-
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
-	einfo "has become fetch restricted again. Alternatives are switching to"
-	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
-	einfo ""
-	einfo "Please download ${AT} from:"
-	einfo "${JRE_URI}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	if use x86; then
-		bin/java -client -Xshare:dump || die
-	fi
-	# limit heap size for large memory on x86 #405239
-	# this is a workaround and shouldn't be needed.
-	bin/java -server -Xmx64m -Xshare:dump || die
-}
-
-src_install() {
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf lib/i386/libjavaplugin_oji.so \
-			lib/i386/libjavaplugin_nscp*.so
-		rm -vrf plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir /opt/${P}
-	cp -pPR bin lib man "${ED}"/opt/${P} || die
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use jce; then
-		dodir /opt/${P}/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
-			/opt/${P}/lib/security/US_export_policy.jar
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
-			/opt/${P}/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
-
-QA_TEXTRELS_x86="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/jexec"
-for java_system_arch in amd64 i386; do
-	QA_FLAGS_IGNORED+="
-		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
-		/opt/${P}/lib/${java_system_arch}/libawt.so
-		/opt/${P}/lib/${java_system_arch}/libcmm.so
-		/opt/${P}/lib/${java_system_arch}/libdcpr.so
-		/opt/${P}/lib/${java_system_arch}/libdeploy.so
-		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
-		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
-		/opt/${P}/lib/${java_system_arch}/libhprof.so
-		/opt/${P}/lib/${java_system_arch}/libinstrument.so
-		/opt/${P}/lib/${java_system_arch}/libioser12.so
-		/opt/${P}/lib/${java_system_arch}/libj2gss.so
-		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
-		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
-		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
-		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
-		/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so
-		/opt/${P}/lib/${java_system_arch}/libjava.so
-		/opt/${P}/lib/${java_system_arch}/libjawt.so
-		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
-		/opt/${P}/lib/${java_system_arch}/libjdwp.so
-		/opt/${P}/lib/${java_system_arch}/libjpeg.so
-		/opt/${P}/lib/${java_system_arch}/libjsig.so
-		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
-		/opt/${P}/lib/${java_system_arch}/libjsound.so
-		/opt/${P}/lib/${java_system_arch}/libmanagement.so
-		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod.so
-		/opt/${P}/lib/${java_system_arch}/libnet.so
-		/opt/${P}/lib/${java_system_arch}/libnio.so
-		/opt/${P}/lib/${java_system_arch}/libnpjp2.so
-		/opt/${P}/lib/${java_system_arch}/libnpt.so
-		/opt/${P}/lib/${java_system_arch}/librmi.so
-		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
-		/opt/${P}/lib/${java_system_arch}/libunpack.so
-		/opt/${P}/lib/${java_system_arch}/libverify.so
-		/opt/${P}/lib/${java_system_arch}/libzip.so
-		/opt/${P}/lib/${java_system_arch}/motif21/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
-		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
-		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
-done
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.34.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.34.ebuild
deleted file mode 100644
index 07478879f92e..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.34.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.34.ebuild,v 1.2 2012/08/31 22:01:32 ago Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-# This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-X86_AT="jre-${MY_PV}-linux-i586.bin"
-AMD64_AT="jre-${MY_PV}-linux-x64.bin"
-IA64_AT="jre-${MY_PV}-linux-ia64.bin"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AMD64_AT} )
-	x86? ( ${X86_AT} )"
-#	ia64? ( ${IA64_AT} )
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.6"
-KEYWORDS="amd64 ~x86"
-
-IUSE="X alsa jce nsplugin pax_kernel"
-
-RESTRICT="fetch strip"
-
-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 )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	elif use ia64; then
-		AT=${IA64_AT}
-	fi
-
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
-	einfo "has become fetch restricted again. Alternatives are switching to"
-	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
-	einfo ""
-	einfo "Please download ${AT} from:"
-	einfo "${JRE_URI}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	if use x86; then
-		bin/java -client -Xshare:dump || die
-	fi
-	# limit heap size for large memory on x86 #405239
-	# this is a workaround and shouldn't be needed.
-	bin/java -server -Xmx64m -Xshare:dump || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf lib/i386/libjavaplugin_oji.so \
-			lib/i386/libjavaplugin_nscp*.so
-		rm -vrf plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir "${dest}"
-	cp -pPR bin lib man "${ddest}" || die
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use jce; then
-		dodir "${dest}"/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-		-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto "${dest}"/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
-
-QA_TEXTRELS_x86="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/jexec"
-for java_system_arch in amd64 i386; do
-	QA_FLAGS_IGNORED+="
-		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
-		/opt/${P}/lib/${java_system_arch}/libawt.so
-		/opt/${P}/lib/${java_system_arch}/libcmm.so
-		/opt/${P}/lib/${java_system_arch}/libdcpr.so
-		/opt/${P}/lib/${java_system_arch}/libdeploy.so
-		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
-		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
-		/opt/${P}/lib/${java_system_arch}/libhprof.so
-		/opt/${P}/lib/${java_system_arch}/libinstrument.so
-		/opt/${P}/lib/${java_system_arch}/libioser12.so
-		/opt/${P}/lib/${java_system_arch}/libj2gss.so
-		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
-		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
-		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
-		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
-		/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so
-		/opt/${P}/lib/${java_system_arch}/libjava.so
-		/opt/${P}/lib/${java_system_arch}/libjawt.so
-		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
-		/opt/${P}/lib/${java_system_arch}/libjdwp.so
-		/opt/${P}/lib/${java_system_arch}/libjpeg.so
-		/opt/${P}/lib/${java_system_arch}/libjsig.so
-		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
-		/opt/${P}/lib/${java_system_arch}/libjsound.so
-		/opt/${P}/lib/${java_system_arch}/libmanagement.so
-		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod.so
-		/opt/${P}/lib/${java_system_arch}/libnet.so
-		/opt/${P}/lib/${java_system_arch}/libnio.so
-		/opt/${P}/lib/${java_system_arch}/libnpjp2.so
-		/opt/${P}/lib/${java_system_arch}/libnpt.so
-		/opt/${P}/lib/${java_system_arch}/librmi.so
-		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
-		/opt/${P}/lib/${java_system_arch}/libunpack.so
-		/opt/${P}/lib/${java_system_arch}/libverify.so
-		/opt/${P}/lib/${java_system_arch}/libzip.so
-		/opt/${P}/lib/${java_system_arch}/motif21/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
-		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
-		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
-done
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild
deleted file mode 100644
index 43581b8d7cab..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild,v 1.4 2012/09/13 07:16:49 phajdan.jr Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-# This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6u35-downloads-1836473.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-X86_AT="jre-${MY_PV}-linux-i586.bin"
-AMD64_AT="jre-${MY_PV}-linux-x64.bin"
-IA64_AT="jre-${MY_PV}-linux-ia64.bin"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AMD64_AT} )
-	x86? ( ${X86_AT} )"
-#	ia64? ( ${IA64_AT} )
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.6"
-KEYWORDS="amd64 x86"
-
-IUSE="X alsa jce nsplugin pax_kernel"
-
-RESTRICT="fetch strip"
-
-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 )"
-# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
-# marking. #427642
-DEPEND="
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	elif use ia64; then
-		AT=${IA64_AT}
-	fi
-
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
-	einfo "has become fetch restricted again. Alternatives are switching to"
-	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
-	einfo ""
-	einfo "Please download ${AT} from:"
-	einfo "${JRE_URI}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	if use x86; then
-		bin/java -client -Xshare:dump || die
-	fi
-	# limit heap size for large memory on x86 #405239
-	# this is a workaround and shouldn't be needed.
-	bin/java -server -Xmx64m -Xshare:dump || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
-
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf lib/i386/libjavaplugin_oji.so \
-			lib/i386/libjavaplugin_nscp*.so
-		rm -vrf plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir "${dest}"
-	cp -pPR bin lib man "${ddest}" || die
-
-	# Remove empty dirs we might have copied
-	find "${D}" -type d -empty -exec rmdir {} + || die
-
-	dodoc COPYRIGHT README
-
-	if use jce; then
-		dodir "${dest}"/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-		-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto "${dest}"/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
-
-QA_TEXTRELS_x86="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/jexec"
-for java_system_arch in amd64 i386; do
-	QA_FLAGS_IGNORED+="
-		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
-		/opt/${P}/lib/${java_system_arch}/libawt.so
-		/opt/${P}/lib/${java_system_arch}/libcmm.so
-		/opt/${P}/lib/${java_system_arch}/libdcpr.so
-		/opt/${P}/lib/${java_system_arch}/libdeploy.so
-		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
-		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
-		/opt/${P}/lib/${java_system_arch}/libhprof.so
-		/opt/${P}/lib/${java_system_arch}/libinstrument.so
-		/opt/${P}/lib/${java_system_arch}/libioser12.so
-		/opt/${P}/lib/${java_system_arch}/libj2gss.so
-		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
-		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
-		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
-		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
-		/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so
-		/opt/${P}/lib/${java_system_arch}/libjava.so
-		/opt/${P}/lib/${java_system_arch}/libjawt.so
-		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
-		/opt/${P}/lib/${java_system_arch}/libjdwp.so
-		/opt/${P}/lib/${java_system_arch}/libjpeg.so
-		/opt/${P}/lib/${java_system_arch}/libjsig.so
-		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
-		/opt/${P}/lib/${java_system_arch}/libjsound.so
-		/opt/${P}/lib/${java_system_arch}/libmanagement.so
-		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod.so
-		/opt/${P}/lib/${java_system_arch}/libnet.so
-		/opt/${P}/lib/${java_system_arch}/libnio.so
-		/opt/${P}/lib/${java_system_arch}/libnpjp2.so
-		/opt/${P}/lib/${java_system_arch}/libnpt.so
-		/opt/${P}/lib/${java_system_arch}/librmi.so
-		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
-		/opt/${P}/lib/${java_system_arch}/libunpack.so
-		/opt/${P}/lib/${java_system_arch}/libverify.so
-		/opt/${P}/lib/${java_system_arch}/libzip.so
-		/opt/${P}/lib/${java_system_arch}/motif21/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
-		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
-		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
-done
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r2.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.38.ebuild
index a7cab1c446a3..39d17aae7edb 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r2.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.38.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r2.ebuild,v 1.1 2012/07/23 18:41:43 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.38.ebuild,v 1.1 2012/12/19 17:54:04 sera Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit java-vm-2 eutils prefix versionator
 
 # This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6u38-downloads-1877409.html"
 
 MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
 S_PV="$(replace_version_separator 3 '_')"
@@ -20,16 +20,16 @@ DESCRIPTION="Oracle's Java SE Runtime Environment"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 SRC_URI="
 	amd64? ( ${AMD64_AT} )
-	ia64? ( ${IA64_AT} )
 	x86? ( ${X86_AT} )"
+	#ia64? ( ${IA64_AT} )
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="X alsa jce nsplugin pax_kernel"
 
 RESTRICT="fetch strip"
+QA_PREBUILT="*"
 
 RDEPEND="
 	X? (
@@ -62,9 +62,9 @@ pkg_nofetch() {
 	einfo "has become fetch restricted again. Alternatives are switching to"
 	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
 	einfo ""
-	einfo "Please download ${AT} from:"
-	einfo "${JRE_URI}"
-	einfo "and move it to ${DISTDIR}"
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
 }
 
 src_unpack() {
@@ -135,7 +135,9 @@ src_install() {
 		sun-jcontrol-${PN}-${SLOT}.png || die
 	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
 		-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+		-e "s#Application;##" \
+		-e "/Encoding/d" \
 		lib/desktop/applications/sun_java.desktop > \
 		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
 	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
@@ -151,66 +153,8 @@ src_install() {
 	java-vm_revdep-mask
 }
 
-QA_TEXTRELS_x86="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/jexec"
-for java_system_arch in amd64 i386; do
-	QA_FLAGS_IGNORED+="
-		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
-		/opt/${P}/lib/${java_system_arch}/libawt.so
-		/opt/${P}/lib/${java_system_arch}/libcmm.so
-		/opt/${P}/lib/${java_system_arch}/libdcpr.so
-		/opt/${P}/lib/${java_system_arch}/libdeploy.so
-		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
-		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
-		/opt/${P}/lib/${java_system_arch}/libhprof.so
-		/opt/${P}/lib/${java_system_arch}/libinstrument.so
-		/opt/${P}/lib/${java_system_arch}/libioser12.so
-		/opt/${P}/lib/${java_system_arch}/libj2gss.so
-		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
-		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
-		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
-		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
-		/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so
-		/opt/${P}/lib/${java_system_arch}/libjava.so
-		/opt/${P}/lib/${java_system_arch}/libjawt.so
-		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
-		/opt/${P}/lib/${java_system_arch}/libjdwp.so
-		/opt/${P}/lib/${java_system_arch}/libjpeg.so
-		/opt/${P}/lib/${java_system_arch}/libjsig.so
-		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
-		/opt/${P}/lib/${java_system_arch}/libjsound.so
-		/opt/${P}/lib/${java_system_arch}/libmanagement.so
-		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod.so
-		/opt/${P}/lib/${java_system_arch}/libnet.so
-		/opt/${P}/lib/${java_system_arch}/libnio.so
-		/opt/${P}/lib/${java_system_arch}/libnpjp2.so
-		/opt/${P}/lib/${java_system_arch}/libnpt.so
-		/opt/${P}/lib/${java_system_arch}/librmi.so
-		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
-		/opt/${P}/lib/${java_system_arch}/libunpack.so
-		/opt/${P}/lib/${java_system_arch}/libverify.so
-		/opt/${P}/lib/${java_system_arch}/libzip.so
-		/opt/${P}/lib/${java_system_arch}/motif21/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
-		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
-		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
-done
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	elog "If you want Oracles JRE 7 'emerge oracle-jre-bin' instead."
+}