Removed old versions/revisions.

Package-Manager: portage-2.1_pre5-r4

12 files changed, 10 insertions, 1104 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 9ee8d478e6ce..8a410148ae8f 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.142 2006/02/08 21:43:58 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.143 2006/03/12 08:44:56 betelgeuse Exp $
+
+  12 Mar 2006; Petteri Räty <betelgeuse@gentoo.org>
+  -sun-jdk-1.3.1.16.ebuild, -sun-jdk-1.4.2.10.ebuild,
+  -sun-jdk-1.4.2.10-r1.ebuild, -sun-jdk-1.5.0.06.ebuild,
+  -sun-jdk-1.5.0.06-r1.ebuild:
+  Removed old versions/revisions.
 
   08 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   sun-jdk-1.3.1.17.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index c9f2b958cc80..cf951c4d76b3 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,30 +1,15 @@
-MD5 ce5db6cbb9c6eb5d2b78619a743930e5 ChangeLog 28912
-RMD160 4fa99d84a756cefc5270096f43d38ba97ef88068 ChangeLog 28912
-SHA256 e947c720b6aa95d00934682bf74b5b5ef6d1d776eb400453fc365e63ef168dea ChangeLog 28912
+MD5 ccb781752eacedb86bcf15b968cf5e72 ChangeLog 29144
+RMD160 86e9701339a7d2feb69ce3aefa707d289d90dc0e ChangeLog 29144
+SHA256 cceed42a44c479139415462047303bb3ab52567b105cd801a4cbf8c98ef68ff5 ChangeLog 29144
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
 RMD160 e3f6ac5817a4908a5d22eef2a71dbcdc8c4a6378 files/digest-sun-jdk-1.2.2.017 78
 SHA256 b3f73173a7dfbf7dc57b1b87aa7a79dd353d2273e741879a7e6a3c5624cf4f80 files/digest-sun-jdk-1.2.2.017 78
-MD5 7339eea38c2cfdfdc4cd777a02c4cbc1 files/digest-sun-jdk-1.3.1.16 76
-RMD160 5bbdcbbcec1f5a38ffe7d5eeb9bc9c4505dafead files/digest-sun-jdk-1.3.1.16 76
-SHA256 eabe51443b3424d0839833d69fd7fc708a6d8a118a4ad89377f4e48ba42133de files/digest-sun-jdk-1.3.1.16 76
 MD5 368b26d168ecbf956f69a0ebe8780433 files/digest-sun-jdk-1.3.1.17 76
 RMD160 ae0491107cdb166da8f7ff463901db2d2c98887c files/digest-sun-jdk-1.3.1.17 76
 SHA256 1e6085a2a1214835fafa501f2ea8e28ff4efd92bafafa78919a50cc105003c2d files/digest-sun-jdk-1.3.1.17 76
-MD5 26916b6de74c3d0ffd1eb22f64073ead files/digest-sun-jdk-1.4.2.10 140
-RMD160 36d2912e52b33809377b9b21d94ec55c1774e883 files/digest-sun-jdk-1.4.2.10 140
-SHA256 cceb7ed54dd07ca824c46abd21456c72e7e40e595db7c09fe4818d2aab26cf92 files/digest-sun-jdk-1.4.2.10 140
-MD5 26916b6de74c3d0ffd1eb22f64073ead files/digest-sun-jdk-1.4.2.10-r1 140
-RMD160 36d2912e52b33809377b9b21d94ec55c1774e883 files/digest-sun-jdk-1.4.2.10-r1 140
-SHA256 cceb7ed54dd07ca824c46abd21456c72e7e40e595db7c09fe4818d2aab26cf92 files/digest-sun-jdk-1.4.2.10-r1 140
 MD5 26916b6de74c3d0ffd1eb22f64073ead files/digest-sun-jdk-1.4.2.10-r2 140
 RMD160 36d2912e52b33809377b9b21d94ec55c1774e883 files/digest-sun-jdk-1.4.2.10-r2 140
 SHA256 cceb7ed54dd07ca824c46abd21456c72e7e40e595db7c09fe4818d2aab26cf92 files/digest-sun-jdk-1.4.2.10-r2 140
