Version bump, security bug #178962 use Sun JRE instead of blackdown, change slot from 1.4.2 to 1.4 to follow sun-jre-bin. Cleanup unused versions.

Package-Manager: portage-2.1.3.16

9 files changed, 172 insertions, 229 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 9a37c8c21848..5ed757a88932 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.41 2007/10/12 00:22:07 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.42 2007/11/03 15:47:47 caster Exp $
+
+*emul-linux-x86-java-1.4.2.16 (03 Nov 2007)
+
+  03 Nov 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/emul-linux-x86-java-1.4.env, +emul-linux-x86-java-1.4.2.16.ebuild,
+  -emul-linux-x86-java-1.5.0.12.ebuild,
+  -emul-linux-x86-java-1.6.0.02.ebuild:
+  Version bump, security bug #178962 use Sun JRE instead of blackdown, change
+  slot from 1.4.2 to 1.4 to follow sun-jre-bin. Cleanup unused versions.
 
   12 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   emul-linux-x86-java-1.4.2.03-r2.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 981bef9b0f1c..fb54910a9a93 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -10,6 +10,10 @@ AUX emul-linux-x86-java-1.4.2.env 727 RMD160 29279e5fe51f87a7f76dba2022f2c171745
 MD5 626f8534952d8a9f795ab09a5ca6ca6f files/emul-linux-x86-java-1.4.2.env 727
 RMD160 29279e5fe51f87a7f76dba2022f2c171745c789a files/emul-linux-x86-java-1.4.2.env 727
 SHA256 cafc42b6936f13bf329554028330280d3bbe26ac811cdedac253990a4cb67708 files/emul-linux-x86-java-1.4.2.env 727
+AUX emul-linux-x86-java-1.4.env 857 RMD160 65dc6da72579122d52475e5fe2c965f7aaea92f2 SHA1 2564ffbdf2bf885a5ba1ce58a6d3643a140c1e0e SHA256 6651a792e2f4f5d582ede77459591d8cdb8e59419b88659720fcf828e60aebf3
+MD5 cf0a7c25d75024446971a7bd155614bd files/emul-linux-x86-java-1.4.env 857
+RMD160 65dc6da72579122d52475e5fe2c965f7aaea92f2 files/emul-linux-x86-java-1.4.env 857
+SHA256 6651a792e2f4f5d582ede77459591d8cdb8e59419b88659720fcf828e60aebf3 files/emul-linux-x86-java-1.4.env 857
 AUX emul-linux-x86-java-1.5.env 855 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fdca0 SHA1 d989ddc315757eb44aff787ea2c70a6dc848130d SHA256 d36f364c0855d13d7ec2eb4ea3cdbaa483318f1f57b7720edfa5eb0050a12cdb
 MD5 6c388221ceab769f4cf1129d94e65016 files/emul-linux-x86-java-1.5.env 855
 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fdca0 files/emul-linux-x86-java-1.5.env 855
@@ -23,34 +27,29 @@ MD5 40fcbcc585ad443b5bf473228c8ef18d files/javasettings_Linux_x86.xml 1601
 RMD160 e87fe605d34fd6060f58f511deea5a935697be9f files/javasettings_Linux_x86.xml 1601
 SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585 files/javasettings_Linux_x86.xml 1601
 DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 SHA1 30b37bc8dcb5617971d2ae95e2f7227359d39991 SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef
-DIST jdk-1_5_0_12-dlj-linux-i586.bin 49646174 RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 SHA1 ff909ca469587ae132816868c5f201757e533ed0 SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0
+DIST j2re-1_4_2_16-linux-i586.bin 14388621 RMD160 46885501b413a73a08f50695c335e11291389376 SHA1 7abc5f9354bc00109766f8f6302e39c4da938bcb SHA256 9293d00a35b31e7f78f6338ead3a811d2732290b90a3711814ee64cea5842045
 DIST jdk-1_5_0_13-dlj-linux-i586.bin 49672592 RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed SHA1 a025d81df269ed6ce663a34f52e5f0ea2a462bf2 SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0
