Removed JAVA_VM_NO_GENERATION1, because default behavior now is not to install for generation-1. Pruned old revisions.

(Portage version: 2.1.1_rc1-r2)
 (Unsigned Manifest commit)

9 files changed, 8 insertions, 839 deletions

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index c1fa0f9fbdcc..cad55e08e88e 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -26,12 +26,7 @@ DIST j2sdk-1_3_1_17-linux-i586.bin 26660449 RMD160 6bdcc5d60ef9c06125de965dae34b
 DIST j2sdk-1_4_2_10-linux-i586.bin 36446523 RMD160 c7e65c19747d549a06530af9baba2ef0b52cb152 SHA1 bbbd7a44f8642adf56b77fe2755b1c7caad94c91 SHA256 193051a8b365325c3736838e580eafa036e82100f04ae12ffbe70f3cbf2173bc
 DIST j2sdk-1_4_2_12-linux-i586.bin 36337163 RMD160 6b1499cf3bd46158293506b8a0d701ec52b78ef3 SHA1 74f88c386985ba01b7c574e441f3f479b4a3b549 SHA256 ab7f5285993d71dc692625bed4d11557048ef3a4be6c51941c507cef26025531
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
-DIST jce_policy-1_5_0.zip 8826 RMD160 eb12d0333c3ddbbba57a0e825a6891a75ec485c0 SHA1 f0e887b91b4499142285633e65c5710c3a133a16 SHA256 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 DIST jdk-1_2_2_017-linux-i586.tar.gz 21192620
-DIST jdk-1_5_0_07-distro-linux-amd64.bin 43811573 RMD160 1b6e4d557d4e171b402e6a955364ee32f6c20b43 SHA1 220f259749ad7738d30ae64b8338bb20dab6c7c0 SHA256 bf798c43fc077d893adff1337fc03e0e0017e46f1b03dab884d2aa66690e4330
-DIST jdk-1_5_0_07-distro-linux-i586.bin 49100762 RMD160 2ea192d0e1db5c617b5b4773f5fe169f038a72a1 SHA1 c0758e95b3150cd4e7de4f04a6e2c791aa437fa2 SHA256 68c5fe5c44e5f3a0d83c34ddcd73d8e9ceede1ccb79da46019b45825be443e5a
-DIST jdk-1_5_0_07-linux-amd64.bin 43785859 RMD160 ca521c4f8eb23ac3a5636d1d317d5ad746c6dac6 SHA1 697a04c373d9d6076d70d694f8ab1797b2707d59 SHA256 4854617e017d92256c0f3270da5e1f59998b3a37c8d852ec68ec57b498d425b5
-DIST jdk-1_5_0_07-linux-i586.bin 49075062 RMD160 3922e171cf080d643066faf4ee05c9bde1fb306c SHA1 4230d81744dadc8769163df67d9aa6fc88f4d574 SHA256 3f4c327aeb11b2c923a501b8315ce4261cec13dc0a9991264d3ba2e6edf86ce2
 DIST jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 RMD160 c6669cba980b9097c6921041ee3af8753587ea37 SHA1 f43776629e50834be1f25060bcbe7f8ee0483173 SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f
 DIST jdk-1_5_0_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8
 EBUILD sun-jdk-1.2.2.017.ebuild 2835 RMD160 73d7f35c406fbdec4e6c239fc92f110d2628313c SHA1 7360b846a27140f7e3f9f133a4ccf8eefceca18c SHA256 5be327926910e2644f9f6b401b89d5d40922191fafb07bd30130a8956ff312d0
@@ -58,30 +53,14 @@ EBUILD sun-jdk-1.4.2.12.ebuild 6021 RMD160 1ac8d6fd6be913e68590db5f37adefaea72aa
 MD5 1c0f641f0470142a19efd2126090744f sun-jdk-1.4.2.12.ebuild 6021
 RMD160 1ac8d6fd6be913e68590db5f37adefaea72aac5b sun-jdk-1.4.2.12.ebuild 6021
 SHA256 24e94e850cb35836165e6ce515dc60380fe973613a01a94ebddd62ce54e9e862 sun-jdk-1.4.2.12.ebuild 6021