-MD5 7aea6ff8bf86dffb57bf2427771e6ad7 files/digest-sun-jdk-1.5.0.06 212
-RMD160 0c27253cb123a49bed2bd27d7a2f0d839f44f4c4 files/digest-sun-jdk-1.5.0.06 212
-SHA256 f2abb96a6c00653b090e123c2810d509078f113711408ab98aee72ea5874513e files/digest-sun-jdk-1.5.0.06 212
-MD5 7aea6ff8bf86dffb57bf2427771e6ad7 files/digest-sun-jdk-1.5.0.06-r1 212
-RMD160 0c27253cb123a49bed2bd27d7a2f0d839f44f4c4 files/digest-sun-jdk-1.5.0.06-r1 212
-SHA256 f2abb96a6c00653b090e123c2810d509078f113711408ab98aee72ea5874513e files/digest-sun-jdk-1.5.0.06-r1 212
 MD5 7aea6ff8bf86dffb57bf2427771e6ad7 files/digest-sun-jdk-1.5.0.06-r2 212
 RMD160 0c27253cb123a49bed2bd27d7a2f0d839f44f4c4 files/digest-sun-jdk-1.5.0.06-r2 212
 SHA256 f2abb96a6c00653b090e123c2810d509078f113711408ab98aee72ea5874513e files/digest-sun-jdk-1.5.0.06-r2 212
@@ -49,27 +34,12 @@ SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3 metadata
 MD5 39452115ebdd308345906ebc969a76d1 sun-jdk-1.2.2.017.ebuild 2879
 RMD160 aa3f2076e0bd3c748b691fd9c69208a53ccb851e sun-jdk-1.2.2.017.ebuild 2879
 SHA256 f8a4ced84c08c8fafb97388c510cccfcca56489a1c1edb31fbb10243c4ec1f2d sun-jdk-1.2.2.017.ebuild 2879
-MD5 6f76383f3361478b86f7d7032f9822d7 sun-jdk-1.3.1.16.ebuild 4126
-RMD160 b5136fbcd2fc7dac6fb9a6b8ad4dffe0f522b13c sun-jdk-1.3.1.16.ebuild 4126
-SHA256 0e8916a34605e6c41197a79953ecbf1e4d918caa47724fb93dc178f3d3792916 sun-jdk-1.3.1.16.ebuild 4126
 MD5 a34d788b056fd20f2e55e300ec098f90 sun-jdk-1.3.1.17.ebuild 4737
 RMD160 642569e0b08e8f74c7fb264a5e7a8983785b16b6 sun-jdk-1.3.1.17.ebuild 4737
 SHA256 49d5ddecc8f0f4aa5ed16ed27b37669b21cd7807719dcb366356e1c868e3a7d1 sun-jdk-1.3.1.17.ebuild 4737
-MD5 4ed0dc64210fc3927731ca6a0ce3e224 sun-jdk-1.4.2.10-r1.ebuild 6814
-RMD160 4761c334e72fa90d823ddac99d9cbda101fe47a0 sun-jdk-1.4.2.10-r1.ebuild 6814
-SHA256 567327833e253df892635fa2443ac1560ffc0845ce94a3d684044e20fe7ad1c4 sun-jdk-1.4.2.10-r1.ebuild 6814
 MD5 ef9bae43cb061f10fe8d5cb5e9ac3706 sun-jdk-1.4.2.10-r2.ebuild 6847
 RMD160 79116d8b324705112cb7a30519ba9e32cda94476 sun-jdk-1.4.2.10-r2.ebuild 6847
 SHA256 905df1b6779adfaad518559545bab73a25a5d4dccabb7fbd203a0758bbe48d57 sun-jdk-1.4.2.10-r2.ebuild 6847