-DIST jdk-6u2-dlj-linux-i586.bin 58408110 RMD160 3b0c124693401ebc07dea50dfbf05bc9c2d47c28 SHA1 d3e58749ffb457ea338facb86bd800d084e98fe1 SHA256 6d25968debfcac1397fb3dc36c505d0cce8f787f0fc135aab8d6a7d517df68c2
 DIST jdk-6u3-dlj-linux-i586.bin 68613151 RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c SHA1 86ba73cdcc2c22782a04b8191f157a5ac7caa490 SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b
 EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3122 RMD160 c0c5e47960a1dacbc0a16e7994b64effe6aa6ddc SHA1 50c5ab0b748ae8b4a6d96a17a555319d2b2cc2e8 SHA256 4a72da4613ad07cf661877371a67e5c60659fe404fdd39f576786062e3574350
 MD5 152962b37eb322b53f3538f698e7b7a0 emul-linux-x86-java-1.4.2.03-r2.ebuild 3122
 RMD160 c0c5e47960a1dacbc0a16e7994b64effe6aa6ddc emul-linux-x86-java-1.4.2.03-r2.ebuild 3122
 SHA256 4a72da4613ad07cf661877371a67e5c60659fe404fdd39f576786062e3574350 emul-linux-x86-java-1.4.2.03-r2.ebuild 3122
-EBUILD emul-linux-x86-java-1.5.0.12.ebuild 3137 RMD160 027c16d703452a7058d5c3e8e76a017f7c793fdb SHA1 1c370d14a64f23820537ead1e303aa7e26d07951 SHA256 620ed81817df144067bebb1e7de5d4c2ef95a17ae29d2ae147e76dde9993bac9
-MD5 7859b17b1fa33de57d61e4f58ca6e773 emul-linux-x86-java-1.5.0.12.ebuild 3137
-RMD160 027c16d703452a7058d5c3e8e76a017f7c793fdb emul-linux-x86-java-1.5.0.12.ebuild 3137
-SHA256 620ed81817df144067bebb1e7de5d4c2ef95a17ae29d2ae147e76dde9993bac9 emul-linux-x86-java-1.5.0.12.ebuild 3137
+EBUILD emul-linux-x86-java-1.4.2.16.ebuild 3769 RMD160 b680b3579bfb16bf7942cca1af4de5c29bf5bc96 SHA1 b7421705d3274e0812194aa14139189f054f5bf0 SHA256 48f749923127521a862e1f77a04ddfc65a97733462f8c05ba681d31aa1c30701
+MD5 46144c559e1b58597bc4981bfe33ceb4 emul-linux-x86-java-1.4.2.16.ebuild 3769
+RMD160 b680b3579bfb16bf7942cca1af4de5c29bf5bc96 emul-linux-x86-java-1.4.2.16.ebuild 3769
+SHA256 48f749923127521a862e1f77a04ddfc65a97733462f8c05ba681d31aa1c30701 emul-linux-x86-java-1.4.2.16.ebuild 3769
 EBUILD emul-linux-x86-java-1.5.0.13.ebuild 2732 RMD160 f63414ff4dcd84c5a30a0a737461fce00110796d SHA1 019735d01ee9a581e5af3d73663f3787672ccccd SHA256 f366ba92df8ce5aaf28f8bd41056a3c6ea7de0f78ec7a10500a23f92f498cd10
 MD5 56b6c315a41daf14c93928d58588d750 emul-linux-x86-java-1.5.0.13.ebuild 2732
 RMD160 f63414ff4dcd84c5a30a0a737461fce00110796d emul-linux-x86-java-1.5.0.13.ebuild 2732
 SHA256 f366ba92df8ce5aaf28f8bd41056a3c6ea7de0f78ec7a10500a23f92f498cd10 emul-linux-x86-java-1.5.0.13.ebuild 2732
