Cleanup.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

6 files changed, 7 insertions, 524 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index cbf852948a74..0152730d1fc3 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.164 2009/12/23 01:18:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.165 2009/12/23 01:20:22 caster Exp $
+
+  23 Dec 2009; Vlastimil Babka <caster@gentoo.org>
+  -sun-jre-bin-1.5.0.20.ebuild, -sun-jre-bin-1.5.0.21.ebuild,
+  -sun-jre-bin-1.6.0.15.ebuild, -sun-jre-bin-1.6.0.16.ebuild:
+  Cleanup.
 
   23 Dec 2009; Vlastimil Babka <caster@gentoo.org>
   -sun-jre-bin-1.4.2.19.ebuild, -files/sun-jre-bin-1.4.env:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 185d8cac88be..b324f561c7cb 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -3,23 +3,11 @@ AUX construct.sh 6964 RMD160 8e3de41f59023cb9bf6040fe5f5a36d1b39552e3 SHA1 bc240
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 AUX sun-jre-bin-1.5.env 794 RMD160 8354353bc23c7148c5bd73d0c7bf958123378e46 SHA1 09301d835309d81f20270ebe90b6a02efd2f3aea SHA256 a7007ac6473f00040646f34caa870195056acd994ef86a2b627f9658c1986a22
 AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1 1e431f6a7990c4c0684e95a73da32e132183331b SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09
-DIST jdk-5.0u20-dlj-linux-amd64.bin 44167773 RMD160 273963fb6330423442822b2b7c6b7cd164223bb1 SHA1 c1af8cf606f5d5a7eb22717159692e0922d6eee7 SHA256 92132d06a2bbec548ed8e35b32764e2a9bdf127a2e57c9eb4f5af18434627618
-DIST jdk-5.0u20-dlj-linux-i586.bin 49764253 RMD160 22148cb268decb1237e2d74764726ca7c5de3387 SHA1 128aa89d06c3f39bee7866882ff2b4d4d33bfaa4 SHA256 10b1beea2e8d2733255095ba6fe55065e66e9fc2e0116f240eea2ce680195206
-DIST jdk-5.0u21-dlj-linux-amd64.bin 44208873 RMD160 6510659622c7ba85b7da2740ca3396761c298e4b SHA1 0f5435c3ae7b5094b55e90115d2713325480a4f7 SHA256 ab195ce1053f54eb5663d4c22d2679934a6e8197bb0840b341cafe620efe8c3f
-DIST jdk-5.0u21-dlj-linux-i586.bin 49775944 RMD160 4675a3190ebc2eba3a4e6c559c2b16da74899ba0 SHA1 760c1edbfa43a3afd7fb493934c12d00f9c907ba SHA256 55ee71a308e0fbdb87738ff7bd870028c84572c852d40bb8e62ca7fd6fb363fd
 DIST jdk-5.0u22-dlj-linux-amd64.bin 44213188 RMD160 00cecc02b5a02b00732954f5dab6091697462796 SHA1 5f94db1c775bac2ebcff74581f92891f0a9b4922 SHA256 1182d9c8d06fad7e8fbbb994c06f75b32a096fa50e448a7cbf455825ff4b0b21
 DIST jdk-5.0u22-dlj-linux-i586.bin 49782555 RMD160 f015e1502b357cccd45695a5c4bc41ba113d3a30 SHA1 611e56dd3dc0e25b286c374c60b56b5e76569fb2 SHA256 1c2e853b60e408176ec924e717fb7ec7953a9dddbfc397de91536e9084cf9e46