-MD5 47eafb375022c44b07bd4502a8a864cb sun-jdk-1.4.2.10.ebuild 6754
-RMD160 dcb7e5a0c828508bc205452505d60fb32b5dbece sun-jdk-1.4.2.10.ebuild 6754
-SHA256 7375e2ca7e55957e79478374830db8f0ebd8ed0e6912fe8f961fcc602efa678b sun-jdk-1.4.2.10.ebuild 6754
-MD5 864a4c2012fd37e1e1573c480c2d08eb sun-jdk-1.5.0.06-r1.ebuild 7636
-RMD160 5934c87b7254621ea45f1e01bb1bc8aee4c8e6bb sun-jdk-1.5.0.06-r1.ebuild 7636
-SHA256 ce9aa45b4946b9b2ef28ad00faba755525dc173c513186424a00118edffcc876 sun-jdk-1.5.0.06-r1.ebuild 7636
 MD5 e6f4c198fdd735b6644e7211970a949f sun-jdk-1.5.0.06-r2.ebuild 7670
 RMD160 6164aee16796f405c9813bff390211d868147d0d sun-jdk-1.5.0.06-r2.ebuild 7670
 SHA256 307906b451a7a8d48fec1b184fb1cf90fb6eacc8ec5c36dfc8422b650d45d9b5 sun-jdk-1.5.0.06-r2.ebuild 7670