-EBUILD emul-linux-x86-java-1.6.0.02.ebuild 2644 RMD160 deb196a31b792d8feb7e18e720ef4e76c954d488 SHA1 703595fc584a0ccf23420108b3252fd152aa89bb SHA256 ec67f2b8e4b100f706ea5986b62b033e662ac8fc42c93a4aa2043f8174ac506e
-MD5 b9e2097ec2b5eaf59f0f9afd9712c0a4 emul-linux-x86-java-1.6.0.02.ebuild 2644
-RMD160 deb196a31b792d8feb7e18e720ef4e76c954d488 emul-linux-x86-java-1.6.0.02.ebuild 2644
-SHA256 ec67f2b8e4b100f706ea5986b62b033e662ac8fc42c93a4aa2043f8174ac506e emul-linux-x86-java-1.6.0.02.ebuild 2644
 EBUILD emul-linux-x86-java-1.6.0.03.ebuild 2643 RMD160 239e77ee6a87b791d9d600d81f5cead5a78d7509 SHA1 ac1c3595c1e74d2ab33c7b6806372e0140baf8ce SHA256 6451def854a848e7eb4bfff79b7431bbc737dc7d2672131a68e36e8244e74579
 MD5 8c18a0cae29f066a78b1ff3a8ab0c2d1 emul-linux-x86-java-1.6.0.03.ebuild 2643
 RMD160 239e77ee6a87b791d9d600d81f5cead5a78d7509 emul-linux-x86-java-1.6.0.03.ebuild 2643
 SHA256 6451def854a848e7eb4bfff79b7431bbc737dc7d2672131a68e36e8244e74579 emul-linux-x86-java-1.6.0.03.ebuild 2643
-MISC ChangeLog 8247 RMD160 e10ff546f5e218478884e4b904e5cc400ac221b7 SHA1 02eda10631993d08122f16a7939cade6983e719d SHA256 008e5fc2f8c62f4250a16f636f5f15e9278dc8a640ecc2dbe3f3e738998c3882
-MD5 393966b6f153231f0023aead17ff54aa ChangeLog 8247
-RMD160 e10ff546f5e218478884e4b904e5cc400ac221b7 ChangeLog 8247
-SHA256 008e5fc2f8c62f4250a16f636f5f15e9278dc8a640ecc2dbe3f3e738998c3882 ChangeLog 8247
+MISC ChangeLog 8652 RMD160 1c3d38ffbe858a3145281e450e322a305b14e4ce SHA1 877654fc5709dcd3ec42da28a669088b0951fea1 SHA256 8bbfa33dbbb514792cbb9b121746e1ac8ffa8d54086ff56a4b11bb874f14aadc
+MD5 e0eb45203f2d5cf592257cc74096293f ChangeLog 8652
+RMD160 1c3d38ffbe858a3145281e450e322a305b14e4ce ChangeLog 8652
+SHA256 8bbfa33dbbb514792cbb9b121746e1ac8ffa8d54086ff56a4b11bb874f14aadc ChangeLog 8652
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
 MD5 d7708cacbaa71dba43d860aa46c2ea82 metadata.xml 179
 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe metadata.xml 179
@@ -58,15 +57,12 @@ SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8 metadata
 MD5 132c52c1b863a8946fb168f79619e91d files/digest-emul-linux-x86-java-1.4.2.03-r2 271
 RMD160 3788f95de69c44708182938ec98e905da0b44922 files/digest-emul-linux-x86-java-1.4.2.03-r2 271
 SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/digest-emul-linux-x86-java-1.4.2.03-r2 271
-MD5 0d96221fc33f680529da21231473fd01 files/digest-emul-linux-x86-java-1.5.0.12 280
-RMD160 ae7dbe5d2a37e6717924e67b5a46d3dd94245983 files/digest-emul-linux-x86-java-1.5.0.12 280
-SHA256 c1f2ae4e1b177f5c22ac2816f61303fd5da311b0aca7ff9b8165b78cd2046e1c files/digest-emul-linux-x86-java-1.5.0.12 280
+MD5 86b96b21aa65cc39f454b43df6723d5c files/digest-emul-linux-x86-java-1.4.2.16 271
+RMD160 eee3a095d907345a7b87b9001f9e7161bfff53e3 files/digest-emul-linux-x86-java-1.4.2.16 271
+SHA256 119eda052e74aff940a1efb9244a593dae5419e9b464105c05a4a10267e35ba5 files/digest-emul-linux-x86-java-1.4.2.16 271
 MD5 284741d08d36584c75c07a3a8ab2524b files/digest-emul-linux-x86-java-1.5.0.13 280
 RMD160 bf76a3f65884e8a264479b4a065f729009306c19 files/digest-emul-linux-x86-java-1.5.0.13 280
 SHA256 64d81a18e9672595ef8fdbdd4e9123083b8831d3142e060e87b3861b3fdf65fc files/digest-emul-linux-x86-java-1.5.0.13 280
