old

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

6 files changed, 0 insertions, 445 deletions

diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index bbf661583731..4e8fa742f44c 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,19 +1,10 @@
 AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80
 AUX construct.sh 6964 RMD160 8e3de41f59023cb9bf6040fe5f5a36d1b39552e3 SHA1 bc24071dba36878abf7a2da88bfc063eb3727da1 SHA256 47847c81ee85bd1b7dba6e91c2d7757c15a8930f4748dc926e00553bc89fcbd6
-AUX emul-linux-x86-java-1.4.env 857 RMD160 65dc6da72579122d52475e5fe2c965f7aaea92f2 SHA1 2564ffbdf2bf885a5ba1ce58a6d3643a140c1e0e SHA256 6651a792e2f4f5d582ede77459591d8cdb8e59419b88659720fcf828e60aebf3
 AUX emul-linux-x86-java-1.5.env 855 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fdca0 SHA1 d989ddc315757eb44aff787ea2c70a6dc848130d SHA256 d36f364c0855d13d7ec2eb4ea3cdbaa483318f1f57b7720edfa5eb0050a12cdb
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
-DIST jdk-5.0u20-dlj-linux-i586.bin 49764253 RMD160 22148cb268decb1237e2d74764726ca7c5de3387 SHA1 128aa89d06c3f39bee7866882ff2b4d4d33bfaa4 SHA256 10b1beea2e8d2733255095ba6fe55065e66e9fc2e0116f240eea2ce680195206
-DIST jdk-5.0u21-dlj-linux-i586.bin 49775944 RMD160 4675a3190ebc2eba3a4e6c559c2b16da74899ba0 SHA1 760c1edbfa43a3afd7fb493934c12d00f9c907ba SHA256 55ee71a308e0fbdb87738ff7bd870028c84572c852d40bb8e62ca7fd6fb363fd
 DIST jdk-5.0u22-dlj-linux-i586.bin 49782555 RMD160 f015e1502b357cccd45695a5c4bc41ba113d3a30 SHA1 611e56dd3dc0e25b286c374c60b56b5e76569fb2 SHA256 1c2e853b60e408176ec924e717fb7ec7953a9dddbfc397de91536e9084cf9e46
-DIST jdk-6u15-dlj-linux-i586.bin 81819735 RMD160 593d067c222bd05d640b24fd9cba20915a795de2 SHA1 d09eea7fb48cd662abafbf490b0cb8340936095a SHA256 d0e14d777d2f49da7d98fc27790c766d4d47d19a973c0855b2b9250ab4fdd815
-DIST jdk-6u16-dlj-linux-i586.bin 81822282 RMD160 139f37a96c39cc5a7e08a8141298521b9af0cbf4 SHA1 0e284828613cc67b7ea7ce93264f7e6700e5a85d SHA256 46ebe41e8b22ddd3eb313222c755ff4bcfed4128503e861308f240a6ddea5ea3
 DIST jdk-6u17-dlj-linux-i586.bin 81824577 RMD160 07ad522edd80e19e71152e37544128ddd600c42c SHA1 bca59cb275f37b492e69ceecbda75a573d94b553 SHA256 4ba74424271670cc65405d6ab9a5480cb299ce9fb19c800096ce012d7d662b2e
-EBUILD emul-linux-x86-java-1.5.0.20.ebuild 2887 RMD160 a702c035727b63bab2599021521b768bfebb4d4a SHA1 c4d2c2059529b08521ccdda35626a62b026d45a7 SHA256 53e578cee3f1b4cbb4a2c7dffb8a5318535531200187b640ee6cc0a48641610e
-EBUILD emul-linux-x86-java-1.5.0.21.ebuild 2888 RMD160 db019387b8daeb4120eb376068da007dbf2018fa SHA1 4e48a4b6a36549570a5b3f0580ff02507413641c SHA256 9e6fff6c7956f250630c2c39549cbd702e4ee82ae8d553784e3e70b35325eb7d
 EBUILD emul-linux-x86-java-1.5.0.22.ebuild 2887 RMD160 267a614a7019011b8f5e79d4d0cf348850dafb59 SHA1 51a50bc055103d9e56bd73da20b7eace95869f9e SHA256 a01fbad958cf88a68281fbeac02ff9a9abcd35d424105f46cbbee60b293391b4