-EBUILD sun-jdk-1.5.0.07-r1.ebuild 5630 RMD160 49120b93381135573625876718a84040f59c3cb1 SHA1 02fa03459a690098952a402a06f627627f03a343 SHA256 7ac751036b1f2b954013176fc9b75dcc64982b271ebc358a83ae91e1c9e86d16
-MD5 44716a5fb409188e5d0225a4cbe7d385 sun-jdk-1.5.0.07-r1.ebuild 5630
-RMD160 49120b93381135573625876718a84040f59c3cb1 sun-jdk-1.5.0.07-r1.ebuild 5630
-SHA256 7ac751036b1f2b954013176fc9b75dcc64982b271ebc358a83ae91e1c9e86d16 sun-jdk-1.5.0.07-r1.ebuild 5630
-EBUILD sun-jdk-1.5.0.07-r2.ebuild 5630 RMD160 c86c8a310bab0c38cd32b5e6729b4b2a451f1601 SHA1 af893640a0490e0a3c4b04af8fc8ce117bace28c SHA256 8b4df34bca8e2b1c964cbe6178d0eb9cdfaaa8a3723c607d97b49b1e846268b7
-MD5 3d43a56564b355d950325cdb2b2f8a62 sun-jdk-1.5.0.07-r2.ebuild 5630
-RMD160 c86c8a310bab0c38cd32b5e6729b4b2a451f1601 sun-jdk-1.5.0.07-r2.ebuild 5630
-SHA256 8b4df34bca8e2b1c964cbe6178d0eb9cdfaaa8a3723c607d97b49b1e846268b7 sun-jdk-1.5.0.07-r2.ebuild 5630
-EBUILD sun-jdk-1.5.0.07-r3.ebuild 5630 RMD160 c4191eedf097325bb4b7e8a3a01ccf7e7f68d499 SHA1 7e098841ab449a4cf7c2c93c6a44f6a0e0d7baed SHA256 ccd6ed4dd8d56acfeecc695f303c9a8c22a696a7ec2e81816b87c5df6f2b29f1
-MD5 a741e0e3696fd3dc84c81f65aba57107 sun-jdk-1.5.0.07-r3.ebuild 5630
-RMD160 c4191eedf097325bb4b7e8a3a01ccf7e7f68d499 sun-jdk-1.5.0.07-r3.ebuild 5630
-SHA256 ccd6ed4dd8d56acfeecc695f303c9a8c22a696a7ec2e81816b87c5df6f2b29f1 sun-jdk-1.5.0.07-r3.ebuild 5630
-EBUILD sun-jdk-1.5.0.07.ebuild 6720 RMD160 0e4f50cb4bf8e9ab0acb10a6b0e338d43f5e7c85 SHA1 42c5e58a9a631e706c5246abb7c4535855f8661a SHA256 2da123db1818ab3bd4eb0be133c1d78c97785627ae58bd921304d62bf930f453
-MD5 3001a1cadc7e2065ca76dd1179330d42 sun-jdk-1.5.0.07.ebuild 6720
-RMD160 0e4f50cb4bf8e9ab0acb10a6b0e338d43f5e7c85 sun-jdk-1.5.0.07.ebuild 6720
-SHA256 2da123db1818ab3bd4eb0be133c1d78c97785627ae58bd921304d62bf930f453 sun-jdk-1.5.0.07.ebuild 6720
-EBUILD sun-jdk-1.5.0.08.ebuild 5658 RMD160 287ddf942d75bb189f62a0050de19345fd3a1a44 SHA1 70ec07f2e1cdd4a32681141ba7ad68be14a9a664 SHA256 3828609fed57e74e29b9dc7865f637f8878e5e46c408091bfddbf0da48b6e170
-MD5 21b27aa9d50e433eedbc0650edb1d05c sun-jdk-1.5.0.08.ebuild 5658
-RMD160 287ddf942d75bb189f62a0050de19345fd3a1a44 sun-jdk-1.5.0.08.ebuild 5658
-SHA256 3828609fed57e74e29b9dc7865f637f8878e5e46c408091bfddbf0da48b6e170 sun-jdk-1.5.0.08.ebuild 5658
-MISC ChangeLog 31794 RMD160 92820674d77ac8c6d9208a90ca62473761223b2a SHA1 41cd24a318070b6cda6c6d572de130bc73ca7d95 SHA256 ee57340f83d2dbf678a3d3f645acb457c4e51081ed4c94a8d2353f33ebf3d638
-MD5 dd5342f7754b08356b5e5194d68f3aaa ChangeLog 31794
-RMD160 92820674d77ac8c6d9208a90ca62473761223b2a ChangeLog 31794
-SHA256 ee57340f83d2dbf678a3d3f645acb457c4e51081ed4c94a8d2353f33ebf3d638 ChangeLog 31794
+EBUILD sun-jdk-1.5.0.08.ebuild 5627 RMD160 1097272e20f6d7b35f7026e353db05707a7920fb SHA1 71a4a7494e297e3754d8d990db26f9245b4f5035 SHA256 7ce8112fdc5e5979d1041be2a8e607fe1865f583db7cfc6554d27933fd073f89
+MD5 11f06f343ed6843e5d44a529f145ad93 sun-jdk-1.5.0.08.ebuild 5627
+RMD160 1097272e20f6d7b35f7026e353db05707a7920fb sun-jdk-1.5.0.08.ebuild 5627
+SHA256 7ce8112fdc5e5979d1041be2a8e607fe1865f583db7cfc6554d27933fd073f89 sun-jdk-1.5.0.08.ebuild 5627
+MISC ChangeLog 32110 RMD160 67a4e8a2977b90c9782f1636246f6554bb43f82a SHA1 4621f714a07a438b420811f23e1b86f7e23bbca8 SHA256 0f90170ea743cc50896cf49447f2b80f96d0c92c8990f5e969879bb34583f65d
+MD5 2fad0aadbba6f81dad3cfd241d5d991c ChangeLog 32110
+RMD160 67a4e8a2977b90c9782f1636246f6554bb43f82a ChangeLog 32110
+SHA256 0f90170ea743cc50896cf49447f2b80f96d0c92c8990f5e969879bb34583f65d ChangeLog 32110
 MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239
