Pruned old revisions, as well as stray files.

Package-Manager: portage-2.1.2_pre2-r6

11 files changed, 4 insertions, 706 deletions

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 5085167cf689..88d08c04717f 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,19 +1,3 @@
-AUX sun-jdk-1.2.2.017 328 RMD160 04f2f2980bb5ac087db70b799a543e6c74ac626c SHA1 920a422724ee82ff5b9471758f45a8f54cf63136 SHA256 3ac05aa50383cafd10dfa7dce4d2a6a287f5bc6afbe8a1f1b03a4d56f5610686
-MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
-RMD160 04f2f2980bb5ac087db70b799a543e6c74ac626c files/sun-jdk-1.2.2.017 328
-SHA256 3ac05aa50383cafd10dfa7dce4d2a6a287f5bc6afbe8a1f1b03a4d56f5610686 files/sun-jdk-1.2.2.017 328
-AUX sun-jdk-1.3.1.17 477 RMD160 0609a3190984cfc8c0329d314dab38c001038e22 SHA1 3caa814662bb561fa90252ee42404cc5ea53937e SHA256 b2ac2dde24e7a832706c8e36cff99c457dcc8d9074b71332933ccebe7df89577
-MD5 89f904e0a2b09062701aec14bcf95e7b files/sun-jdk-1.3.1.17 477
-RMD160 0609a3190984cfc8c0329d314dab38c001038e22 files/sun-jdk-1.3.1.17 477
-SHA256 b2ac2dde24e7a832706c8e36cff99c457dcc8d9074b71332933ccebe7df89577 files/sun-jdk-1.3.1.17 477
-AUX sun-jdk-1.3.env 737 RMD160 2a9a3b8753002ab2f78985fc9809da9c0c8fd55f SHA1 c2bed59f9554a7f9e1c1a9d11f8a694dd0fa886e SHA256 78028d9fceeba0e56e1b41cc1e881a2e523a8e80000597c1401783a51fe2a586
-MD5 dfef08b7fb38613365dcc8b89226d1c2 files/sun-jdk-1.3.env 737
-RMD160 2a9a3b8753002ab2f78985fc9809da9c0c8fd55f files/sun-jdk-1.3.env 737
-SHA256 78028d9fceeba0e56e1b41cc1e881a2e523a8e80000597c1401783a51fe2a586 files/sun-jdk-1.3.env 737
-AUX sun-jdk-1.4.2.10 641 RMD160 125f58b7c4a7d8621fd9b64c0621211abd420ca3 SHA1 15b7fc7a988d0cd55467db6b1f9509538a92953c SHA256 76b1a2084900195dcefc01543cf76ae967d76d8c9c91235d461a74e541e8824e
-MD5 21678499cc30ec46c9b4dba27098fa5b files/sun-jdk-1.4.2.10 641
-RMD160 125f58b7c4a7d8621fd9b64c0621211abd420ca3 files/sun-jdk-1.4.2.10 641
-SHA256 76b1a2084900195dcefc01543cf76ae967d76d8c9c91235d461a74e541e8824e files/sun-jdk-1.4.2.10 641
 AUX sun-jdk-1.4.env 976 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed SHA1 8cee6524044fc3bc1bde9c9ec02c420c52ec5499 SHA256 b57d36c5a24829add66fb92a8dd4d496e14ea792218c3515dab9573a55cfad49
 MD5 8131b935e43bde0b9015e691bd3b251a files/sun-jdk-1.4.env 976
 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed files/sun-jdk-1.4.env 976
@@ -22,48 +6,26 @@ AUX sun-jdk-1.5.env 925 RMD160 6042c2849330d0a7b7ef87f2680209a27707a370 SHA1 d93
 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
