Version bump, bug #205772. Also fix BOOTCLASSPATH for 1.5 - bug #206069.

Package-Manager: portage-2.1.4

7 files changed, 325 insertions, 12 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index ac586b9067bb..95c4822c082b 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jdk
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.222 2007/12/16 21:10:16 caster Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.223 2008/01/18 14:47:33 caster Exp $
+
+*sun-jdk-1.6.0.04 (18 Jan 2008)
+*sun-jdk-1.5.0.14 (18 Jan 2008)
+
+  18 Jan 2008; Vlastimil Babka <caster@gentoo.org> files/sun-jdk-1.5.env,
+  +sun-jdk-1.5.0.14.ebuild, +sun-jdk-1.6.0.04.ebuild:
+  Version bump, bug #205772. Also fix BOOTCLASSPATH for 1.5 - bug #206069.
 
   16 Dec 2007; Vlastimil Babka <caster@gentoo.org> sun-jdk-1.4.2.16.ebuild,
   sun-jdk-1.5.0.13.ebuild, sun-jdk-1.6.0.03.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index a83b74915fd4..60745b34a599 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -6,10 +6,10 @@ AUX sun-jdk-1.4.env 976 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed SHA1 8ce
 MD5 8131b935e43bde0b9015e691bd3b251a files/sun-jdk-1.4.env 976
 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed files/sun-jdk-1.4.env 976
 SHA256 b57d36c5a24829add66fb92a8dd4d496e14ea792218c3515dab9573a55cfad49 files/sun-jdk-1.4.env 976
-AUX sun-jdk-1.5.env 925 RMD160 6042c2849330d0a7b7ef87f2680209a27707a370 SHA1 d93a7e7bad03e089efdd9c549671825e96ba3d55 SHA256 9faf2bfbdec7fd92e6fc3509a22ae8ec9a3527d850f9763cef42575e0dec13fe
-MD5 9b9e4337c1fb2f73b1adad1db1e01325 files/sun-jdk-1.5.env 925
-RMD160 6042c2849330d0a7b7ef87f2680209a27707a370 files/sun-jdk-1.5.env 925
-SHA256 9faf2bfbdec7fd92e6fc3509a22ae8ec9a3527d850f9763cef42575e0dec13fe files/sun-jdk-1.5.env 925
+AUX sun-jdk-1.5.env 859 RMD160 657a54eebf4f8773204ca442e48845e163a67154 SHA1 59241ca2cf7f5b2c2f5dcc3d69accb43d8ffb419 SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585
+MD5 c52a0c8dd2d61a431ba92f54d1410155 files/sun-jdk-1.5.env 859
+RMD160 657a54eebf4f8773204ca442e48845e163a67154 files/sun-jdk-1.5.env 859
+SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585 files/sun-jdk-1.5.env 859
 AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
 MD5 12c85d8ae81039e2471baed07fee3cc0 files/sun-jdk-1.6.env 940
 RMD160 2061347f8137915ed421c7592a6909b51bb2110d files/sun-jdk-1.6.env 940
@@ -18,8 +18,12 @@ DIST j2sdk-1_4_2_16-linux-i586.bin 36397216 RMD160 01652579112db12b431940da39bbd
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 DIST jdk-1_5_0_13-dlj-linux-amd64.bin 43857474 RMD160 704650919656ea6d4e3578966cb4252fccdd5ae7 SHA1 ec371ec74c8d0c822979b25d49765999d0fae320 SHA256 c74786b2420f498505ec5858e6e64727f401846e58fff249f3ded42ac0845114
 DIST jdk-1_5_0_13-dlj-linux-i586.bin 49672592 RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed SHA1 a025d81df269ed6ce663a34f52e5f0ea2a462bf2 SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0
+DIST jdk-5.0u14-dlj-linux-amd64.bin 44056532 RMD160 a72c69e76978a3ddb1f790c229a50d49c38d97b1 SHA1 a3b834cbdfb4085563c62e0916905f9810c9f695 SHA256 3828f14faec58ebdb5210f41c301133fe029eb9563e47d0ee3dc2cefd94adedb
+DIST jdk-5.0u14-dlj-linux-i586.bin 49671645 RMD160 4f231302093d6f455a2e020a3e2114c7c8a3bc93 SHA1 1f4cb6428170f6fe3d202377cc3913485fc01b92 SHA256 d07373644f766602a7f0b7979ffdc4e9d704066c3be5562a360275d93b7fc7e5
 DIST jdk-6u3-dlj-linux-amd64.bin 62180680 RMD160 7d305e714446a4a4345f1c638895542431d402fe SHA1 aca236ed64fc6735d303c57e13cc9f67a6ac11be SHA256 8bc80ea1bf739674c1cacdfba9987a4d15adb54f4b1462a0b48b79815f56b311
 DIST jdk-6u3-dlj-linux-i586.bin 68613151 RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c SHA1 86ba73cdcc2c22782a04b8191f157a5ac7caa490 SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b
