Version cleanup.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64

8 files changed, 8 insertions, 903 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 76d6a70f303e..8a350f04cb6a 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.245 2008/10/17 21:40:55 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.246 2008/11/01 23:43:27 caster Exp $
+
+  01 Nov 2008; Vlastimil Babka <caster@gentoo.org> -sun-jdk-1.4.2.17.ebuild,
+  -sun-jdk-1.5.0.15.ebuild, -sun-jdk-1.5.0.15-r1.ebuild,
+  -sun-jdk-1.6.0.05.ebuild, -sun-jdk-1.6.0.05-r1.ebuild,
+  -sun-jdk-1.6.0.06.ebuild:
+  Version cleanup.
 
 *sun-jdk-1.6.0.10 (17 Oct 2008)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 83cb4c8b6ee5..d00eb603f511 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,42 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 AUX sun-jdk-1.4.env 976 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed SHA1 8cee6524044fc3bc1bde9c9ec02c420c52ec5499 SHA256 b57d36c5a24829add66fb92a8dd4d496e14ea792218c3515dab9573a55cfad49
 AUX sun-jdk-1.5.env 859 RMD160 657a54eebf4f8773204ca442e48845e163a67154 SHA1 59241ca2cf7f5b2c2f5dcc3d69accb43d8ffb419 SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585
 AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
-DIST j2sdk-1_4_2_17-linux-i586.bin 36376686 RMD160 8b79b4e0f356c0f263a6345a40a9a52d6165961f SHA1 79311406936549dfe4906650d11862c8cc9a8574 SHA256 3b18a101f1bc819acc00fb2d496bb61faa1d9a257ee562a4c6e460be2a1336e8
 DIST j2sdk-1_4_2_18-linux-i586.bin 36380053 RMD160 424ec3f66def593d7f54868edae63c6bbca82b8a SHA1 9d970845c84959a8d9ad6242be0e9ae867d8ea27 SHA256 f592a0af6c6b0fd22256bee91d68b11cfafe802901b747a29434c2c18e184f04
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
-DIST jdk-5.0u15-dlj-linux-amd64.bin 44048720 RMD160 624e7cd75c82891b54f7a3183ded297c30db6e48 SHA1 1b337999c9771dad78fc1cb171ffc34e6afd3cef SHA256 2a8aacdafd1da1d0a7fb15d536629cd6f2547309f13438a413bd31cd86ddb2fa
-DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c400832d08f8d SHA1 e52af3bc81f268d73a94772428d612769473834b SHA256 b4b340f86e3c8f3bb2f9fa1762f1c3f428cee1efc658c4fb8793f5cf299b2ad5
 DIST jdk-5.0u16-dlj-linux-amd64.bin 44052125 RMD160 d977cb6659b37653b1fc4159921f8a7d48cc2b80 SHA1 4e4f574a85c73c9f518e5ebf5cfd3135fa7fafaa SHA256 5c6c4b44b218c75de8e713a377b3662f791e77ebdf9a00bc76d63274d2e2d261
 DIST jdk-5.0u16-dlj-linux-i586.bin 49676902 RMD160 e358a1c3e554eb06cd4362ad175a95004661f38e SHA1 56e29e2d96fca31f6b0e34c208c13c82c523098d SHA256 0df21a7e636740c9812e3e1cd4002e914150acf3c806930d5128d05b37c28a08
 DIST jdk-6u10-dlj-linux-amd64.bin 72785631 RMD160 fa38bbcf970e75d0522e85d893635ccbaf23a218 SHA1 dd47b6afb2eed8253ab39d7b5a31fcff811cbca5 SHA256 c91bfe6759a9fe403a15b1fdc940ba7b04fd637a4f4ebb22a9d45f03159564e1
 DIST jdk-6u10-dlj-linux-i586.bin 80041857 RMD160 a280938fb2ff5208294b76afa9e8c8f459f64841 SHA1 f4dc9d497042c5196afb7ae75257de8614673ea6 SHA256 dae79e8c56090ac3fb4ac3fe0df9faf6a0c9694a89ef978dce0ab970557ad264