-DIST jdk-6u15-dlj-linux-amd64.bin 81895994 RMD160 12976068c37998bf91e5ecd87179ac4ed697d2ce SHA1 77323aab8b59b5cf84ea09cb43e0e4a0c05e1f1a SHA256 14133ea4bd8f1dfd5ce92d1d622f719539b58ceb6eac5c094939cf216075a317
-DIST jdk-6u15-dlj-linux-i586.bin 81819735 RMD160 593d067c222bd05d640b24fd9cba20915a795de2 SHA1 d09eea7fb48cd662abafbf490b0cb8340936095a SHA256 d0e14d777d2f49da7d98fc27790c766d4d47d19a973c0855b2b9250ab4fdd815
-DIST jdk-6u16-dlj-linux-amd64.bin 81903202 RMD160 9f318295996b4fab25f4a79a226c1e02e211c4b2 SHA1 28a22a422a08c3ac2204784001b040d4840e7959 SHA256 930814371c5af43c3069d4230322d4369193e7921d2372ed65d597782e4fb3cf
-DIST jdk-6u16-dlj-linux-i586.bin 81822282 RMD160 139f37a96c39cc5a7e08a8141298521b9af0cbf4 SHA1 0e284828613cc67b7ea7ce93264f7e6700e5a85d SHA256 46ebe41e8b22ddd3eb313222c755ff4bcfed4128503e861308f240a6ddea5ea3
 DIST jdk-6u17-dlj-linux-amd64.bin 81905547 RMD160 5ad629c427e14bbf13c0fc8470c574a999350ab3 SHA1 a42bba8a2efe2a86403702507b99ff63086acea5 SHA256 9a7af862b4093ca7f1ca749f7774429a99321d08013c64af47df81887d80719a
 DIST jdk-6u17-dlj-linux-i586.bin 81824577 RMD160 07ad522edd80e19e71152e37544128ddd600c42c SHA1 bca59cb275f37b492e69ceecbda75a573d94b553 SHA256 4ba74424271670cc65405d6ab9a5480cb299ce9fb19c800096ce012d7d662b2e
-EBUILD sun-jre-bin-1.5.0.20.ebuild 3082 RMD160 b3c9c7704438e52bf54fb9cbdaf7d8caa70dc746 SHA1 9ed6b1f2bcf547fdf9f5b9cd10d0270d2a7eba2c SHA256 6388cafa915b3b9c228e7d66ebf52a78aa3b167b3b17fb9469dc393dffb4b82f
-EBUILD sun-jre-bin-1.5.0.21.ebuild 3084 RMD160 a87047231a9dcaba851a970d9214e2f8338a5e3d SHA1 b48b66a3f25411373154c6767f35bf37bad04625 SHA256 1bfcbf24f9377f6dcd6a5fdd5b3bed3f797bb14a5d483c32e18f7f6fa69b3bb9
 EBUILD sun-jre-bin-1.5.0.22.ebuild 3082 RMD160 b0ff3f603d5f01e33b7fa0622ea9acfb44340dc1 SHA1 d5c752b4600113544e2bcf6a4f3864b45b3b35d7 SHA256 3f3ce45ce2fa0deee1906c649cd60e0d7922cfa7ba4a851480f96de722c4ff7a
-EBUILD sun-jre-bin-1.6.0.15.ebuild 4192 RMD160 f88f85dd31d03c08f92b382c4020e34568d4f1b0 SHA1 d7acb6ff6b7be108081a5d33843f5e9b13765972 SHA256 82f2a1cf397f821b8664f4d32d08888d73326294c2a2006c52f5d0dfe886f9a6
-EBUILD sun-jre-bin-1.6.0.16.ebuild 4194 RMD160 cf28d65af7ecf4e906daf414054b2f354adea849 SHA1 9f8418134cb38f017976e65f91d632b67f5d8c10 SHA256 d0eaca679e3555e439e3542ae3398034ff843b01c0f3bf5a7299f945d9aab902
 EBUILD sun-jre-bin-1.6.0.17.ebuild 4192 RMD160 338134cb2a26ac58eabe9bd93d8bb0cd1ebf6175 SHA1 fa85c9788eeebf58cc7a7e17012d9f5480d77469 SHA256 c441f9f5528dd2f1e98c1cd9b3df0a685e5df5f47538989fed6a6509d54ae040
