Remove old versions.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo i686

7 files changed, 12 insertions, 755 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 1cb14ea1af23..6855728573db 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.250 2008/12/10 22:04:25 maekke Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.251 2009/01/15 12:16:39 betelgeuse Exp $
+
+  15 Jan 2009; Petteri Räty <betelgeuse@gentoo.org>
+  -sun-jdk-1.4.2.18.ebuild, -sun-jdk-1.5.0.16.ebuild,
+  -sun-jdk-1.6.0.07.ebuild, -sun-jdk-1.6.0.07-r1.ebuild,
+  -sun-jdk-1.6.0.10.ebuild:
+  Remove old versions.
 
   10 Dec 2008; Markus Meier <maekke@gentoo.org> sun-jdk-1.4.2.19.ebuild,
   sun-jdk-1.5.0.17.ebuild, sun-jdk-1.6.0.11.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 70f404f81d51..a11c21c0e5f2 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -5,33 +5,21 @@ AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0
 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_18-linux-i586.bin 36380053 RMD160 424ec3f66def593d7f54868edae63c6bbca82b8a SHA1 9d970845c84959a8d9ad6242be0e9ae867d8ea27 SHA256 f592a0af6c6b0fd22256bee91d68b11cfafe802901b747a29434c2c18e184f04
 DIST j2sdk-1_4_2_19-linux-i586.bin 36387084 RMD160 4d2167bac874d7bce757563d88a9e124b3cb2ca7 SHA1 7c66d03bb6762e549b0644262d08075eb972ac53 SHA256 ce2a2be4ce97313626dd3dc093a7c594fa0f1ffb51e2e12dd341a8091b2c3369
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
-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-5.0u17-dlj-linux-amd64.bin 44078142 RMD160 0d6735ee108386435a9d53256c2a77e0f4208902 SHA1 a45edcd64ea98f0ad5a5239512337b5db74d5faf SHA256 68d5a7dbde765b8f2f80cee7057df6ef76ad8af5cf5f8456cf3d1f3603c97fb8
 DIST jdk-5.0u17-dlj-linux-i586.bin 49690762 RMD160 a9baa1a26acf284b31b7b81278bd32a7dada7c38 SHA1 d9f72fbb0aed5c27d7d40671a318597906771fd9 SHA256 427a6abd1435c23bf3bc953cca13a0d3b22f3be5e1c1bb14d21ac88e898c021a
-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-6u11-dlj-linux-amd64.bin 72807418 RMD160 268d69287de89dd75ed11095b8bcd809967f375c SHA1 665ab8cab1342030e94e19a24eb76470a3677f6f SHA256 945c814f6aed133a36a4a4fcb0f27ec3a9de3901bc4b9bd46ee87468782c5026
 DIST jdk-6u11-dlj-linux-i586.bin 80060361 RMD160 ad6a4f82d103fb7e101351b7347ca8a9992a72db SHA1 6c1bb54d383e1fff69c5e33bfe9e3fcc05c653ab SHA256 c41faea381c3abae0e973a19b88f6e17f83c66fc6bc602a05ccd9a1c3d8a9303
-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.18.ebuild 5184 RMD160 171c0a4e7aab36eb314f398ec278154ea1f8f070 SHA1 efb4dcafa46af82920f7229728f20a1f32a5281e SHA256 4bb32c98c3ef7ead70eee495575808b4680f7f1ef37ed0fce089386545115967
 EBUILD sun-jdk-1.4.2.19.ebuild 5185 RMD160 db65b92800b28a745f34d959b31970b2b46c555a SHA1 126e4fd8463fda8275e6f937a2973dd93bdaca71 SHA256 85ef3f5532fa2dfafe75d2add91568b2cd16fa417655410c3dba07e945166cb5