@@ -104,18 +83,6 @@ SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/di
 MD5 5bec2db22a35d2dab4b65c6c5ac4a5ad files/digest-sun-jdk-1.4.2.12-r1 512
 RMD160 84b4872443740be6f65e43bd92830b1a2f72eedd files/digest-sun-jdk-1.4.2.12-r1 512
 SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/digest-sun-jdk-1.4.2.12-r1 512
-MD5 e74c00b114ffbe059dbc008b4e17b01c files/digest-sun-jdk-1.5.0.07 774
-RMD160 d51faa46e147504d0b04d8e02509beaba35e880a files/digest-sun-jdk-1.5.0.07 774
-SHA256 7cdfd5f068eebeef9d8b687e8d3597c8a2479426a63cf2d585a057fa57809be9 files/digest-sun-jdk-1.5.0.07 774
-MD5 5ddd958e9f549077d707ebbab2268da6 files/digest-sun-jdk-1.5.0.07-r1 581
-RMD160 d85849e87af7f72df84427919c5da091946a0c85 files/digest-sun-jdk-1.5.0.07-r1 581
-SHA256 00752eb3e6008c65c12fe95bf32aa70c16d85715b2cd7f3b9d5a1b7c8edaab46 files/digest-sun-jdk-1.5.0.07-r1 581
-MD5 5ddd958e9f549077d707ebbab2268da6 files/digest-sun-jdk-1.5.0.07-r2 581
-RMD160 d85849e87af7f72df84427919c5da091946a0c85 files/digest-sun-jdk-1.5.0.07-r2 581
-SHA256 00752eb3e6008c65c12fe95bf32aa70c16d85715b2cd7f3b9d5a1b7c8edaab46 files/digest-sun-jdk-1.5.0.07-r2 581
-MD5 5ddd958e9f549077d707ebbab2268da6 files/digest-sun-jdk-1.5.0.07-r3 581
-RMD160 d85849e87af7f72df84427919c5da091946a0c85 files/digest-sun-jdk-1.5.0.07-r3 581
-SHA256 00752eb3e6008c65c12fe95bf32aa70c16d85715b2cd7f3b9d5a1b7c8edaab46 files/digest-sun-jdk-1.5.0.07-r3 581
 MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jdk-1.5.0.08 563
 RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jdk-1.5.0.08 563
 SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jdk-1.5.0.08 563
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07
deleted file mode 100644
index ec8b7cdf99af..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
-RMD160 eb12d0333c3ddbbba57a0e825a6891a75ec485c0 jce_policy-1_5_0.zip 8826
-SHA256 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b jce_policy-1_5_0.zip 8826
-MD5 41c9d6bc3b2c0865d8c32ecb915d0091 jdk-1_5_0_07-linux-amd64.bin 43785859
-RMD160 ca521c4f8eb23ac3a5636d1d317d5ad746c6dac6 jdk-1_5_0_07-linux-amd64.bin 43785859
-SHA256 4854617e017d92256c0f3270da5e1f59998b3a37c8d852ec68ec57b498d425b5 jdk-1_5_0_07-linux-amd64.bin 43785859
-MD5 1325082c36b4adcb71bc5449ae4c68cf jdk-1_5_0_07-linux-i586.bin 49075062
-RMD160 3922e171cf080d643066faf4ee05c9bde1fb306c jdk-1_5_0_07-linux-i586.bin 49075062
-SHA256 3f4c327aeb11b2c923a501b8315ce4261cec13dc0a9991264d3ba2e6edf86ce2 jdk-1_5_0_07-linux-i586.bin 49075062
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r1
deleted file mode 100644
index 0e7884507e8e..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cbf4fee8c737ed6b1d5288dc0f6dbe3c jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-RMD160 1b6e4d557d4e171b402e6a955364ee32f6c20b43 jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-SHA256 bf798c43fc077d893adff1337fc03e0e0017e46f1b03dab884d2aa66690e4330 jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-MD5 d7bf7e986ab185c830d11f93f18b3930 jdk-1_5_0_07-distro-linux-i586.bin 49100762
-RMD160 2ea192d0e1db5c617b5b4773f5fe169f038a72a1 jdk-1_5_0_07-distro-linux-i586.bin 49100762
-SHA256 68c5fe5c44e5f3a0d83c34ddcd73d8e9ceede1ccb79da46019b45825be443e5a jdk-1_5_0_07-distro-linux-i586.bin 49100762
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r2 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r2
deleted file mode 100644
index 0e7884507e8e..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cbf4fee8c737ed6b1d5288dc0f6dbe3c jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-RMD160 1b6e4d557d4e171b402e6a955364ee32f6c20b43 jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-SHA256 bf798c43fc077d893adff1337fc03e0e0017e46f1b03dab884d2aa66690e4330 jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-MD5 d7bf7e986ab185c830d11f93f18b3930 jdk-1_5_0_07-distro-linux-i586.bin 49100762
-RMD160 2ea192d0e1db5c617b5b4773f5fe169f038a72a1 jdk-1_5_0_07-distro-linux-i586.bin 49100762
-SHA256 68c5fe5c44e5f3a0d83c34ddcd73d8e9ceede1ccb79da46019b45825be443e5a jdk-1_5_0_07-distro-linux-i586.bin 49100762
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r3 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r3
deleted file mode 100644
index 0e7884507e8e..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cbf4fee8c737ed6b1d5288dc0f6dbe3c jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-RMD160 1b6e4d557d4e171b402e6a955364ee32f6c20b43 jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-SHA256 bf798c43fc077d893adff1337fc03e0e0017e46f1b03dab884d2aa66690e4330 jdk-1_5_0_07-distro-linux-amd64.bin 43811573
-MD5 d7bf7e986ab185c830d11f93f18b3930 jdk-1_5_0_07-distro-linux-i586.bin 49100762
-RMD160 2ea192d0e1db5c617b5b4773f5fe169f038a72a1 jdk-1_5_0_07-distro-linux-i586.bin 49100762
-SHA256 68c5fe5c44e5f3a0d83c34ddcd73d8e9ceede1ccb79da46019b45825be443e5a jdk-1_5_0_07-distro-linux-i586.bin 49100762
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild
deleted file mode 100644
index 2023ae617f23..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2006 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.07-r1.ebuild,v 1.2 2006/08/16 08:10:11 nichoj Exp $
-
-inherit java-vm-2 eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-S="${WORKDIR}/jdk${MY_PVL}"
-
-if use x86; then
-	At=jdk-${MY_PVA}-distro-linux-i586.bin
-elif use amd64; then
-	At=jdk-${MY_PVA}-distro-linux-amd64.bin
-fi
-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/jdk-${MY_PVA}-distro-linux-i586.bin )
-		amd64? ( http://download.java.net/dlj/binaries/jdk-${MY_PVA}-distro-linux-amd64.bin )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="~x86 ~amd64 -*"
-# Restrict stricter because of textrels
-RESTRICT="nostrip stricter"
-IUSE="X alsa doc examples nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-#
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? ( || ( ( x11-libs/libICE
-				x11-libs/libSM
-		 		x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-#FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-#FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-#	if use jce; then
-#		if [ ! -r ${DISTDIR}/${jcefile} ]; then
-#			die "cannot read ${jcefile}. Please check the permission and try again."
-#		fi
-#	fi
-
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-		if ( use x86 || use amd64 ); then
-			cp -pPR sample ${D}/opt/${P}/share/
-		fi
-	fi
-
-#	if use jce ; then
-#		cd ${D}/opt/${P}/jre/lib/security
-#		unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce"
-#		mv jce unlimited-jce
-#		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
-#		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-#		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-#		dosym /opt/${P}/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
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java.desktop
-
-	domenu ${T}/sun_java.desktop
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		local xwarn="virtual/x11 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
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild
deleted file mode 100644
index 73d140bd6f0a..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2006 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.07-r2.ebuild,v 1.3 2006/08/16 08:10:11 nichoj Exp $
-
-inherit java-vm-2 eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-S="${WORKDIR}/jdk${MY_PVL}"
-
-if use x86; then
-	At=jdk-${MY_PVA}-distro-linux-i586.bin
-elif use amd64; then
-	At=jdk-${MY_PVA}-distro-linux-amd64.bin
-fi
-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/jdk-${MY_PVA}-distro-linux-i586.bin )
-		amd64? ( http://download.java.net/dlj/binaries/jdk-${MY_PVA}-distro-linux-amd64.bin )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="~x86 ~amd64 -*"
-# Restrict stricter because of textrels
-RESTRICT="nostrip stricter"
-IUSE="X alsa doc examples jce nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-#
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	jce? ( =dev-java/sun-jce-bin-1.5.0* )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? ( || ( ( x11-libs/libICE
-				x11-libs/libSM
-		 		x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-#FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-#FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-#	if use jce; then
-#		if [ ! -r ${DISTDIR}/${jcefile} ]; then
-#			die "cannot read ${jcefile}. Please check the permission and try again."
-#		fi
-#	fi
-
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-		if ( use x86 || use amd64 ); then
-			cp -pPR sample ${D}/opt/${P}/share/
-		fi
-	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
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/sun-jce-bin-1.5.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
-
-	# 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}/jre/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 chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		local xwarn="virtual/x11 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
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild
deleted file mode 100644
index b22bb8864d67..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2006 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.07-r3.ebuild,v 1.2 2006/08/16 08:10:11 nichoj Exp $
-
-inherit java-vm-2 eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-S="${WORKDIR}/jdk${MY_PVL}"
-
-if use x86; then
-	At=jdk-${MY_PVA}-distro-linux-i586.bin
-elif use amd64; then
-	At=jdk-${MY_PVA}-distro-linux-amd64.bin
-fi
-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/jdk-${MY_PVA}-distro-linux-i586.bin )
-		amd64? ( http://download.java.net/dlj/binaries/jdk-${MY_PVA}-distro-linux-amd64.bin )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="~x86 ~amd64 -*"
-# Restrict stricter because of textrels
-RESTRICT="nostrip stricter"
-IUSE="X alsa doc examples jce nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-#
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	jce? ( =dev-java/sun-jce-bin-1.5.0* )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? ( || ( ( x11-libs/libICE
-				x11-libs/libSM
-		 		x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-#FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-#FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-#	if use jce; then
-#		if [ ! -r ${DISTDIR}/${jcefile} ]; then
-#			die "cannot read ${jcefile}. Please check the permission and try again."
-#		fi
-#	fi
-
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-		if ( use x86 || use amd64 ); then
-			cp -pPR sample ${D}/opt/${P}/share/
-		fi
-	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
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/sun-jce-bin-1.5.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
-
-	# 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}/jre/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 chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		local xwarn="virtual/x11 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
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild
deleted file mode 100644
index 53157560fafa..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2006 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.07.ebuild,v 1.4 2006/08/16 08:10:11 nichoj Exp $
-
-inherit java-vm-2 eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jdk-${MY_PVA}-linux-amd64.bin"
-x86file="jdk-${MY_PVA}-linux-i586.bin"
-
-jcefile="jce_policy-${MY_PVA%_*}.zip"
-
-if use x86; then
-	At=${x86file}
-elif use amd64; then
-	At=${amd64file}
-fi
-
-S="${WORKDIR}/jdk${MY_PVL}"
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )
-		jce? ( $jcefile )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 ~amd64 -*"
-# Restrict stricter because of textrels
-RESTRICT="fetch nostrip stricter"
-IUSE="X alsa doc examples nsplugin jce"
-
-JAVA_VM_NO_GENERATION1=true
-
-#
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed
-	jce? ( app-arch/unzip )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? ( || ( ( x11-libs/libICE
-				x11-libs/libSM
-		 		x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
-	local archtext=""
-
-	if use x86; then
-		archtext="Linux"
-	elif use amd64; then
-		archtext="Linux AMD64"
-	fi
-
-	einfo "Please download ${At} from:"
-	einfo "${FETCH_SDK}"
-	einfo "Select the ${archtext} self-extracting file"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		echo
-		einfo "Also download ${jcefile} from:"
-		einfo ${FETCH_JCE}
-		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
-		einfo "and move it to ${DISTDIR}"
-	fi
-
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jcefile} ]; then
-			die "cannot read ${jcefile}. Please check the permission and try again."
-		fi
-	fi
-
-	#Search for the ELF Header
-	testExp=`echo -e "\105\114\106"`
-	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}/bin/unpack200 ]; then
-		UNPACK_CMD=${S}/bin/unpack200
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		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
-		rm -f ${UNPACK_CMD}
-	else
-		die "unpack not found"
-	fi
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-		if ( use x86 || use amd64 ); then
-			cp -pPR sample ${D}/opt/${P}/share/
-		fi
-	fi
-
-	if use jce ; then
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce"
-		mv jce unlimited-jce
-		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
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/${P}/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
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java.desktop
-
-	domenu ${T}/sun_java.desktop
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		local xwarn="virtual/x11 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
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-}