-MD5 5be2a04f7af1cb74822382632271e073 files/digest-emul-linux-x86-java-1.6.0.02 265
-RMD160 e36748f33160800177a0fa7c6b5fb5a11226bea1 files/digest-emul-linux-x86-java-1.6.0.02 265
-SHA256 d49ac42bd6f13a8df61fda465f544d350147740f73c891b487ba23fe8e0e2b5e files/digest-emul-linux-x86-java-1.6.0.02 265
 MD5 cc80cebc2acd7f33a0b03e523bbfda2d files/digest-emul-linux-x86-java-1.6.0.03 265
 RMD160 67439e1f6b5c6ba8932fc1565f34c3fefdd6dace files/digest-emul-linux-x86-java-1.6.0.03 265
 SHA256 9de00bbf3a63d22b98592407b2cb73646beff9f4004257517ed27256bbede581 files/digest-emul-linux-x86-java-1.6.0.03 265
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
new file mode 100644
index 000000000000..1fe582d0d32c
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.16.ebuild
@@ -0,0 +1,127 @@
+# 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.1 2007/11/03 15:47:47 caster 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.12.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.12.ebuild
deleted file mode 100644
index b57eec88ad79..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.12.ebuild
+++ /dev/null
@@ -1,106 +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.12.ebuild,v 1.4 2007/07/22 19:17:18 philantrop 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
-
-	# TODO Don't think we still needs these -nichoj
-	# create dir for system preferences
-	#dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	#touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	#touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	#chmod 644 ${D}/opt/${P}/jre/.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}\/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.6.0.02.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.02.ebuild
deleted file mode 100644
index 7ed6bba38463..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.02.ebuild
+++ /dev/null
@@ -1,96 +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.02.ebuild,v 1.4 2007/08/17 10:15:13 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 )"
-
-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/files/digest-emul-linux-x86-java-1.4.2.16 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.16
new file mode 100644
index 000000000000..b5b59d764b9b
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.16
@@ -0,0 +1,3 @@
+MD5 781dbc8d1a0ea9300e002e2368c2b6f7 j2re-1_4_2_16-linux-i586.bin 14388621
+RMD160 46885501b413a73a08f50695c335e11291389376 j2re-1_4_2_16-linux-i586.bin 14388621
+SHA256 9293d00a35b31e7f78f6338ead3a811d2732290b90a3711814ee64cea5842045 j2re-1_4_2_16-linux-i586.bin 14388621
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.12 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.12
deleted file mode 100644
index 363619dea9fb..000000000000
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9b0d717810953e78d5c40969e382e1ae jdk-1_5_0_12-dlj-linux-i586.bin 49646174
-RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 jdk-1_5_0_12-dlj-linux-i586.bin 49646174
-SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0 jdk-1_5_0_12-dlj-linux-i586.bin 49646174
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.02 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.02
deleted file mode 100644
index b473f7cb64a1..000000000000
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.02
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 31fb431b22906344b4b0121e50bef84a jdk-6u2-dlj-linux-i586.bin 58408110
-RMD160 3b0c124693401ebc07dea50dfbf05bc9c2d47c28 jdk-6u2-dlj-linux-i586.bin 58408110
-SHA256 6d25968debfcac1397fb3dc36c505d0cce8f787f0fc135aab8d6a7d517df68c2 jdk-6u2-dlj-linux-i586.bin 58408110
diff --git a/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.env b/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.env
new file mode 100644
index 000000000000..4ee588e9a0fd
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.env
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.env,v 1.1 2007/11/03 15:47:48 caster Exp $
+
+VERSION="Sun 32bit 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/i386/:${JAVA_HOME}/lib/i386/native_threads/:${JAVA_HOME}/lib/i386/classic/:${JAVA_HOME}/lib/i386/server"
+MANPATH="/opt/@P@/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.4"
+BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/i18n.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"