-EBUILD sun-jdk-1.5.0.16.ebuild 4465 RMD160 0566c2220e5efa619b934f28edbaefb8a7a304c7 SHA1 760f83f7112b70c87b25da4a814e0f9b1d329346 SHA256 ee7dea802a8031a5a1bf1a3a3881e9b753c464880d71aaf32c14fe71a8ed1d40
 EBUILD sun-jdk-1.5.0.17.ebuild 4143 RMD160 0bf001109d265d511abf9151d95b3a6e3c36e525 SHA1 8e31d719208d56746144cdf9d2bbaa766f3a962a SHA256 d583e80cf734e6d1d3490fdbf49bd7d0449750ed41f88143079061dc32105e2a
-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 4658 RMD160 9927a4325f216594320584b12b5227257f9d0dcb SHA1 881f965e636a19883c41956cf6c998a7d3cbce6b SHA256 283063b8c3c9842e76dde2105486303a2ea1f85339610be7c9d8f9e86f4f74b4
 EBUILD sun-jdk-1.6.0.11.ebuild 4658 RMD160 5ce548446fb80ba8e18bbe2e335be4b80446a7e9 SHA1 cdc03a173885047ec5357905a072022067f51173 SHA256 7eb7eb0c4d11c442484ca20402bea79376493e476972b23c0f12e706a6288198
-MISC ChangeLog 47344 RMD160 be50982960b34329290a0b621cb7d725b236f22f SHA1 9d301ee664bf9a13af584015b770db16b33b3fe0 SHA256 481e7f9cef5bd98a016d176e991d25089b2ed7af9394171ee771681777d5139c
+MISC ChangeLog 47564 RMD160 11a298e6ef2085a18eeb0b2f2c18b53c0f123376 SHA1 a9184b32dbeb072265f7af7f7f96667669896545 SHA256 fe4c602d363e6ac61f29437fc33a2b0540b31abb82b9afb47254d4ccc76cbe7f
 MISC metadata.xml 352 RMD160 ca3d9b5f1a29c794d25667b59fb8dd6d18959c85 SHA1 daec179189ca09e38ffab061bb9f7c0c1766f09a SHA256 2e33901e40dedf73f59b2779ae2fe5d995a6a03cafb7944a6c067555222cae4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklAPQYACgkQkKaRLQcq0GIcwQCgmGVyWx99LZvEgE9ngXF7lgya
-D5cAoK11OMffJoevZbVILTiLbzBUvoA+
-=jyeX
+iEYEARECAAYFAklvKWQACgkQcxLzpIGCsLQSbQCfe0NXuBzXj/PP4nAfaNU/agEq
+/DwAn04YzMl9FnWf1/kKvlCJS8QfdCmg
+=hqIO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.18.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.18.ebuild
deleted file mode 100644
index 9e444adf5254..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.18.ebuild
+++ /dev/null
@@ -1,168 +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.18.ebuild,v 1.2 2008/07/16 11:12:27 opfer 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 "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.16.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.16.ebuild
deleted file mode 100644
index 45286fcecf64..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.16.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.16.ebuild,v 1.3 2008/07/16 11:14:07 opfer 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.6.0.07-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild
deleted file mode 100644
index 8f8165d1c6c9..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild
+++ /dev/null
@@ -1,138 +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.07-r1.ebuild,v 1.1 2008/09/09 14:00:30 betelgeuse 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* )
-	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."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.07.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.07.ebuild
deleted file mode 100644
index 4e3973c06419..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.07.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.07.ebuild,v 1.3 2008/07/16 11:15:38 opfer 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."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.10.ebuild
deleted file mode 100644
index 38dccbdeaed0..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.10.ebuild
+++ /dev/null
@@ -1,148 +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.10.ebuild,v 1.3 2008/11/22 15:03:44 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* )
-	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
-			install_mozilla_plugin /opt/${P}/jre/lib/i386/libnpjp2.so plugin2
-		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
-
-	if use x86 && use nsplugin; then
-		elog
-		elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
-		elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
-		ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
-		elog "For more info see https://jdk6.dev.java.net/plugin2/"
-		elog
-	fi
-
-	elog "Please reinstall eclipse-sdk if you have it installed and want"
-	elog "workaround for bug #215150."
-}