-EBUILD emul-linux-x86-java-1.6.0.15.ebuild 3246 RMD160 6593606772e6cb5723b77ce05524bef870a60842 SHA1 33e0fbd0fe39ddc62ec58eae1291cf4c8640666f SHA256 9570a7beefe2c7bbb6f998040a5181a172a18e80cf57d04e415e662092f327d3
-EBUILD emul-linux-x86-java-1.6.0.16.ebuild 3247 RMD160 72ceacc230533bbd5a3a4c4fbd9838ed9dabcf5e SHA1 3f3d3ed2a9b39fea4a1951cf91197013fb6d9147 SHA256 dc11e3eeadc9179baa5142ffdbfa914ef2dbcf2930d115efd9ce3c19d5c66134
 EBUILD emul-linux-x86-java-1.6.0.17.ebuild 3246 RMD160 1cf81d34c8761697092ffcaea9dc2286a3d527c4 SHA1 249d8f4bdb31e099550ea7e2c54b82967f139d81 SHA256 a3f1c848b98f74af5a9b41c6e4d2bd330d8103295cce9bb2efe70e7607c4a7ca
 MISC ChangeLog 16791 RMD160 7c73c9c5843e94f352f39041560c1143ba5ec9da SHA1 8572e3f756e29a314383256618a14af18fb70d68 SHA256 9fcfff01a33cb302116e784c59cb21f5d762ca36d316ff6fb270c310a560da2e
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.20.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.20.ebuild
deleted file mode 100644
index 37c6ed37ba17..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.20.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.20.ebuild,v 1.2 2009/08/11 05:57:35 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-3)u${UPDATE}"
-
-At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="http://download.java.net/dlj/binaries/${At}"
-
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-QA_DT_HASH="opt/${P}/.*"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${At} --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
-	einfo "Creating the Class Data Sharing archives"
-	"${S}"/bin/java -client -Xshare:dump || die
-}
-
-src_install() {
-	dodir /opt/${P}
-	cp -pPR bin lib man javaws plugin "${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
-
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	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
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-
-	echo
-	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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.21.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.21.ebuild
deleted file mode 100644
index 1fc1db79f284..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.21.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.21.ebuild,v 1.1 2009/09/29 16:00:39 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-3)u${UPDATE}"
-
-At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="http://download.java.net/dlj/binaries/${At}"
-
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-QA_DT_HASH="opt/${P}/.*"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${At} --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
-	einfo "Creating the Class Data Sharing archives"
-	"${S}"/bin/java -client -Xshare:dump || die
-}
-
-src_install() {
-	dodir /opt/${P}
-	cp -pPR bin lib man javaws plugin "${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
-
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	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
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-
-	echo
-	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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.15.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.15.ebuild
deleted file mode 100644
index 945057807c13..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.15.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.15.ebuild,v 1.2 2009/08/11 05:54:47 maekke Exp $
-
-inherit versionator pax-utils java-vm-2 eutils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://java.sun.com/javase/6/"
-#SRC_URI="http://download.java.net/dlj/binaries/${At}"
-SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
-
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )
-	app-emulation/emul-linux-x86-compat"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_DT_HASH="opt/${P}/.*"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.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
-	einfo "Creating the Class Data Sharing archives"
-	"${S}"/bin/java -client -Xshare:dump || die
-	"${S}"/bin/java -server -Xshare:dump || die
-}
-
-src_install() {
-	local dirs="bin lib man 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
-
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
-	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
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	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
-
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.16.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.16.ebuild
deleted file mode 100644
index 9b7ffa030fc4..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.16.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.16.ebuild,v 1.1 2009/08/18 10:11:50 caster Exp $
-
-inherit versionator pax-utils java-vm-2 eutils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-At="jdk-${MY_PV}-dlj-linux-i586.bin"
-DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
-HOMEPAGE="http://java.sun.com/javase/6/"
-#SRC_URI="http://download.java.net/dlj/binaries/${At}"
-SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
-
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
-	X? ( app-emulation/emul-linux-x86-xlibs )
-	app-emulation/emul-linux-x86-compat"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_DT_HASH="opt/${P}/.*"
-
-src_unpack() {
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.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
-	einfo "Creating the Class Data Sharing archives"
-	"${S}"/bin/java -client -Xshare:dump || die
-	"${S}"/bin/java -server -Xshare:dump || die
-}
-
-src_install() {
-	local dirs="bin lib man 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
-
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
-	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
-
-	set_java_env
-	java-vm_revdep-mask
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	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
-
-	if ! use X; then
-		local xwarn="X11 libraries and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.env b/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.env
deleted file mode 100644
index 4ee588e9a0fd..000000000000
--- a/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.env,v 1.1 2007/11/03 15:47:48 caster Exp $
-
-VERSION="Sun 32bit JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-LDPATH="${JAVA_HOME}/lib/i386/:${JAVA_HOME}/lib/i386/native_threads/:${JAVA_HOME}/lib/i386/classic/:${JAVA_HOME}/lib/i386/server"
-MANPATH="/opt/@P@/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.4"
-BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/i18n.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"