-DIST jdk-6u5-dlj-linux-amd64.bin 63756779 RMD160 ed4d9d72845fb15e7731582996b078b4449da1f6 SHA1 c0eac2aa33a0ad05fdeb960708cc270b2d330af5 SHA256 9a9b97ce5ac821f9a92541eb5e2353ddefd485eaa1b4f4de6b41fce8281831d4
-DIST jdk-6u5-dlj-linux-i586.bin 70537386 RMD160 bd1bd2a6601b7e972c9c5f3e1cce4ce7d408b055 SHA1 ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542 SHA256 b0f78f2e6baf88c1d7dc9334c6b86e621b2c9d629f5617f3f57a3bd7cbad0c99
-DIST jdk-6u6-dlj-linux-amd64.bin 63757892 RMD160 a28c5d8f9e43826d8e770a7755261ea153d82dac SHA1 f498cc49096278fe440caa586593268eb26461bb SHA256 f9e80c53e15d8faf0d3381e2e2540bade4c5f849ff72984a2ed34e3208f0b7ea
-DIST jdk-6u6-dlj-linux-i586.bin 70547201 RMD160 a24417210333fd7f16ee844c010f27d1460b1064 SHA1 a14c3003425b99ca2b89ebf7a82a8a33b0139894 SHA256 35ad958d88ed2af892c3879c815988bfae7775dd484e920186d1f8ad02a2c076
 DIST jdk-6u7-dlj-linux-amd64.bin 71703415 RMD160 22c910c68c78ca68143b8c5444b6d4b24ef3edc1 SHA1 dd2769bda4be1387e22bfe7d04e2dcc9d593fe5c SHA256 b8adc4ea7ae90aed08e9b981ac3a9f1160fc94965a5034e2ea7e63b0ba77a725
 DIST jdk-6u7-dlj-linux-i586.bin 78515200 RMD160 1c626fa6a16be412f082bdadcb4c3018bd0e188d SHA1 1a697ed721260331918fa34913203c78562d1d63 SHA256 b57a1f49ca3c9d3dd45b3fc2ab569d84d159a076124e842a9c8d82abce92ff8b
-EBUILD sun-jdk-1.4.2.17.ebuild 5335 RMD160 749c9b095a47b44f057d0f770845b166ecad760f SHA1 9582b88208a87e53729281af497e3436ee4cb61c SHA256 76214dd60a4ebf8b46368c032dee6dcd51e524c50ee2790279c0c796b2226b64
 EBUILD sun-jdk-1.4.2.18.ebuild 5184 RMD160 171c0a4e7aab36eb314f398ec278154ea1f8f070 SHA1 efb4dcafa46af82920f7229728f20a1f32a5281e SHA256 4bb32c98c3ef7ead70eee495575808b4680f7f1ef37ed0fce089386545115967
-EBUILD sun-jdk-1.5.0.15-r1.ebuild 4472 RMD160 f58a4d3f96aae04742e74885197a14ec92e66296 SHA1 9466c324c09f010dac38ee6dfeb48112defdd6c6 SHA256 c40ac22c7eb531d695a58d8583d4bfdb239c86947fd33848b7d9c2c46cab1bb3
-EBUILD sun-jdk-1.5.0.15.ebuild 4266 RMD160 18b3f5f3ba7bde42af3521489d567b0063ce3dd7 SHA1 416b0bd6f2cb5896c04a11a0ee304454fe115a3e SHA256 d5d9dd93d3c121ee71642542bb4ee84f16b01d08cdbd27d265b5eeea62649476
 EBUILD sun-jdk-1.5.0.16.ebuild 4465 RMD160 0566c2220e5efa619b934f28edbaefb8a7a304c7 SHA1 760f83f7112b70c87b25da4a814e0f9b1d329346 SHA256 ee7dea802a8031a5a1bf1a3a3881e9b753c464880d71aaf32c14fe71a8ed1d40