-MD5 914189f67a8bb87ef03f86b327565548 sun-jdk-1.5.0.06.ebuild 7577
-RMD160 ea26b9d592f2eaa7f808eb22788c5acd4e06d018 sun-jdk-1.5.0.06.ebuild 7577
-SHA256 9560096418c0b9260edbdb9e206719f7848e90cea939c15b60bc0243b267969b sun-jdk-1.5.0.06.ebuild 7577
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.16 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.16
deleted file mode 100644
index f3ce49ea75e3..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a90ca5f7a48277af5750a6c21cdd0c12 j2sdk-1_3_1_16-linux-i586.bin 26660278
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10
deleted file mode 100644
index 8a63154ee56f..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c565e255b183e2284415238369108c11 j2sdk-1_4_2_10-linux-i586.bin 36446523
-MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10-r1
deleted file mode 100644
index 8a63154ee56f..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.10-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c565e255b183e2284415238369108c11 j2sdk-1_4_2_10-linux-i586.bin 36446523
-MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06
deleted file mode 100644
index f7265bbfa7d7..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
-MD5 27adf9c276e1ec824a3946ef9fe022a4 jdk-1_5_0_06-linux-amd64.bin 43681923
-MD5 3cdad4a383b93680f02f6f06198c2227 jdk-1_5_0_06-linux-i586.bin 48974825
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06-r1
deleted file mode 100644
index f7265bbfa7d7..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
-MD5 27adf9c276e1ec824a3946ef9fe022a4 jdk-1_5_0_06-linux-amd64.bin 43681923
-MD5 3cdad4a383b93680f02f6f06198c2227 jdk-1_5_0_06-linux-i586.bin 48974825
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.16.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.16.ebuild
deleted file mode 100644
index 1683c5c4ba6b..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.16.ebuild
+++ /dev/null
@@ -1,135 +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.3.1.16.ebuild,v 1.5 2006/01/14 22:50:36 nichoj Exp $
-
-inherit java eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_P=jdk${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="${At}"
-DESCRIPTION="Sun Java Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.3/"
-DEPEND="virtual/libc
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="sys-libs/lib-compat"
-PROVIDE="virtual/jre
-	virtual/jdk"
-LICENSE="sun-bcla-java-vm"
-SLOT="1.3"
-KEYWORDS="x86 -*"
-RESTRICT="fetch stricter"
-
-IUSE="doc browserplugin nsplugin mozilla"
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-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}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\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
-	rm install.sfx
-
-	sed "s/head -1/head -n 1/" -i ${MY_P}/bin/.java_wrapper
-}
-
-src_install() {
-	local dirs="bin include include-old jre lib man"
-	dodir /opt/${P}
-
-	for i in ${dirs} ; do
-		if [ "${i}" == "bin" ] ; then
-			dodir /opt/${P}/${i}
-			cp -dPR ${i}/.java_wrapper ${D}/opt/${P}/bin/
-			cp -dPR ${i}/* ${D}/opt/${P}/bin/
-		elif [ "${i}" == "jre" ] ; then
-			dodir /opt/${P}/${i}
-			dodir /opt/${P}/${i}/bin
-			cp -dPR ${i}/bin/.java_wrapper ${D}/opt/${P}/${i}/bin/
-			cp -dPR ${i}/bin/* ${D}/opt/${P}/${i}/bin/
-			cp -dPR	${i}/CHANGES \
-				${i}/COPYRIGHT \
-				${i}/ControlPanel.html \
-				${i}/LICENSE \
-				${i}/README \
-				${i}/Welcome.html \
-				${i}/lib \
-				${i}/plugin \
-				${D}/opt/${P}/${i}/
-		else
-			cp -dPR ${i} ${D}/opt/${P}/
-		fi
-	done
-
-	dodoc COPYRIGHT README LICENSE
-	dohtml README.html
-
-	dodir /opt/${P}/share/
-	cp -a demo src.jar ${D}/opt/${P}/share/
-
-	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
-		install_mozilla_plugin  /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so
-	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	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
-
-	# 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.3.1.09/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
-
-	echo
-	eerror "Some parts of Sun's JDK require X11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.10-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.10-r1.ebuild
deleted file mode 100644
index 0e4a0382f28d..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.10-r1.ebuild
+++ /dev/null
@@ -1,211 +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-r1.ebuild,v 1.2 2006/01/16 19:23:19 nichoj 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
-			)
-		)"
-
-PROVIDE="virtual/jre virtual/jdk"
-
-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}
-}
-
-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
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	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.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild
deleted file mode 100644
index 3b9dcaa13e85..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild
+++ /dev/null
@@ -1,209 +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.ebuild,v 1.8 2006/01/14 22:50:36 nichoj 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
-			)
-		)"
-
-PROVIDE="virtual/jre virtual/jdk"
-
-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
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-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
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	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.5.0.06-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.06-r1.ebuild
deleted file mode 100644
index 766cffe90ca8..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.06-r1.ebuild
+++ /dev/null
@@ -1,253 +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.06-r1.ebuild,v 1.1 2006/01/16 04:35:39 nichoj Exp $
-
-inherit java 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="fetch nostrip stricter"
-IUSE="X alsa doc browserplugin nsplugin jce mozilla examples"
-
-#
-DEPEND="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
-			)
-		)"
-
-PROVIDE="virtual/jre
-	virtual/jdk"
-
-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() {
-	dodir /opt/${P}
-
-	for i in bin include jre lib man; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy ${i}"
-	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 ||       # 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="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}/.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}
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/jre
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# 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/$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
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
-	eerror "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."
-
-	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.5.0.06.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild
deleted file mode 100644
index c65036fca057..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild
+++ /dev/null
@@ -1,251 +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.06.ebuild,v 1.4 2006/01/14 22:50:36 nichoj Exp $
-
-inherit java 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="fetch nostrip stricter"
-IUSE="X alsa doc browserplugin nsplugin jce mozilla examples"
-
-#
-DEPEND="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
-			)
-		)"
-
-PROVIDE="virtual/jre
-	virtual/jdk"
-
-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() {
-	dodir /opt/${P}
-
-	for i in bin include jre lib man; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy ${i}"
-	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 ||       # 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="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}/.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
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/jre
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# 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/$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
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
-	eerror "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."
-
-	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
-}