-MISC ChangeLog 29296 RMD160 62428ccda602df3735691a5409bae910e93f9c34 SHA1 6cc7d7e34daf5fa57e699b0b70980dbb6b772376 SHA256 91c1900df2e4d63d28249c21d340c7c91893a2d429d9f1577e96ed5b0dc5f3e4
+MISC ChangeLog 29483 RMD160 0465035779c94f736a3ce51919a0537a4a31f5cb SHA1 70cd95e01fa2199d0f02946491fe3dc90a00215b SHA256 88939c012e07841e7983b26e57af3c901ba2b59a5898efdba7a829e882769ae4
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.20.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.20.ebuild
deleted file mode 100644
index c5d7773c75dd..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.20.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.20.ebuild,v 1.3 2009/08/11 05:54:06 maekke Exp $
-
-inherit pax-utils versionator eutils java-vm-2
-
-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 Java SE Runtime Environment"
-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 nsplugin odbc"
-
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}/construct.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This has to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"/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 lib man"
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-
-	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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# FIXME figure out how to handle the control pannel conflict with
-	# sun-jdk-bin
-
-	# 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}/plugin/desktop/sun_java.desktop > \
-#		${T}/sun_java-${SLOT}.desktop
-
-#	domenu ${T}/sun_java-${SLOT}.desktop
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties \
-		fontconfig.properties || die
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	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"
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.21.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.21.ebuild
deleted file mode 100644
index b158ce943c06..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.21.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.21.ebuild,v 1.1 2009/09/29 15:56:25 caster Exp $
-
-inherit pax-utils versionator eutils java-vm-2
-
-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 Java SE Runtime Environment"
-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 nsplugin odbc"
-
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	odbc? ( dev-db/unixODBC )"
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}/construct.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This has to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"/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 lib man"
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-
-	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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# FIXME figure out how to handle the control pannel conflict with
-	# sun-jdk-bin
-
-	# 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}/plugin/desktop/sun_java.desktop > \
-#		${T}/sun_java-${SLOT}.desktop
-
-#	domenu ${T}/sun_java-${SLOT}.desktop
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties \
-		fontconfig.properties || die
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	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"
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.15.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.15.ebuild
deleted file mode 100644
index ab1af5d20fb1..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.15.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.15.ebuild,v 1.3 2009/08/11 05:54:06 maekke Exp $
-
-inherit versionator pax-utils eutils java-vm-2
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-SUFFIX=".bin"
-X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
-
-DESCRIPTION="Sun's Java SE Runtime Environment"
-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 nsplugin odbc"
-
-RDEPEND="sys-libs/glibc
-	x86? ( =virtual/libstdc++-3.3 )
-	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 )"
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}/construct-1.6.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This has to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"/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 lib man"
-
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-	dodir /opt/${P}/share/
-
-	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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-			install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
-		else
-			install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so
-		fi
-	fi
-
-	# install control panel for Gnome/KDE
-	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
-		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
-			"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
-			"${T}/sun_jre-${SLOT}.desktop" || die
-		domenu "${T}/sun_jre-${SLOT}.desktop" || die
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/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
-
-	if use amd64 && use nsplugin; then
-		elog
-		elog "This version finally brings a browser plugin for amd64"
-		elog "It is the so-called Next-Generation Plug-In (plugin2)"
-		elog "Use eselect java-nsplugin to select it (${VMHANDLE})."
-		ewarn "Note that it works only in Firefox 3 or newer browsers!"
-		elog "For more info see https://jdk6.dev.java.net/plugin2/"
-		elog
-	fi
-
-	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"
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.16.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.16.ebuild
deleted file mode 100644
index 1861ee38e8d9..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.16.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.16.ebuild,v 1.1 2009/08/18 10:12:17 caster Exp $
-
-inherit versionator pax-utils eutils java-vm-2
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-SUFFIX=".bin"
-X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
-
-DESCRIPTION="Sun's Java SE Runtime Environment"
-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 nsplugin odbc"
-
-RDEPEND="sys-libs/glibc
-	x86? ( =virtual/libstdc++-3.3 )
-	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 )"
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}/construct-1.6.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_compile() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler. This has to be done before CDS - #215225
-	pax-mark m $(list-paxables "${S}"/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 lib man"
-
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-	dodir /opt/${P}/share/
-
-	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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-			install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
-		else
-			install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so
-		fi
-	fi
-
-	# install control panel for Gnome/KDE
-	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
-		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
-			"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
-			"${T}/sun_jre-${SLOT}.desktop" || die
-		domenu "${T}/sun_jre-${SLOT}.desktop" || die
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/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
-
-	if use amd64 && use nsplugin; then
-		elog
-		elog "This version finally brings a browser plugin for amd64"
-		elog "It is the so-called Next-Generation Plug-In (plugin2)"
-		elog "Use eselect java-nsplugin to select it (${VMHANDLE})."
-		ewarn "Note that it works only in Firefox 3 or newer browsers!"
-		elog "For more info see https://jdk6.dev.java.net/plugin2/"
-		elog
-	fi
-
-	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"
-}