-EBUILD sun-jdk-1.6.0.05-r1.ebuild 4822 RMD160 b92baf2e6d802a17344e8d4c62a701f290373ab3 SHA1 d769056c7de14c94322ccca720ef2bee845b8254 SHA256 de62d7b34189185184e8c250783fa2fa99e6453f216116e03d3779b04dd1c210
-EBUILD sun-jdk-1.6.0.05.ebuild 4568 RMD160 ccab3316dc2dc2ab71d6db2836ecf5e6decea575 SHA1 db84a0fa9797237f676a58b1a8de811085ac2b65 SHA256 7793bee9d5fdadf262632a5142153141435d3402990aa7398e567c5c5e117956
-EBUILD sun-jdk-1.6.0.06.ebuild 4283 RMD160 b5f905d0b3e94de676fab7f1ba37d9fa7dc61cd3 SHA1 f711c4219d3709b5495e2c6b41ae7c2217e73ad4 SHA256 926f1eb1b66e620e8cbef68054b08a2a1dbc605434a4a83d06af1480424830e1
 EBUILD sun-jdk-1.6.0.07-r1.ebuild 4259 RMD160 c12c32cb5789ac05d3901e25eb81a7f5d9a1db4f SHA1 c1e5e7700f6a2d33c8df800f4e71561f9f9151f4 SHA256 9f0d37a4a9432c1a6c984d61917b09215db3b9d018c9ad402bcbbb9b1b0b1fc0
 EBUILD sun-jdk-1.6.0.07.ebuild 4282 RMD160 6893667750d098f6d2789596fd42e38403c807c9 SHA1 a8a6adf1927504f1cfb9ac72132656ffc5ec4b88 SHA256 49a8c73aa7a658d90402f0afee9b00bd39c0c44b5bf7ab6ecfae46cd78a50377
 EBUILD sun-jdk-1.6.0.10.ebuild 4660 RMD160 bb7db930287fede174ec073d77efdec027d210cb SHA1 c4006c2285fc82db6df5b6b80cd3c0f7dd138ddd SHA256 b2b776f2815a60d23278815784c47eff2da99643f3cdfc9dfe32cf3923bb70b2
-MISC ChangeLog 46467 RMD160 42d7b3d10ff0955c2e38190524133c7bafdc081a SHA1 7faf3c8503bccf6d6298873b2109ebed02183ac5 SHA256 58ad018c38f5f879ce94bd09bfa12d72e492442054085969a3cbea10366ebddc
+MISC ChangeLog 46706 RMD160 3d00ccd4addd90023d547873ca1d9212335b6551 SHA1 cd7b4e55de3ebdc68cc89b1bed0676911a764e18 SHA256 1e7420bcaabac9dda080e6301b1b82675c64b44d0909d3c43b2499eaf4556691
 MISC metadata.xml 352 RMD160 ca3d9b5f1a29c794d25667b59fb8dd6d18959c85 SHA1 daec179189ca09e38ffab061bb9f7c0c1766f09a SHA256 2e33901e40dedf73f59b2779ae2fe5d995a6a03cafb7944a6c067555222cae4c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkj5BnkACgkQRh6X64ivZaL34QCgg58JkEtg4ufYyI/Mo7dFsYUY