-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 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.4.2.10-r2.ebuild 6837 RMD160 34df484c28ba65310da371fd86e3529f5991aef7 SHA1 ef5aeb4171697a19195e91bac2c257682e56002a SHA256 00782b5d79982d32118667afdfccc02fe802fee016ae1f28d5a7b4eb207e2755
-MD5 c06729b2fa9df8291b94ba74c2fdf7a4 sun-jdk-1.4.2.10-r2.ebuild 6837
-RMD160 34df484c28ba65310da371fd86e3529f5991aef7 sun-jdk-1.4.2.10-r2.ebuild 6837
-SHA256 00782b5d79982d32118667afdfccc02fe802fee016ae1f28d5a7b4eb207e2755 sun-jdk-1.4.2.10-r2.ebuild 6837
-EBUILD sun-jdk-1.4.2.12-r1.ebuild 6019 RMD160 8d39632027ee35721efd88ee51c138e88019a839 SHA1 20aa84826896b8495b16b524c6a665d308a7e97b SHA256 bd0708422f5d1448bc4643d49aed3e404167f6290b8651ce1afdae4c9b6f5314
-MD5 2f2e76ee2b9e49157b5f9a1cbf95622b sun-jdk-1.4.2.12-r1.ebuild 6019
-RMD160 8d39632027ee35721efd88ee51c138e88019a839 sun-jdk-1.4.2.12-r1.ebuild 6019
-SHA256 bd0708422f5d1448bc4643d49aed3e404167f6290b8651ce1afdae4c9b6f5314 sun-jdk-1.4.2.12-r1.ebuild 6019
 EBUILD sun-jdk-1.4.2.12-r2.ebuild 6304 RMD160 80a1451d805a4325f0d492b9c60767fb6cbfe4c0 SHA1 f6be60f7313d6f2597e12238164212a7f151415c SHA256 8754e885cd111424ab60c7e2bdd8a14a8b5a415a7510fdf15e92c8c97e1a768c
 MD5 68060db9eef0a73f73428fec8f2dbc2c sun-jdk-1.4.2.12-r2.ebuild 6304
 RMD160 80a1451d805a4325f0d492b9c60767fb6cbfe4c0 sun-jdk-1.4.2.12-r2.ebuild 6304
 SHA256 8754e885cd111424ab60c7e2bdd8a14a8b5a415a7510fdf15e92c8c97e1a768c sun-jdk-1.4.2.12-r2.ebuild 6304
-EBUILD sun-jdk-1.4.2.12.ebuild 5973 RMD160 121771550611ec28143d71a7576b9256c12d131f SHA1 af91b9052c37a89fc1cd7ba005db81d562ded36a SHA256 6def3327a710b752fa7131ca537f234bc159d27ad9a5a4fd611628d7c094aa23
-MD5 96abb8d6aa5b0ad5da4cdecc8f782a1c sun-jdk-1.4.2.12.ebuild 5973
-RMD160 121771550611ec28143d71a7576b9256c12d131f sun-jdk-1.4.2.12.ebuild 5973
-SHA256 6def3327a710b752fa7131ca537f234bc159d27ad9a5a4fd611628d7c094aa23 sun-jdk-1.4.2.12.ebuild 5973
 EBUILD sun-jdk-1.5.0.08.ebuild 5585 RMD160 9a17e1ef27724f417ab53fc6bf3983784575ef93 SHA1 a3fd6db0d666dbe73a8a1d681267496f448bde0a SHA256 ca37bfd50f6fd2f2abb62b59735f4a7c743f9f5b0de8627f593b2871260f95bf
 MD5 ac5ac2cd6724e7ba0c1f887ff3e57c77 sun-jdk-1.5.0.08.ebuild 5585
 RMD160 9a17e1ef27724f417ab53fc6bf3983784575ef93 sun-jdk-1.5.0.08.ebuild 5585
 SHA256 ca37bfd50f6fd2f2abb62b59735f4a7c743f9f5b0de8627f593b2871260f95bf sun-jdk-1.5.0.08.ebuild 5585
-MISC ChangeLog 33001 RMD160 c8a37209d5c82bf931784238993f6a5fc4a8e5ed SHA1 c610a86caea9dc88da1364ef45f2f6987d6da575 SHA256 c77e98569e2559222641c53b1287d9a3441e97c9fbcf5d141d6fa81a485c278e
-MD5 9fef518c0c3f4078cc186bf2a21b6344 ChangeLog 33001
-RMD160 c8a37209d5c82bf931784238993f6a5fc4a8e5ed ChangeLog 33001
-SHA256 c77e98569e2559222641c53b1287d9a3441e97c9fbcf5d141d6fa81a485c278e ChangeLog 33001
+MISC ChangeLog 33290 RMD160 96e86311bd7ae6d46fa6528087507cd6077a5f2f SHA1 a7a0cff4e92536065d7c45cc45d6855befe1a689 SHA256 ce02bc6c84c15dad24d255632b85bca385671c9a7956b5547c6039c5ec483162
+MD5 5c1d4455a10a459e1b44e44404d22d1c ChangeLog 33290
+RMD160 96e86311bd7ae6d46fa6528087507cd6077a5f2f ChangeLog 33290
+SHA256 ce02bc6c84c15dad24d255632b85bca385671c9a7956b5547c6039c5ec483162 ChangeLog 33290
 MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239
 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3 metadata.xml 239