+DIST jdk-6u4-dlj-linux-amd64.bin 63716237 RMD160 63178b299d4c6721c8d3c447764e5a5cd6d9d865 SHA1 00afdbbc6b0b60de6b03d2f37710bb86f8e6760c SHA256 be0e21402a79c5b6cd6c96d34451bcc365619cd063930f3ca1c1abe2ee5dbf43
+DIST jdk-6u4-dlj-linux-i586.bin 70455896 RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d SHA1 24601838ae7216cbc5d75170b6aebf5e4012dec1 SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c
 EBUILD sun-jdk-1.4.2.16.ebuild 5345 RMD160 1f3047b354e6c59127edf09f709bf9c00c67942a SHA1 df954e0b8eb63acc15f4fa4a9b17fc80d48d1fc7 SHA256 0957ff52bbf5a7ba65edba5dc458496acfc556d7ba837a9503c6fc13f7c92d8b
 MD5 d236e25649c8a42c35873a5a80f55acf sun-jdk-1.4.2.16.ebuild 5345
 RMD160 1f3047b354e6c59127edf09f709bf9c00c67942a sun-jdk-1.4.2.16.ebuild 5345
@@ -28,14 +32,22 @@ EBUILD sun-jdk-1.5.0.13.ebuild 4237 RMD160 ef2eb5c351f23a73a5ebf1f2751f76af2e480
 MD5 c8680b447bd170f13c7ab6f4d293aeb5 sun-jdk-1.5.0.13.ebuild 4237
 RMD160 ef2eb5c351f23a73a5ebf1f2751f76af2e4800e9 sun-jdk-1.5.0.13.ebuild 4237
 SHA256 f2e30578d4397a86513dc5afd9f16cc79e54965a587b6699c179bf46f93a4840 sun-jdk-1.5.0.13.ebuild 4237
+EBUILD sun-jdk-1.5.0.14.ebuild 4268 RMD160 03e8f2e59e49fcbefeb61e6abdd6e74dbc065862 SHA1 42d904815c83b74a6845f704e50e6f19d64b1c23 SHA256 8f0172efffa20d30794e738bc663fa9672216c2a6c97a643e400a1bff6270fd6
+MD5 cbf53cbc5023a2aeecc3723774952cbe sun-jdk-1.5.0.14.ebuild 4268
+RMD160 03e8f2e59e49fcbefeb61e6abdd6e74dbc065862 sun-jdk-1.5.0.14.ebuild 4268
+SHA256 8f0172efffa20d30794e738bc663fa9672216c2a6c97a643e400a1bff6270fd6 sun-jdk-1.5.0.14.ebuild 4268
 EBUILD sun-jdk-1.6.0.03.ebuild 4808 RMD160 2518cd8c39d92fa07c1c156b91acb8756bb74d29 SHA1 1aaa6d7b58de8849f857ca48316fc655e432bcb7 SHA256 5946505911f45ff895860406ac6fe2b08be9a10f19b1364da7d1929605c3669a
 MD5 f3b0794aea1e2d275fbb50b40440cf27 sun-jdk-1.6.0.03.ebuild 4808
 RMD160 2518cd8c39d92fa07c1c156b91acb8756bb74d29 sun-jdk-1.6.0.03.ebuild 4808
 SHA256 5946505911f45ff895860406ac6fe2b08be9a10f19b1364da7d1929605c3669a sun-jdk-1.6.0.03.ebuild 4808
