Remove vulnerable versions. Revbump to create Class Data Sharing archive also for server VM in 1.6, bug #207282.

(Portage version: 2.1.4.4)

9 files changed, 29 insertions, 463 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index c4ae58092e28..b5ba8355edc6 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.123 2008/03/27 19:22:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.124 2008/03/27 20:25:29 caster Exp $
+
+*sun-jre-bin-1.6.0.05-r1 (27 Mar 2008)
+
+  27 Mar 2008; Vlastimil Babka <caster@gentoo.org> files/construct-1.6.sh,
+  files/construct.sh, -sun-jre-bin-1.4.2.16.ebuild,
+  -sun-jre-bin-1.5.0.13.ebuild, -sun-jre-bin-1.5.0.14.ebuild,
+  sun-jre-bin-1.5.0.15.ebuild, -sun-jre-bin-1.6.0.03.ebuild,
+  -sun-jre-bin-1.6.0.04.ebuild, +sun-jre-bin-1.6.0.05-r1.ebuild:
+  Remove vulnerable versions. Revbump to create Class Data Sharing archive
+  also for server VM in 1.6, bug #207282.
 
   27 Mar 2008; Markus Meier <maekke@gentoo.org> sun-jre-bin-1.5.0.15.ebuild,
   sun-jre-bin-1.6.0.05.ebuild:
diff --git a/dev-java/sun-jre-bin/files/construct-1.6.sh b/dev-java/sun-jre-bin/files/construct-1.6.sh
index 39c7b911fe19..a70e24b86d8a 100644
--- a/dev-java/sun-jre-bin/files/construct-1.6.sh
+++ b/dev-java/sun-jre-bin/files/construct-1.6.sh
@@ -261,7 +261,7 @@ if [ $# -eq 3 ] ; then
   copytree
   createjre
   unpackjars
-  preparecds
+  #preparecds
   jreman
   elimdups
 else
diff --git a/dev-java/sun-jre-bin/files/construct.sh b/dev-java/sun-jre-bin/files/construct.sh
index 7ee0e42729bc..aef91c267280 100644
--- a/dev-java/sun-jre-bin/files/construct.sh
+++ b/dev-java/sun-jre-bin/files/construct.sh
@@ -270,7 +270,7 @@ if [ $# -eq 3 ] ; then
   copytree
   createjre
   unpackjars
-  preparecds
+  #preparecds
   jreman
   elimdups
 else
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
deleted file mode 100644
index 15210eaf6a06..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 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.4.2.16.ebuild,v 1.5 2007/12/16 21:08:51 caster Exp $
-
-inherit eutils pax-utils java-vm-2
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PV2=${PV//./_}
-At="j2re-${MY_PV2}-linux-i586.bin"
-S="${WORKDIR}/j2re${MY_PV}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI=${At}
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* x86"
-# pre stripped
-RESTRICT="fetch strip"
-IUSE="X alsa nsplugin odbc"
-
-DEPEND=""
-
-RDEPEND="net-libs/libnet
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/libawt.so
-	opt/${P}/plugin/i386/ns4/libjavaplugin.so
-	opt/${P}/plugin/i386/ns610/libjavaplugin_oji.so
-	opt/${P}/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(accept the license, then click on 'self-extracting file' under 'Linux Platform')"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001')
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f "${S}"/lib/unpack ]; then
-		UNPACK_CMD="${S}"/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		local PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar \
-			lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} "${S}"/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/"
-
-	pax-mark srpm $(list-paxables "${D}"/opt/${P}/bin/*)
-
-	dodoc CHANGES COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html ControlPanel.html || die
-
-	if use nsplugin; then
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	fi
-
-	# bug #147259
-	dosym ../javaws/javaws /opt/${P}/bin/javaws
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${D}/opt/${P}/.systemPrefs/.system.lock"
-	chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock"
-	touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
-	chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
-		"${T}/sun_java-jre.desktop"
-	domenu "${T}/sun_java-jre.desktop"
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
deleted file mode 100644
index 436975b10ce8..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2007 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.5.0.13.ebuild,v 1.6 2007/12/16 21:08:51 caster Exp $
-
-inherit pax-utils eutils java-vm-2
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-#S="${WORKDIR}/jdk${MY_PVL}"
-
-X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
-IUSE="X alsa nsplugin odbc"
-
-RDEPEND="x86? ( net-libs/libnet )
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}/construct.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_install() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"/bin/*)
-
-	local dirs="bin lib man"
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# FIXME figure out how to handle the control pannel conflict with
-	# sun-jdk-bin
-
-	# install control panel for Gnome/KDE
-#	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-#		${T}/sun_java-${SLOT}.desktop
-
-#	domenu ${T}/sun_java-${SLOT}.desktop
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties \
-		fontconfig.properties || die
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-	elog "The epoll-based implementation of SelectorProvider is not selected by"
-	elog "default."
-	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.14.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.14.ebuild
deleted file mode 100644
index 5f0d31d52867..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.14.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2008 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.5.0.14.ebuild,v 1.1 2008/01/18 15:05:13 caster Exp $
-
-inherit pax-utils versionator eutils java-vm-2
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Runtime Environment, version ${SLOT}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE="X alsa nsplugin odbc"
-
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}/construct.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_install() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"/bin/*)
-
-	local dirs="bin lib man"
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# FIXME figure out how to handle the control pannel conflict with
-	# sun-jdk-bin
-
-	# install control panel for Gnome/KDE
-#	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-#		${T}/sun_java-${SLOT}.desktop
-
-#	domenu ${T}/sun_java-${SLOT}.desktop
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties \
-		fontconfig.properties || die
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-	elog "The epoll-based implementation of SelectorProvider is not selected by"
-	elog "default."
-	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.15.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.15.ebuild
index 8404f575639a..f862343f8185 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.15.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.5.0.15.ebuild,v 1.3 2008/03/27 19:22:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.15.ebuild,v 1.4 2008/03/27 20:25:29 caster Exp $
 
 inherit pax-utils versionator eutils java-vm-2
 
@@ -46,6 +46,12 @@ src_unpack() {
 
 	cd ..
 	bash "${FILESDIR}/construct.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+
+	# see bug #207282
+	if use x86; then
+		einfo "Creating the Class Data Sharing archives"
+		"${S}"/bin/java -client -Xshare:dump || die
+	fi
 }
 
 src_install() {
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
deleted file mode 100644
index ff5823b8d9f5..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2007 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.03.ebuild,v 1.6 2007/12/16 21:08:51 caster Exp $
-
-inherit versionator pax-utils eutils java-vm-2
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-SUFFIX=".bin"
-X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-# This release is probably under a different url because tmarble is on holiday
-#SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-#		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-URL_BASE="http://dlc.sun.com/dlj/binaries"
-SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
-		amd64? ( ${URL_BASE}/${AMD64_AT} )"
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
-IUSE="X alsa nsplugin odbc"
-
-RDEPEND="
-	sys-libs/glibc
-	x86? (
-		=virtual/libstdc++-3.3
-		net-libs/libnet
-	)
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		amd64? ( x11-libs/libXt )
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}/construct-1.6.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_install() {
-	local dirs="bin lib man"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"/bin/*)
-
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-	dodir /opt/${P}/share/
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# install control panel for Gnome/KDE
-	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
-		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
-			"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
-			"${T}/sun_jre-${SLOT}.desktop" || die
-		domenu "${T}/sun_jre-${SLOT}.desktop" || die
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-	elog "The epoll-based implementation of SelectorProvider is not selected by"
-	elog "default."
-	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.04.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.05-r1.ebuild
index b8bb670c9b2e..5bcdff45623e 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.04.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.05-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.04.ebuild,v 1.1 2008/01/18 15:05:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.05-r1.ebuild,v 1.1 2008/03/27 20:25:29 caster Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -47,10 +47,17 @@ QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
 src_unpack() {
 	mkdir bundled-jdk
 	cd bundled-jdk
-	sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
+	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
 
 	cd ..
 	bash "${FILESDIR}/construct-1.6.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+
+	# see bug #207282
+	if use x86; then
+		einfo "Creating the Class Data Sharing archives"
+		"${S}"/bin/java -client -Xshare:dump || die
+		"${S}"/bin/java -server -Xshare:dump || die
+	fi
 }
 
 src_install() {