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

Package-Manager: portage-2.1.4.4

7 files changed, 30 insertions, 351 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 8a354eb7d24d..f092f683da3c 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.49 2008/03/27 19:34:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.50 2008/03/27 20:13:30 caster Exp $
+
+*emul-linux-x86-java-1.6.0.05-r1 (27 Mar 2008)
+
+  27 Mar 2008; Vlastimil Babka <caster@gentoo.org> files/construct-1.6.sh,
+  files/construct.sh, -files/javasettings_Linux_x86.xml,
+  -emul-linux-x86-java-1.4.2.16.ebuild,
+  -emul-linux-x86-java-1.5.0.13.ebuild, emul-linux-x86-java-1.5.0.15.ebuild,
+  -emul-linux-x86-java-1.6.0.03.ebuild,
+  -emul-linux-x86-java-1.6.0.04.ebuild,
+  +emul-linux-x86-java-1.6.0.05-r1.ebuild:
+  Remove vulnerable versions. Create Class Data Sharing archive also for
+  server VM in 1.6, bug #207282.
 
   27 Mar 2008; Markus Meier <maekke@gentoo.org>
   emul-linux-x86-java-1.5.0.15.ebuild, emul-linux-x86-java-1.6.0.05.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 844c0642a381..7d4a173e0ed0 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,32 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX construct-1.6.sh 6798 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 SHA1 014a26831f8f3cee9653d42cd194216cda2e1787 SHA256 32639949b003703e236257f3d2d3272659ab89c80b2819bdb552af2d5f3070d7
-AUX construct.sh 6963 RMD160 b1bb2e2ff9a0f5a8de7128d7b510a29356b1559b SHA1 12edcf184bc0ee5216260cee51595e2492dcd371 SHA256 dd1174321a419bef34c7fb4a6dedd80bf0873a00f16899d27b46dc89f2f9c216
+AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80
+AUX construct.sh 6964 RMD160 8e3de41f59023cb9bf6040fe5f5a36d1b39552e3 SHA1 bc24071dba36878abf7a2da88bfc063eb3727da1 SHA256 47847c81ee85bd1b7dba6e91c2d7757c15a8930f4748dc926e00553bc89fcbd6
 AUX emul-linux-x86-java-1.4.env 857 RMD160 65dc6da72579122d52475e5fe2c965f7aaea92f2 SHA1 2564ffbdf2bf885a5ba1ce58a6d3643a140c1e0e SHA256 6651a792e2f4f5d582ede77459591d8cdb8e59419b88659720fcf828e60aebf3
 AUX emul-linux-x86-java-1.5.env 855 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fdca0 SHA1 d989ddc315757eb44aff787ea2c70a6dc848130d SHA256 d36f364c0855d13d7ec2eb4ea3cdbaa483318f1f57b7720edfa5eb0050a12cdb
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
-AUX javasettings_Linux_x86.xml 1601 RMD160 e87fe605d34fd6060f58f511deea5a935697be9f SHA1 39c5f9693db821b038f47f1f27c995caa9bcac5b SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585
-DIST j2re-1_4_2_16-linux-i586.bin 14388621 RMD160 46885501b413a73a08f50695c335e11291389376 SHA1 7abc5f9354bc00109766f8f6302e39c4da938bcb SHA256 9293d00a35b31e7f78f6338ead3a811d2732290b90a3711814ee64cea5842045
 DIST j2re-1_4_2_17-linux-i586.bin 14376647 RMD160 62de02a90f67d8965cebc563636d688f6745b7ca SHA1 a4282ea13048c76274222476abfb0954d42c35b8 SHA256 18aa1f5a4b223d3858d1d75913bb036963be4a9bb9b9bdc38ae2b714e1408654
-DIST jdk-1_5_0_13-dlj-linux-i586.bin 49672592 RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed SHA1 a025d81df269ed6ce663a34f52e5f0ea2a462bf2 SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0
 DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c400832d08f8d SHA1 e52af3bc81f268d73a94772428d612769473834b SHA256 b4b340f86e3c8f3bb2f9fa1762f1c3f428cee1efc658c4fb8793f5cf299b2ad5