-MD5 f3c6393ae0a7058cb3a54964e77595ba files/digest-sun-jdk-1.4.2.10-r2 512
-RMD160 f068fb0982dbcf4d51a5ce6549f8a626f915db29 files/digest-sun-jdk-1.4.2.10-r2 512
-SHA256 71254adf5144bb3aa90fa60263e19c8a63f5cc536470d0084b9a26ee0a380eda files/digest-sun-jdk-1.4.2.10-r2 512
-MD5 5bec2db22a35d2dab4b65c6c5ac4a5ad files/digest-sun-jdk-1.4.2.12 512
-RMD160 84b4872443740be6f65e43bd92830b1a2f72eedd files/digest-sun-jdk-1.4.2.12 512
-SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/digest-sun-jdk-1.4.2.12 512
-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 5bec2db22a35d2dab4b65c6c5ac4a5ad files/digest-sun-jdk-1.4.2.12-r2 512
 RMD160 84b4872443740be6f65e43bd92830b1a2f72eedd files/digest-sun-jdk-1.4.2.12-r2 512
 SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/digest-sun-jdk-1.4.2.12-r2 512
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10-r2 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10-r2
deleted file mode 100644
index 0534b5199ba0..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c565e255b183e2284415238369108c11 j2sdk-1_4_2_10-linux-i586.bin 36446523
-RMD160 c7e65c19747d549a06530af9baba2ef0b52cb152 j2sdk-1_4_2_10-linux-i586.bin 36446523
-SHA256 193051a8b365325c3736838e580eafa036e82100f04ae12ffbe70f3cbf2173bc j2sdk-1_4_2_10-linux-i586.bin 36446523
-MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
-RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 jce_policy-1_4_2.zip 12195
-SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12
deleted file mode 100644
index b31a40f251e8..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 587a9fba08f1c0cfd2207c27abcbca5f j2sdk-1_4_2_12-linux-i586.bin 36337163
-RMD160 6b1499cf3bd46158293506b8a0d701ec52b78ef3 j2sdk-1_4_2_12-linux-i586.bin 36337163
-SHA256 ab7f5285993d71dc692625bed4d11557048ef3a4be6c51941c507cef26025531 j2sdk-1_4_2_12-linux-i586.bin 36337163
-MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
-RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 jce_policy-1_4_2.zip 12195
-SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12-r1
deleted file mode 100644
index b31a40f251e8..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 587a9fba08f1c0cfd2207c27abcbca5f j2sdk-1_4_2_12-linux-i586.bin 36337163
-RMD160 6b1499cf3bd46158293506b8a0d701ec52b78ef3 j2sdk-1_4_2_12-linux-i586.bin 36337163
-SHA256 ab7f5285993d71dc692625bed4d11557048ef3a4be6c51941c507cef26025531 j2sdk-1_4_2_12-linux-i586.bin 36337163
-MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
-RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 jce_policy-1_4_2.zip 12195
-SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.2.2.017 b/dev-java/sun-jdk/files/sun-jdk-1.2.2.017
deleted file mode 100644
index d92fe9e8488e..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.2.2.017
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.17 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.17
deleted file mode 100644
index f2fc442d8a72..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.17
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 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.3.1.17,v 1.1 2005/12/28 20:51:11 betelgeuse Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.env b/dev-java/sun-jdk/files/sun-jdk-1.3.env
deleted file mode 100644
index 5520846d8fac..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2004 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.3.env,v 1.1 2006/07/01 14:47:58 nichoj Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib"
-MANPATH="/opt/@P@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.3"
-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"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.2.10 b/dev-java/sun-jdk/files/sun-jdk-1.4.2.10
deleted file mode 100644
index 43d36a700c1b..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.2.10
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 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.4.2.10,v 1.2 2006/01/08 23:27:53 nichoj Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
-ADDLDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/client/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.10-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.10-r2.ebuild
deleted file mode 100644
index 7ac8040fbd30..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.10-r2.ebuild
+++ /dev/null
@@ -1,213 +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.4.2.10-r2.ebuild,v 1.3 2006/07/06 10:46:51 nelchael Exp $
-
-inherit java eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_P=j2sdk${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-jce_policy="jce_policy-${MY_PVB//./_}.zip"
-
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI="${At}
-		jce? ( ${jce_policy} )"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* x86"
-RESTRICT="fetch stricter"
-IUSE="X alsa doc browserplugin nsplugin jce mozilla examples"
-
-DEPEND="sys-apps/sed
-	app-arch/unzip"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )
-	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
-			)
-		)"
-
-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/javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemrsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting."
-	einfo "and move it to ${DISTDIR}"
-	if use jce; then
-		echo
-		einfo "Also download ${jce_policy} from:"
-		einfo ${DOWNLOAD_URL_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}.bin. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
-			die "cannot read ${jce_policy}. Please check the permission and try again."
-		fi
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	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
-		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 include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -PR $i ${D}/opt/${P}/
-	done
-
-	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml README.html
-	dodir /opt/${P}/share/
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-	fi
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use jce ; then
-		# Using unlimited jce while still retaining the strong jce
-		# May have repercussions when you find you cannot symlink libraries
-		# in classpaths.
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jce_policy}
-		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 ||		 # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then	 # wrong but used to honor it
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# 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
-
-	use !alsa && java_remove-libjsoundalsa /opt/${P}/jre/
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	fix-i386-dir /opt/${P}/jre/lib/
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	touch /opt/${P}/.systemPrefs/.system.lock
-	chmod 644 /opt/${P}/.systemPrefs/.system.lock
-	touch /opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	#Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# 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/sun-jdk-1.4.2.03/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
-		echo
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.	Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.12-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.12-r1.ebuild
deleted file mode 100644
index 75fdb74913e4..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.12-r1.ebuild
+++ /dev/null
@@ -1,192 +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.4.2.12-r1.ebuild,v 1.3 2006/09/28 02:23:38 nichoj Exp $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_P=j2sdk${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-jce_policy="jce_policy-${MY_PVB//./_}.zip"
-
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI="${At}
-		jce? ( ${jce_policy} )"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* ~x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples nsplugin jce"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )
-	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"
-
-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/javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemrsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting."
-	einfo "and move it to ${DISTDIR}"
-	if use jce; then
-		echo
-		einfo "Also download ${jce_policy} from:"
-		einfo ${DOWNLOAD_URL_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}.bin. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
-			die "cannot read ${jce_policy}. Please check the permission and try again."
-		fi
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	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
-		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 include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -dPR $i ${D}/opt/${P}/
-	done
-
-	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml README.html
-	dodir /opt/${P}/share/
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-	fi
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use jce ; then
-		# Using unlimited jce while still retaining the strong jce
-		# May have repercussions when you find you cannot symlink libraries
-		# in classpaths.
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jce_policy}
-		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="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch ${D}/opt/${P}/.systemPrefs/.system.lock
-	chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock
-	touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/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/sun-jdk-1.4.2.03/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
-		echo
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.12.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.12.ebuild
deleted file mode 100644
index 70e6165a41eb..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.12.ebuild
+++ /dev/null
@@ -1,191 +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.4.2.12.ebuild,v 1.4 2006/09/28 02:23:38 nichoj Exp $
-
-inherit java-vm-2 eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_P=j2sdk${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-jce_policy="jce_policy-${MY_PVB//./_}.zip"
-
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI="${At}
-		jce? ( ${jce_policy} )"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* ~x86"
-RESTRICT="fetch"
-IUSE="X alsa doc nsplugin jce"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )
-	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"
-
-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/javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemrsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting."
-	einfo "and move it to ${DISTDIR}"
-	if use jce; then
-		echo
-		einfo "Also download ${jce_policy} from:"
-		einfo ${DOWNLOAD_URL_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}.bin. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
-			die "cannot read ${jce_policy}. Please check the permission and try again."
-		fi
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	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
-		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 include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -dPR $i ${D}/opt/${P}/
-	done
-
-	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml README.html
-	dodir /opt/${P}/share/
-	if use examples; then
-		cp -pPR demo ${D}/opt/${P}/share/
-	fi
-	cp -pPR src.zip ${D}/opt/${P}/share/
-
-	if use jce ; then
-		# Using unlimited jce while still retaining the strong jce
-		# May have repercussions when you find you cannot symlink libraries
-		# in classpaths.
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jce_policy}
-		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="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch ${D}/opt/${P}/.systemPrefs/.system.lock
-	chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock
-	touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/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/sun-jdk-1.4.2.03/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
-		echo
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-}