-MISC ChangeLog 42655 RMD160 4c001a2e1445945a08838f911626af64391c5570 SHA1 e07ff6459516531b023a4dc62d1fcb8a8004b213 SHA256 27069581a6ab24af304e5a530157f93d4d9348ed4e75a24a54367a47024d0fd5
-MD5 70862ae57880692f4b0808fce1aa0e7d ChangeLog 42655
-RMD160 4c001a2e1445945a08838f911626af64391c5570 ChangeLog 42655
-SHA256 27069581a6ab24af304e5a530157f93d4d9348ed4e75a24a54367a47024d0fd5 ChangeLog 42655
+EBUILD sun-jdk-1.6.0.04.ebuild 4529 RMD160 cc0d2d08bea0da3c79618e7f3d5bf0001520152a SHA1 bfd3521a814908473f7315a37bc7efd2fec4dbad SHA256 bbf8a12ea35d3f33da1c34908b2d52a0e4f1cccea3628bd7b5d8d065a6169a9d
+MD5 2c94b7010e6206a79b29d30926f16f25 sun-jdk-1.6.0.04.ebuild 4529
+RMD160 cc0d2d08bea0da3c79618e7f3d5bf0001520152a sun-jdk-1.6.0.04.ebuild 4529
+SHA256 bbf8a12ea35d3f33da1c34908b2d52a0e4f1cccea3628bd7b5d8d065a6169a9d sun-jdk-1.6.0.04.ebuild 4529
+MISC ChangeLog 42924 RMD160 9fbef3ca73c13f77448cba21ef6e1c3837806309 SHA1 3134b060d4595a3881b40e4a9f298c956a7c0cd2 SHA256 4306ed1a3bf22406fbc8b0dc4385495f3187643eba9413bacfdc0bec977033a1
+MD5 2a8b16dde0388514ed0ab177b7c9b6a1 ChangeLog 42924
+RMD160 9fbef3ca73c13f77448cba21ef6e1c3837806309 ChangeLog 42924
+SHA256 4306ed1a3bf22406fbc8b0dc4385495f3187643eba9413bacfdc0bec977033a1 ChangeLog 42924
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -46,6 +58,12 @@ SHA256 70f5cd6d54a22c5c09088442da1ec083163f17412007222468ec8bffafb3045f files/di
 MD5 7ba1bd262fc370c80586daff290ce586 files/digest-sun-jdk-1.5.0.13 563
 RMD160 2786cfd600f206dd83b3942d53bc66103f3a467a files/digest-sun-jdk-1.5.0.13 563
 SHA256 49b80b8f1ffe8c970dac5037bf1aabf40a252c02a57ad32307a0826e5893347f files/digest-sun-jdk-1.5.0.13 563
+MD5 8173834080f0dbb744e4c91918d6e6f4 files/digest-sun-jdk-1.5.0.14 551
+RMD160 b4a223f03282f7fda9f45db55cb606dd80e424be files/digest-sun-jdk-1.5.0.14 551
+SHA256 0e8cf00670b95f6df3da18594859aa6795a244a18962f5078f193338d9777c01 files/digest-sun-jdk-1.5.0.14 551
 MD5 e32d749add185cabff21e77fb7371ace files/digest-sun-jdk-1.6.0.03 533
 RMD160 a0008d28e74f3da4d8c9ad983451338a503dc3d1 files/digest-sun-jdk-1.6.0.03 533
 SHA256 0f4601a072ae2e18ee4dbf3c8ff895e0f85129928a6eb81bc18ad9e5e5a39dcd files/digest-sun-jdk-1.6.0.03 533