-DIST jdk-6u3-dlj-linux-i586.bin 68613151 RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c SHA1 86ba73cdcc2c22782a04b8191f157a5ac7caa490 SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b
-DIST jdk-6u4-dlj-linux-i586.bin 70455896 RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d SHA1 24601838ae7216cbc5d75170b6aebf5e4012dec1 SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c
 DIST jdk-6u5-dlj-linux-i586.bin 70537386 RMD160 bd1bd2a6601b7e972c9c5f3e1cce4ce7d408b055 SHA1 ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542 SHA256 b0f78f2e6baf88c1d7dc9334c6b86e621b2c9d629f5617f3f57a3bd7cbad0c99
-EBUILD emul-linux-x86-java-1.4.2.16.ebuild 3769 RMD160 7a3507a376ce676b9a5fff849bc2bdebead25caf SHA1 9ba38f1e8b0b755d108597fc2cd159ce81ae8e7c SHA256 6fc5a292379bafb258675280bf776cdec26b2e247681172df38b611577cd540a
 EBUILD emul-linux-x86-java-1.4.2.17.ebuild 3534 RMD160 402ad696adc182da8a0a6a5312d9c000fd3034ca SHA1 234c0ab544dc5ba0a8974cd0c78ae9f153de6404 SHA256 63bbbe4a5db8be5578cd7d8a1839ffc97cd70d9a746da4c53b96b587a62e91e4
-EBUILD emul-linux-x86-java-1.5.0.13.ebuild 2732 RMD160 f63414ff4dcd84c5a30a0a737461fce00110796d SHA1 019735d01ee9a581e5af3d73663f3787672ccccd SHA256 f366ba92df8ce5aaf28f8bd41056a3c6ea7de0f78ec7a10500a23f92f498cd10
-EBUILD emul-linux-x86-java-1.5.0.15.ebuild 2816 RMD160 4dd6245c8759fd4b3fcd9aab181d195bc2a70e90 SHA1 7a6acfbebda9f7a0890f685cd4cca9fa6bdec66d SHA256 f529d258f917b82b8ce6fa3f1868b84370566d694d1b58fd8943afdf316237b9
-EBUILD emul-linux-x86-java-1.6.0.03.ebuild 2685 RMD160 762b2560025c42c000f238faa88cfbd4d6989a15 SHA1 dc22e96afcd88fdd5f4b655be332c57e316ebe2b SHA256 9cd0604f86dc6502afc35128e548387ba8745bd95f26e9766d67982ce54fcb6f
-EBUILD emul-linux-x86-java-1.6.0.04.ebuild 2686 RMD160 bb7111041a318706635655adefdefd51e1c1aed2 SHA1 108bea8082d06f38af0368feb6a935dd48266534 SHA256 1d03023a645676915c2316fc4ac4705e243e5c5022f7691e0d41acafa4f46c4a
+EBUILD emul-linux-x86-java-1.5.0.15.ebuild 2892 RMD160 8418cd7b0f70aa04e1d3b471b44c56db778de177 SHA1 53cbe3322f6ae71cdb032c00c995f24ec5318405 SHA256 6c31100b69e4954831370262bf102d15b153a32e04f5a279c0d82b92ee5910cf
+EBUILD emul-linux-x86-java-1.6.0.05-r1.ebuild 2810 RMD160 749c6e84fed67ad21c1ce5eb3a3392ac42bb8ae9 SHA1 2e99c2ec369937403de7a05102cf630192795794 SHA256 de9048b3ecb6d0982ce5ed95f160e9ab44382b42df4b4c97111eccb122cb8644
 EBUILD emul-linux-x86-java-1.6.0.05.ebuild 2685 RMD160 66e2518e36bf7973f748a4156ff0b58ced6273d2 SHA1 1cefe2490d3f0ce7f53c47f443a29d260249a1c2 SHA256 7a720d6b450faf79df29aa37fa81abbfb5ac49ff1dd8b24444e1855f6020cde5
