remove old

(Portage version: 2.0.53_rc6)

17 files changed, 2 insertions, 1320 deletions

diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.13 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.13
deleted file mode 100644
index 94ef211bc746..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 347800af175681c7d707c45cce16bf5b j2sdk-1_3_1_13-linux-i586.bin 26653147
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08
deleted file mode 100644
index 4d7c6a558899..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e35832af75e963a58119d2344a5a37c0 j2sdk-1_4_2_08-linux-i586.bin 36418360
-MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08-r1
deleted file mode 100644
index 4d7c6a558899..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.08-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e35832af75e963a58119d2344a5a37c0 j2sdk-1_4_2_08-linux-i586.bin 36418360
-MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.04 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.04
deleted file mode 100644
index 5deff1205edb..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.04
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 42a98986e971c86192cc0075bb10afff jdk-1_5_0_04-linux-i586.bin 48774165
-MD5 1e9720e314aae1691c751d1db3b436c5 jdk-1_5_0_04-linux-amd64.bin 43524771
-MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
deleted file mode 100644
index 8db380c995eb..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.13 2005/10/18 20:22:01 agriffis Exp $
-
-inherit java eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_P=jdk${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="${At}"
-DESCRIPTION="Sun Java Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.3/"
-DEPEND="virtual/libc
-	>=dev-java/java-config-0.2.7
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="sys-libs/lib-compat"
-PROVIDE="virtual/jre
-	virtual/jdk"
-LICENSE="sun-bcla-java-vm"
-SLOT="1.3"
-KEYWORDS="x86 -*"
-RESTRICT="fetch"
-
-IUSE="doc browserplugin nsplugin mozilla"
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting."
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx
-	rm install.sfx
-
-	sed "s/head -1/head -n 1/" -i ${MY_P}/bin/.java_wrapper
-}
-
-src_install() {
-	local dirs="bin include include-old jre lib man"
-	dodir /opt/${P}
-
-	for i in ${dirs} ; do
-		if [ "${i}" == "bin" ] ; then
-			dodir /opt/${P}/${i}
-			cp -dPR ${i}/.java_wrapper ${D}/opt/${P}/bin/
-			cp -dPR ${i}/* ${D}/opt/${P}/bin/
-		elif [ "${i}" == "jre" ] ; then
-			dodir /opt/${P}/${i}
-			dodir /opt/${P}/${i}/bin
-			cp -dPR ${i}/bin/.java_wrapper ${D}/opt/${P}/${i}/bin/
-			cp -dPR ${i}/bin/* ${D}/opt/${P}/${i}/bin/
-			cp -dPR	${i}/CHANGES \
-				${i}/COPYRIGHT \
-				${i}/ControlPanel.html \
-				${i}/LICENSE \
-				${i}/README \
-				${i}/Welcome.html \
-				${i}/lib \
-				${i}/plugin \
-				${D}/opt/${P}/${i}/
-		else
-			cp -dPR ${i} ${D}/opt/${P}/
-		fi
-	done
-
-	dodoc COPYRIGHT README LICENSE
-	dohtml README.html
-
-	dodir /opt/${P}/share/
-	cp -a demo src.jar ${D}/opt/${P}/share/
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		install_mozilla_plugin  /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so
-	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/sun-jdk-1.3.1.09/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JDK require X11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild
deleted file mode 100644
index 866d4cc1d1fa..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2005 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.08-r1.ebuild,v 1.8 2005/10/18 20:22:01 agriffis Exp $
-
-inherit java eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_P=j2sdk${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-jce_policy="jce_policy-${MY_PVB//./_}.zip"
-
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI="${At}
-		jce? ( ${jce_policy} )"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* x86"
-RESTRICT="fetch"
-IUSE="doc browserplugin nsplugin jce mozilla"
-
-#glibc dep: #102423
-DEPEND=">=dev-java/java-config-1.1.5
-	>=sys-libs/glibc-2.3.5
-	sys-apps/sed
-	app-arch/unzip
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-RDEPEND="sys-libs/lib-compat"
-
-PROVIDE="virtual/jre
-	virtual/jdk"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
-jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemrsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting."
-	einfo "and move it to ${DISTDIR}"
-	if use jce; then
-		echo
-		einfo "Also download ${jce_policy} from:"
-		einfo ${DOWNLOAD_URL_JCE}
-		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${MY_PV}.bin. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
-			die "cannot read ${jce_policy}. Please check the permission and try again."
-		fi
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-	#javaws hack
-	cd ${S}
-	sed -i "s,^exec,export LD_PRELOAD=/opt/${P}/jre/javaws/javaws-waitid.so\nexec," jre/javaws/javaws || die "javaws sed failed"
-}
-
-src_compile() {
-	gcc -O2 -fPIC -g0 -shared -o ${S}/jre/javaws/javaws-waitid.so ${FILESDIR}/javaws-waitid.c || die "failed to compile javaws hack"
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -dPR $i ${D}/opt/${P}/
-	done
-
-	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml README.html
-	dodir /opt/${P}/share/
-	cp -a demo src.zip ${D}/opt/${P}/share/
-
-	if use jce ; then
-		# Using unlimited jce while still retaining the strong jce
-		# May have repercussions when you find you cannot symlink libraries
-		# in classpaths.
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jce_policy}
-		mv jce unlimited-jce
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java.desktop
-
-	domenu ${T}/sun_java.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	touch /opt/${P}/.systemPrefs/.system.lock
-	chmod 644 /opt/${P}/.systemPrefs/.system.lock
-	touch /opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	#Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/sun-jdk-1.4.2.03/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
deleted file mode 100644
index f2d83f5507c3..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2005 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.08.ebuild,v 1.11 2005/10/18 20:22:01 agriffis Exp $
-
-inherit java eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_P=j2sdk${MY_PV}
-MY_PVB=${PV%.*}
-
-At="j2sdk-${PV//./_}-linux-i586.bin"
-jce_policy="jce_policy-${MY_PVB//./_}.zip"
-
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI="${At}
-		jce? ( ${jce_policy} )"
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86 -*"
-RESTRICT="fetch"
-IUSE="doc browserplugin nsplugin jce mozilla"
-
-#glibc dep: #102423
-DEPEND=">=dev-java/java-config-1.1.5
-	>=sys-libs/glibc-2.3.5
-	sys-apps/sed
-	app-arch/unzip
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-RDEPEND="sys-libs/lib-compat"
-
-PROVIDE="virtual/jre
-	virtual/jdk"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
-jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemrsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting."
-	einfo "and move it to ${DISTDIR}"
-	if use jce; then
-		echo
-		einfo "Also download ${jce_policy} from:"
-		einfo ${DOWNLOAD_URL_JCE}
-		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
-		einfo "and move it to ${DISTDIR}"
-	fi
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${MY_PV}.bin. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
-			die "cannot read ${jce_policy}. Please check the permission and try again."
-		fi
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -dPR $i ${D}/opt/${P}/
-	done
-
-	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml README.html
-	dodir /opt/${P}/share/
-	cp -a demo src.zip ${D}/opt/${P}/share/
-
-	if use jce ; then
-		# Using unlimited jce while still retaining the strong jce
-		# May have repercussions when you find you cannot symlink libraries
-		# in classpaths.
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jce_policy}
-		mv jce unlimited-jce
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java.desktop
-
-	domenu ${T}/sun_java.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	touch /opt/${P}/.systemPrefs/.system.lock
-	chmod 644 /opt/${P}/.systemPrefs/.system.lock
-	touch /opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	#Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/sun-jdk-1.4.2.03/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild
deleted file mode 100644
index 50e8cde0767c..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2005 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.04.ebuild,v 1.7 2005/10/18 20:22:01 agriffis Exp $
-
-inherit java eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jdk-${MY_PVA}-linux-amd64.bin"
-x86file="jdk-${MY_PVA}-linux-i586.bin"
-
-jcefile="jce_policy-${MY_PVA%_*}.zip"
-
-if use x86; then
-	At=${x86file}
-elif use amd64; then
-	At=${amd64file}
-fi
-
-S="${WORKDIR}/jdk${MY_PVL}"
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )
-		jce? ( $jcefile )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 ~amd64 -*"
-RESTRICT="fetch nostrip"
-IUSE="doc browserplugin nsplugin jce mozilla"
-
-#
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed
-	jce? ( app-arch/unzip )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
-
-RDEPEND="x86? ( sys-libs/lib-compat )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
-
-PROVIDE="virtual/jre
-	virtual/jdk"
-
-PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "(Select the Self-extracting (.bin) for Linux or Linux AMD64, depending on your arch)"
-	einfo "and move it to ${DISTDIR}"
-
-	if use jce; then
-		echo
-		einfo "Also download ${jcefile} from:"
-		einfo ${FETCH_JCE}
-		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
-		einfo "and move it to ${DISTDIR}"
-	fi
-
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-	if use jce; then
-		if [ ! -r ${DISTDIR}/${jcefile} ]; then
-			die "cannot read ${jcefile}. Please check the permission and try again."
-		fi
-	fi
-
-	#Search for the ELF Header
-	testExp=`echo -e "\105\114\106"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/bin/unpack200 ]; then
-		UNPACK_CMD=${S}/bin/unpack200
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-		rm -f ${UNPACK_CMD}
-	else
-		die "unpack not found"
-	fi
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin include jre lib man"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc COPYRIGHT LICENSE README.html
-	dohtml README.html
-	dodir /opt/${P}/share/
-	cp -pPR demo src.zip ${D}/opt/${P}/share/
-	if ( use x86 || use amd64 ); then
-		cp -pPR sample ${D}/opt/${P}/share/
-	fi
-
-	if use jce ; then
-		cd ${D}/opt/${P}/jre/lib/security
-		unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce"
-		mv jce unlimited-jce
-		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
-		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
-	fi
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java.desktop
-
-	domenu ${T}/sun_java.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/jre
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	#Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	echo
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-}
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08
deleted file mode 100644
index ff0f856c8025..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa26930175b18ab4b2ad67eb7f43eb14 j2re-1_4_2_08-linux-i586.bin 14389429
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08-r1
deleted file mode 100644
index ff0f856c8025..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.08-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa26930175b18ab4b2ad67eb7f43eb14 j2re-1_4_2_08-linux-i586.bin 14389429
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.04 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.04
deleted file mode 100644
index 25cecf1fba71..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.04
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 405181243930b86db3a25428f0b18630 jre-1_5_0_04-linux-i586.bin 16595999
-MD5 b0ce0cef4b628ca2bd50c34643227426 jre-1_5_0_04-linux-amd64.bin 16262600
diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.4.2.08 b/dev-java/sun-jre-bin/files/sun-jre-bin-1.4.2.08
deleted file mode 100644
index edc14201f554..000000000000
--- a/dev-java/sun-jre-bin/files/sun-jre-bin-1.4.2.08
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/files/sun-jre-bin-1.4.2.08,v 1.2 2005/07/26 15:31:48 axxo Exp $
-
-VERSION="Sun JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-ADDLDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/classic/:${JAVA_HOME}/lib/@PLATFORM@/server"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.04 b/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.04
deleted file mode 100644
index dc54a95b669c..000000000000
--- a/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.04
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.0.04,v 1.2 2005/07/26 15:31:48 axxo Exp $
-
-VERSION="Sun JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-ADDLDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/"
-MANPATH="/opt/@P@/man"
-ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild
deleted file mode 100644
index 44503f078929..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2005 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.4.2.08-r1.ebuild,v 1.8 2005/10/18 20:22:25 agriffis Exp $
-
-inherit java eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PV2=${PV//./_}
-At="j2re-${MY_PV2}-linux-i586.bin"
-S="${WORKDIR}/j2re${MY_PV}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI=${At}
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* x86"
-RESTRICT="fetch"
-IUSE="browserplugin nsplugin mozilla"
-
-DEPEND=">=dev-java/java-config-1.1.5
-	sys-apps/sed"
-
-RDEPEND="sys-libs/lib-compat"
-
-PROVIDE="virtual/jre"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
-lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(select the \"Linux self-extracting file\" package format of the JRE"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-	cd ${S}
-	sed -i "s,^exec,export LD_PRELOAD=/opt/${P}/javaws/javaws-waitid.so\nexec," javaws/javaws || die "javaws sed failed"
-}
-
-src_compile() {
-	gcc -O2 -fPIC -g0 -shared -o ${S}/javaws/javaws-waitid.so ${FILESDIR}/javaws-waitid.c || die "failed to compile javaws hack"
-}
-
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/
-	done
-
-	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html ControlPanel.html
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-	domenu ${T}/sun_java-jre.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst () {
-	# Create files used as storage for system preferences.
-	touch /opt/${P}/.systemPrefs/.system.lock
-	chmod 644 /opt/${P}/.systemPrefs/.system.lock
-	touch /opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
-
-	java_pkg_postinst
-
-	#Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/sun-jdk-1.4.2.03/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild
deleted file mode 100644
index 3fa66efcfa4d..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2005 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.4.2.08.ebuild,v 1.8 2005/10/18 20:22:25 agriffis Exp $
-
-inherit java eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PV2=${PV//./_}
-At="j2re-${MY_PV2}-linux-i586.bin"
-S="${WORKDIR}/j2re${MY_PV}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI=${At}
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="x86 -*"
-RESTRICT="fetch"
-IUSE="browserplugin nsplugin mozilla"
-
-DEPEND=">=dev-java/java-config-1.1.5
-	sys-apps/sed"
-
-RDEPEND="sys-libs/lib-compat"
-
-PROVIDE="virtual/jre"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
-lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(select the \"Linux self-extracting file\" package format of the JRE"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -a $i ${D}/opt/${P}/
-	done
-
-	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html ControlPanel.html
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-	domenu ${T}/sun_java-jre.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst () {
-	# Create files used as storage for system preferences.
-	touch /opt/${P}/.systemPrefs/.system.lock
-	chmod 644 /opt/${P}/.systemPrefs/.system.lock
-	touch /opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
-
-	java_pkg_postinst
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-
-	# Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/sun-jdk-1.4.2.03/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild
index c9a74127e420..22b7926f6b8d 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4.2.09.ebuild,v 1.4 2005/10/18 20:22:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild,v 1.5 2005/10/26 07:47:18 axxo Exp $
 
 inherit java eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
 SRC_URI=${At}
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 RESTRICT="fetch"
 IUSE="browserplugin nsplugin mozilla"
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild
deleted file mode 100644
index 6c9cf9f36ac0..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2005 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.04.ebuild,v 1.8 2005/10/18 20:22:25 agriffis Exp $
-
-inherit java eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jre-${MY_PVA}-linux-amd64.bin"
-x86file="jre-${MY_PVA}-linux-i586.bin"
-
-if use x86; then
-	At=${x86file}
-elif use amd64; then
-	At=${amd64file}
-fi
-
-S="${WORKDIR}/jre${MY_PVL}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 ~amd64 -*"
-RESTRICT="fetch"
-IUSE="browserplugin nsplugin mozilla"
-
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed"
-
-RDEPEND="x86? ( sys-libs/lib-compat )"
-
-PROVIDE="virtual/jre"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-FETCH_SDK="http://javashoplm.sun.com:80/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jre-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "(Select the Linux or Linux AMD64 Self-extracting (.bin), depending on your arch)"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	#Search for the ELF Header
-	testExp=`echo -e "\105\114\106"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/bin/unpack200 ]; then
-		UNPACK_CMD=${S}/bin/unpack200
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-		rm -f ${UNPACK_CMD}
-	else
-		die "unpack not found"
-	fi
-}
-
-src_install() {
-
-	if use amd64; then
-		local dirs="bin lib man"
-	else
-		local dirs="bin lib man plugin javaws"
-	fi
-
-
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to build"
-	done
-
-	dodoc COPYRIGHT LICENSE README
-	dohtml Welcome.html
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-
-	domenu ${T}/sun_java-jre.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-
-	# Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JRE require virtual/x11 and virtual/lpr to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-}