-eF8AnA9ys0MlwdS5uCoqza/dj7/PTzQ+
-=flCn
------END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.17.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.17.ebuild
deleted file mode 100644
index 0d0431f2092f..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.17.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.17.ebuild,v 1.3 2008/05/17 18:06:49 betelgeuse Exp $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit pax-utils java-vm-2 eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PN=j2sdk
-MY_P=${MY_PN}${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="x86? ( ${At} )
-		jce? ( ${jce_policy} )"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86"
-# files are prestripped
-RESTRICT="fetch strip"
-IUSE="X alsa doc examples jce nsplugin odbc"
-
-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/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-JAVA_PROVIDE="jdbc-stdext"
-
-DL_PREFIX="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef="
-DOWNLOAD_URL="${DL_PREFIX}${MY_PN}-${MY_PV}-oth-JPR@CDS-CDS_Developer"
-DOWNLOAD_URL_JCE="${DL_PREFIX}7503-jce-1.4.2-oth-JPR@CDS-CDS_Developer"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so
-	opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so
-	opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
-	opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(first select 'Accept License', then click on 'self-extracting file'"
-	einfo "under 'Linux Platform - Java(TM) 2 SDK, Standard Edition')"
-	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}. 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 '\0177\0105\0114\0106\0001\0001\0001')
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} "${DISTDIR}/${At}" > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [[ -f ${S}/lib/unpack ]]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		local PACKED_JARS="lib/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"
-		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}
-
-	cp -dPR ${dirs} "${D}/opt/${P}/"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*)
-
-	dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
-	dohtml README.html || die
-	if use examples; then
-		cp -pPR demo "${D}/opt/${P}/" || die
-	fi
-
-	cp -pPR src.zip "${D}/opt/${P}/" || die
-
-	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" || die
-		mv "${D}/opt/${P}/jre/lib/security/local_policy.jar" \
-			"${D}/opt/${P}/jre/lib/security/strong-jce" || die
-		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
-
-	# bug #147259
-	dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
-	dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
-
-	# 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
-	java-vm_revdep-mask
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild
deleted file mode 100644
index 5853cae8b6ed..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v 1.3 2008/03/30 23:57:25 robbat2 Exp $
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version 1.5"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-IUSE="X alsa doc examples jce nsplugin odbc"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
-
-DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? (
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXtst
-			x11-libs/libXt
-			x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-src_unpack() {
-	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This needs to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	# see bug #207282
-	if use x86; then
-		einfo "Creating the Class Data Sharing archives"
-		"${S}"/bin/java -client -Xshare:dump || die
-	fi
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT README.html || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo "${D}/opt/${P}/" || die
-		cp -pPR sample "${D}/opt/${P}/" || die
-	fi
-
-	if use jce; then
-		cd "${D}"/opt/${P}/jre/lib/security || die
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
-		dosym ${jcedir}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-		dosym ${jcedir}/local_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-	fi
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	# install control panel for Gnome/KDE
-	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-			-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			"${T}"/sun_java-${SLOT}.desktop \
-			|| die "Failed to sed .desktop file"
-
-		domenu "${T}"/sun_java-${SLOT}.desktop
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-	elog "The epoll-based implementation of SelectorProvider is not selected by"
-	elog "default."
-	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-	elog ""
-	elog "Starting with 1.5.0.12 the src.zip and demos are installed to the standard"
-	elog "locations."
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
-	elog "http://java.sun.com/j2se/1.5.0/docs/tooldocs/linux/jdkfiles.html"
-	elog "for more details."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.15.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.15.ebuild
deleted file mode 100644
index 994f7fc8194d..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.15.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15.ebuild,v 1.3 2008/03/27 19:28:21 maekke Exp $
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version 1.5"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="amd64 x86"
-RESTRICT="strip"
-IUSE="X alsa doc examples jce nsplugin odbc"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
-
-DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	X? (
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXtst
-			x11-libs/libXt
-			x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-src_unpack() {
-	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT README.html || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo "${D}/opt/${P}/" || die
-		cp -pPR sample "${D}/opt/${P}/" || die
-	fi
-
-	if use jce; then
-		cd "${D}"/opt/${P}/jre/lib/security || die
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
-		dosym ${jcedir}/US_export_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-		dosym ${jcedir}/local_policy.jar \
-			/opt/${P}/jre/lib/security/ || die
-	fi
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	# install control panel for Gnome/KDE
-	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-			-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			"${T}"/sun_java-${SLOT}.desktop \
-			|| die "Failed to sed .desktop file"
-
-		domenu "${T}"/sun_java-${SLOT}.desktop
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-	elog "The epoll-based implementation of SelectorProvider is not selected by"
-	elog "default."
-	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-	elog ""
-	elog "Starting with 1.5.0.12 the src.zip and demos are installed to the standard"
-	elog "locations."
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
-	elog "http://java.sun.com/j2se/1.5.0/docs/tooldocs/linux/jdkfiles.html"
-	elog "for more details."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild
deleted file mode 100644
index 718d99552eb0..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v 1.3 2008/03/29 08:11:04 mr_bones_ Exp $
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-URL_BASE="http://download.java.net/dlj/binaries"
-SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
-		amd64? ( ${URL_BASE}/${AMD64_AT} )"
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-IUSE="X alsa doc examples jce nsplugin odbc"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
-	opt/${P}/jre/lib/i386/libdeploy.so
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-
-DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
-RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	x86? ( =virtual/libstdc++-3.3 )
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXtst
-			amd64? ( x11-libs/libXt )
-			x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This needs to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	# see bug #207282
-	if use x86; then
-		einfo "Creating the Class Data Sharing archives"
-		"${S}"/bin/java -client -Xshare:dump || die
-		"${S}"/bin/java -server -Xshare:dump || die
-	fi
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	dodir /opt/${P}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo sample "${D}/opt/${P}/" || die
-	fi
-
-	if use jce; then
-		cd "${D}/opt/${P}/jre/lib/security"
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			"${T}"/sun_jdk-${SLOT}.desktop
-
-		domenu "${T}"/sun_jdk-${SLOT}.desktop
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-	elog "The epoll-based implementation of SelectorProvider is not selected by"
-	elog "default."
-	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-	elog ""
-	elog "Starting with 1.6.0-r2 the src.zip is installed to the standard"
-	elog "location. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
-	elog "http://java.sun.com/javase/6/docs/technotes/tools/linux/jdkfiles.html"
-	elog "for more details."
-	elog ""
-	elog "Starting with 1.6.0.01 demo and sample directories have been moved"
-	elog "to top level from the share sub directory."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.05.ebuild
deleted file mode 100644
index 99203cb5f2ca..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.05.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05.ebuild,v 1.3 2008/03/27 19:28:21 maekke Exp $
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-URL_BASE="http://download.java.net/dlj/binaries"
-SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
-		amd64? ( ${URL_BASE}/${AMD64_AT} )"
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="amd64 x86"
-RESTRICT="strip"
-IUSE="X alsa doc examples jce nsplugin odbc"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
-	opt/${P}/jre/lib/i386/libdeploy.so
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-
-DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
-RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	x86? ( =virtual/libstdc++-3.3 )
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXtst
-			amd64? ( x11-libs/libXt )
-			x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	dodir /opt/${P}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo sample "${D}/opt/${P}/" || die
-	fi
-
-	if use jce; then
-		cd "${D}/opt/${P}/jre/lib/security"
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			"${T}"/sun_jdk-${SLOT}.desktop
-
-		domenu "${T}"/sun_jdk-${SLOT}.desktop
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
-	elog "The epoll-based implementation of SelectorProvider is not selected by"
-	elog "default."
-	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
-	elog ""
-	elog "Starting with 1.6.0-r2 the src.zip is installed to the standard"
-	elog "location. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
-	elog "http://java.sun.com/javase/6/docs/technotes/tools/linux/jdkfiles.html"
-	elog "for more details."
-	elog ""
-	elog "Starting with 1.6.0.01 demo and sample directories have been moved"
-	elog "to top level from the share sub directory."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.06.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.06.ebuild
deleted file mode 100644
index 17065d1c1150..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.06.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.06.ebuild,v 1.3 2008/05/22 20:34:05 maekke Exp $
-
-inherit versionator java-vm-2 eutils pax-utils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-URL_BASE="http://download.java.net/dlj/binaries"
-SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
-		amd64? ( ${URL_BASE}/${AMD64_AT} )"
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="amd64 x86"
-RESTRICT="strip"
-IUSE="X alsa doc examples jce nsplugin odbc"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
-	opt/${P}/jre/lib/i386/libdeploy.so
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
-
-DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
-RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	x86? ( =virtual/libstdc++-3.3 )
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXp
-			x11-libs/libXtst
-			amd64? ( x11-libs/libXt )
-			x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This needs to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
-
-	# see bug #207282
-	if use x86; then
-		einfo "Creating the Class Data Sharing archives"
-		"${S}"/bin/java -client -Xshare:dump || die
-		"${S}"/bin/java -server -Xshare:dump || die
-	fi
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-
-	dodir /opt/${P}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-	dodoc COPYRIGHT || die
-	dohtml README.html || die
-
-	cp -pP src.zip "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR demo sample "${D}/opt/${P}/" || die
-	fi
-
-	if use jce; then
-		cd "${D}/opt/${P}/jre/lib/security"
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \
-			"${D}"/opt/${P}/jre/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			"${T}"/sun_jdk-${SLOT}.desktop
-
-		domenu "${T}"/sun_jdk-${SLOT}.desktop
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/jre/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	elog "Please reinstall eclipse-sdk if you have it installed and want"
-	elog "workaround for bug #215150."
-}