-MISC ChangeLog 9851 RMD160 a4c08f3223c0a4c628b06b484d75ae4fabadc081 SHA1 911e09e135e6faae7b57654bf543bc53058fb52c SHA256 77b0c3a0a5c072f31be350024f43fc604aada62ee79340c0403e382be45db4dc
+MISC ChangeLog 10378 RMD160 45ef177840b41d8f7353bc41428991fe4a0bfd09 SHA1 c2bfaa9c768316d6b9ca1244f7f9742a55fda7e0 SHA256 e55d6be2437d6cdbb0432c49e3b7d11616afd90042222cfda92a23e64c8a7f4f
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH6/cxkKaRLQcq0GIRAjT8AKC02rJSQBIB2RHR3dmL6/Aa7qUltgCfYwMZ
-48qZqqkZuugAD5OVfMVANXw=
-=AJn6
------END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.16.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.16.ebuild
deleted file mode 100644
index c337e1ef1e70..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.16.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.16.ebuild,v 1.3 2007/11/06 23:44:57 wolf31o2 Exp $
-
-inherit multilib 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 JRE (32bit)"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI=${At}
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* amd64"
-# pre stripped
-RESTRICT="fetch strip"
-IUSE="X alsa nsplugin"
-
-DEPEND=""
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-QA_TEXTRELS_amd64="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 LICENSE 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"
-
-	# 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}/" \
-#		-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
-}
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		echo
-		ewarn "Some parts of Sun's JDK require X11 libraries to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild
deleted file mode 100644
index c097bfe32a99..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild,v 1.2 2007/10/12 00:22:07 wltjr Exp $
-
-inherit pax-utils eutils java-vm-2
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-At="jdk-${MY_PVA}-dlj-linux-i586.bin"
-DESCRIPTION="32bit version Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="http://download.java.net/dlj/binaries/${At}"
-
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	if [[ ! -r ${DISTDIR}/${At} ]]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}"/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-
-	"${S}"/bin/java -client -Xshare:dump
-}
-
-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/*)
-
-	dodir /opt/${P}
-	cp -pPR bin lib man javaws plugin "${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
-
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	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
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-
-	echo
-	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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
index 29faf90e7942..566d05bc5de6 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v 1.2 2008/03/27 19:34:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v 1.3 2008/03/27 20:13:30 caster Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -41,7 +41,9 @@ src_unpack() {
 	cd ..
 	bash "${FILESDIR}"/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
 
-	"${S}"/bin/java -client -Xshare:dump
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	"${S}"/bin/java -client	-Xshare:dump || die
 }
 
 src_install() {
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild
deleted file mode 100644
index ff560fea5a72..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild,v 1.3 2007/12/08 02:17:23 betelgeuse Exp $
-
-inherit versionator pax-utils java-vm-2 eutils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="32bit version Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/javase/6/"
-#SRC_URI="http://download.java.net/dlj/binaries/${At}"
-SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
-
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )
-	app-emulation/emul-linux-x86-compat"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-src_unpack() {
-	if [[ ! -r ${DISTDIR}/${A} ]]; then
-		die "cannot read ${DISTDIR}/${A}. Please check the permission and try again."
-	fi
-
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
-
-	"${S}"/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-
-	pax-mark m $(list-paxables "${D}"/opt/${P}/bin/*)
-
-	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
-
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	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
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.04.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild
index d62c9544f0dc..3abc368ce06d 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.04.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.04.ebuild,v 1.1 2008/01/27 17:45:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild,v 1.1 2008/03/27 20:13:30 caster Exp $
 
 inherit versionator pax-utils java-vm-2 eutils
 
@@ -34,18 +34,21 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
 	opt/${P}/lib/i386/server/libjvm.so"
 
 src_unpack() {
-	if [[ ! -r ${DISTDIR}/${A} ]]; then
+	if [[ ! -r "${DISTDIR}"/${A} ]]; then
 		die "cannot read ${DISTDIR}/${A}. Please check the permission and try again."
 	fi
 
 	mkdir bundled-jdk
 	cd bundled-jdk
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
 
 	cd ..
 	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
 
-	"${S}"/bin/java -client -Xshare:dump
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	"${S}"/bin/java -client	-Xshare:dump || die
+	"${S}"/bin/java -server	-Xshare:dump || die
 }
 
 src_install() {