+MD5 1b6e344073e410e524ec0819b62aefbb files/digest-sun-jdk-1.6.0.04 533
+RMD160 a2c1533b95fde302e3df4426f05d6b43b279394d files/digest-sun-jdk-1.6.0.04 533
+SHA256 14634c9e60bd849578c3f433f8d3694fdeb37e134912d7b678f122faa0769c71 files/digest-sun-jdk-1.6.0.04 533
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.14 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.14
new file mode 100644
index 000000000000..79b2e1016262
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.14
@@ -0,0 +1,6 @@
+MD5 d0e84c3df21915362f1c506c75a52ee5 jdk-5.0u14-dlj-linux-amd64.bin 44056532
+RMD160 a72c69e76978a3ddb1f790c229a50d49c38d97b1 jdk-5.0u14-dlj-linux-amd64.bin 44056532
+SHA256 3828f14faec58ebdb5210f41c301133fe029eb9563e47d0ee3dc2cefd94adedb jdk-5.0u14-dlj-linux-amd64.bin 44056532
+MD5 74c136f5c02d669beca2f66922145b5d jdk-5.0u14-dlj-linux-i586.bin 49671645
+RMD160 4f231302093d6f455a2e020a3e2114c7c8a3bc93 jdk-5.0u14-dlj-linux-i586.bin 49671645
+SHA256 d07373644f766602a7f0b7979ffdc4e9d704066c3be5562a360275d93b7fc7e5 jdk-5.0u14-dlj-linux-i586.bin 49671645
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0.04 b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0.04
new file mode 100644
index 000000000000..87433ffe7f39
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.6.0.04
@@ -0,0 +1,6 @@
+MD5 f64a636c6e516992fd1840c5b2419b53 jdk-6u4-dlj-linux-amd64.bin 63716237
+RMD160 63178b299d4c6721c8d3c447764e5a5cd6d9d865 jdk-6u4-dlj-linux-amd64.bin 63716237
+SHA256 be0e21402a79c5b6cd6c96d34451bcc365619cd063930f3ca1c1abe2ee5dbf43 jdk-6u4-dlj-linux-amd64.bin 63716237
+MD5 d5bba61ea1e0b76090b855ff49ec1d6a jdk-6u4-dlj-linux-i586.bin 70455896
+RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d jdk-6u4-dlj-linux-i586.bin 70455896
+SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c jdk-6u4-dlj-linux-i586.bin 70455896
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.env b/dev-java/sun-jdk/files/sun-jdk-1.5.env
index 904b55800058..3715d68d65aa 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.5.env
+++ b/dev-java/sun-jdk/files/sun-jdk-1.5.env
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.5.env,v 1.1 2006/06/25 20:06:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.5.env,v 1.2 2008/01/18 14:47:34 caster Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
@@ -12,6 +12,6 @@ LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_
 MANPATH="/opt/@P@/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+BOOTCLASSPATH="${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 JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.14.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.14.ebuild
new file mode 100644
index 000000000000..d60a5d07bc00
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.14.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.14.ebuild,v 1.1 2008/01/18 14:47:33 caster Exp $
+
+inherit versionator java-vm-2 eutils pax-utils
+
+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 Development Kit, version 1.5"
+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 doc examples jce nsplugin odbc"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
+RDEPEND="sys-libs/glibc
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )
+	X? (
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXp
+			x11-libs/libXtst
+			x11-libs/libXt
+			x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+src_unpack() {
+	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
+}
+
+src_install() {
+	local dirs="bin include jre 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}"{,/jre}/bin/*)
+
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
+	dodoc COPYRIGHT README.html || die
+	dohtml README.html || die
+
+	cp -pP src.zip "${D}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR demo "${D}/opt/${P}/" || die
+		cp -pPR sample "${D}/opt/${P}/" || die
+	fi
+
+	if use jce; then
+		cd "${D}"/opt/${P}/jre/lib/security || die
+		dodir /opt/${P}/jre/lib/security/strong-jce
+		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
+			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
+		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
+			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
+		local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
+		dosym ${jcedir}/US_export_policy.jar \
+			/opt/${P}/jre/lib/security/ || die
+		dosym ${jcedir}/local_policy.jar \
+			/opt/${P}/jre/lib/security/ || die
+	fi
+
+	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}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		else
+			eerror "No plugin available for amd64 arch"
+		fi
+	fi
+
+	# 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
+
+	# install control panel for Gnome/KDE
+	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+		sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+			-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+			"${T}"/sun_java-${SLOT}.desktop \
+			|| die "Failed to sed .desktop file"
+
+		domenu "${T}"/sun_java-${SLOT}.desktop
+	fi
+
+	# bug #56444
+	insinto /opt/${P}/jre/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"
+	elog ""
+	elog "Starting with 1.5.0.12 the src.zip and demos are installed to the standard"
+	elog "locations."
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
+	elog "http://java.sun.com/j2se/1.5.0/docs/tooldocs/linux/jdkfiles.html"
+	elog "for more details."
+}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild
new file mode 100644
index 000000000000..9c2e8f706dd4
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild,v 1.1 2008/01/18 14:47:33 caster Exp $
+
+inherit versionator java-vm-2 eutils pax-utils
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/javase/6/"
+URL_BASE="http://download.java.net/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 doc examples jce nsplugin odbc"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
+	opt/${P}/jre/lib/i386/libdeploy.so
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
+RDEPEND="
+	x86? ( =virtual/libstdc++-3.3 )
+	sys-libs/glibc
+	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 )"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
+
+src_unpack() {
+	sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
+}
+
+src_install() {
+	local dirs="bin include jre 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}"{,/jre}/bin/*)
+
+	dodir /opt/${P}
+
+	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
+	dodoc COPYRIGHT || die
+	dohtml README.html || die
+
+	cp -pP src.zip "${D}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR demo sample "${D}/opt/${P}/" || die
+	fi
+
+	if use jce; then
+		cd "${D}/opt/${P}/jre/lib/security"
+		dodir /opt/${P}/jre/lib/security/strong-jce
+		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
+			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
+		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
+			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+	fi
+
+	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}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		else
+			eerror "No plugin available for amd64 arch"
+		fi
+	fi
+
+	# 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
+
+	if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+		# install control panel for Gnome/KDE
+		# The jre also installs these so make sure that they do not have the same
+		# Name
+		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+			"${T}"/sun_jdk-${SLOT}.desktop
+
+		domenu "${T}"/sun_jdk-${SLOT}.desktop
+	fi
+
+	# bug #56444
+	insinto /opt/${P}/jre/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"
+	elog ""
+	elog "Starting with 1.6.0-r2 the src.zip is installed to the standard"
+	elog "location. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
+	elog "http://java.sun.com/javase/6/docs/technotes/tools/linux/jdkfiles.html"
+	elog "for more details."
+	elog ""
+	elog "Starting with 1.6.0.01 demo and sample directories have been moved"
+	elog "to top level from the share sub directory."
+}