Delete old versions/revisions.

Package-Manager: portage-2.1.3

10 files changed, 14 insertions, 522 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index a2838b991e61..07c6e678dcd1 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.38 2007/08/17 10:15:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.39 2007/08/17 10:17:35 betelgeuse Exp $
+
+  17 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -emul-linux-x86-java-1.5.0.11.ebuild, -emul-linux-x86-java-1.6.0.ebuild,
+  -emul-linux-x86-java-1.6.0-r1.ebuild,
+  -emul-linux-x86-java-1.6.0.01.ebuild:
+  Delete old versions/revisions.
 
   17 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
   emul-linux-x86-java-1.6.0.02.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index b1805f6b05ea..99c4d45f6965 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -26,43 +26,24 @@ MD5 40fcbcc585ad443b5bf473228c8ef18d files/javasettings_Linux_x86.xml 1601
 RMD160 e87fe605d34fd6060f58f511deea5a935697be9f files/javasettings_Linux_x86.xml 1601
 SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585 files/javasettings_Linux_x86.xml 1601
 DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 SHA1 30b37bc8dcb5617971d2ae95e2f7227359d39991 SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef
-DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3554d77b64a31d SHA1 965e4983da769b6c5d6ec79c942337bc8bee5c8a SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705
 DIST jdk-1_5_0_12-dlj-linux-i586.bin 49646174 RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 SHA1 ff909ca469587ae132816868c5f201757e533ed0 SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0
-DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467
-DIST jdk-6u1-dlj-linux-i586.sh 62816950 RMD160 469824d7745e4f71aac29dabf2f6af9c084a5f91 SHA1 67f62d313aecc5963c975477ff98b7a0e37ae9b4 SHA256 0919b6b20f982cf488f20c16c78fa705434481822db88b06bb5beb01970cc508
 DIST jdk-6u2-dlj-linux-i586.bin 58408110 RMD160 3b0c124693401ebc07dea50dfbf05bc9c2d47c28 SHA1 d3e58749ffb457ea338facb86bd800d084e98fe1 SHA256 6d25968debfcac1397fb3dc36c505d0cce8f787f0fc135aab8d6a7d517df68c2
 EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3142 RMD160 374bd8b1b06cda8107d9613dda5ea12a389ad68c SHA1 59d1144db339048171f9bcef03d01457df9559f0 SHA256 c673fc47e40f9548e1ac3dab0c7bc30d9f371dff4c436c443d6f3eefafe1ccf6
 MD5 858ea905559c6ccda24835a037154074 emul-linux-x86-java-1.4.2.03-r2.ebuild 3142
 RMD160 374bd8b1b06cda8107d9613dda5ea12a389ad68c emul-linux-x86-java-1.4.2.03-r2.ebuild 3142
 SHA256 c673fc47e40f9548e1ac3dab0c7bc30d9f371dff4c436c443d6f3eefafe1ccf6 emul-linux-x86-java-1.4.2.03-r2.ebuild 3142
-EBUILD emul-linux-x86-java-1.5.0.11.ebuild 3953 RMD160 7595c74f2e21133c3a078a13171fa0a866e13b12 SHA1 b5e9449b62ce3230ada27e26113b47c9ba7cb37a SHA256 3d9a0d0cd1120d11dde756f203e66c9cf328f13d116f8424764359bb9f073ba9
-MD5 fdd855bcbef0700c8f53a57b7491a3b2 emul-linux-x86-java-1.5.0.11.ebuild 3953
-RMD160 7595c74f2e21133c3a078a13171fa0a866e13b12 emul-linux-x86-java-1.5.0.11.ebuild 3953
-SHA256 3d9a0d0cd1120d11dde756f203e66c9cf328f13d116f8424764359bb9f073ba9 emul-linux-x86-java-1.5.0.11.ebuild 3953
 EBUILD emul-linux-x86-java-1.5.0.12.ebuild 3137 RMD160 027c16d703452a7058d5c3e8e76a017f7c793fdb SHA1 1c370d14a64f23820537ead1e303aa7e26d07951 SHA256 620ed81817df144067bebb1e7de5d4c2ef95a17ae29d2ae147e76dde9993bac9
 MD5 7859b17b1fa33de57d61e4f58ca6e773 emul-linux-x86-java-1.5.0.12.ebuild 3137
 RMD160 027c16d703452a7058d5c3e8e76a017f7c793fdb emul-linux-x86-java-1.5.0.12.ebuild 3137
 SHA256 620ed81817df144067bebb1e7de5d4c2ef95a17ae29d2ae147e76dde9993bac9 emul-linux-x86-java-1.5.0.12.ebuild 3137
-EBUILD emul-linux-x86-java-1.6.0-r1.ebuild 2803 RMD160 a51c7cfa36963168bf27a542d63d76a8ce2df6b4 SHA1 0d4c39a9908d16827e95865e47137b7ca58e7225 SHA256 46279d05a7c9e20becbda5a4bfebce202f9206efb31249fa7ae58637b69058f6
-MD5 99f3be5948ff0637f5073e005425a6d3 emul-linux-x86-java-1.6.0-r1.ebuild 2803
-RMD160 a51c7cfa36963168bf27a542d63d76a8ce2df6b4 emul-linux-x86-java-1.6.0-r1.ebuild 2803
-SHA256 46279d05a7c9e20becbda5a4bfebce202f9206efb31249fa7ae58637b69058f6 emul-linux-x86-java-1.6.0-r1.ebuild 2803
-EBUILD emul-linux-x86-java-1.6.0.01.ebuild 2595 RMD160 4d29e8349878bdffe2774d63ba1913ef66803e9c SHA1 1fc11bd07b579b31c88fefc70c458d91be9b6641 SHA256 bd824690b678e126a5737b7105d287daaebd7a817eff9495f18597c814d2fb08
-MD5 4294a01aaf0459f8024ea4de323791fc emul-linux-x86-java-1.6.0.01.ebuild 2595
-RMD160 4d29e8349878bdffe2774d63ba1913ef66803e9c emul-linux-x86-java-1.6.0.01.ebuild 2595
-SHA256 bd824690b678e126a5737b7105d287daaebd7a817eff9495f18597c814d2fb08 emul-linux-x86-java-1.6.0.01.ebuild 2595
 EBUILD emul-linux-x86-java-1.6.0.02.ebuild 2644 RMD160 deb196a31b792d8feb7e18e720ef4e76c954d488 SHA1 703595fc584a0ccf23420108b3252fd152aa89bb SHA256 ec67f2b8e4b100f706ea5986b62b033e662ac8fc42c93a4aa2043f8174ac506e
 MD5 b9e2097ec2b5eaf59f0f9afd9712c0a4 emul-linux-x86-java-1.6.0.02.ebuild 2644
 RMD160 deb196a31b792d8feb7e18e720ef4e76c954d488 emul-linux-x86-java-1.6.0.02.ebuild 2644
 SHA256 ec67f2b8e4b100f706ea5986b62b033e662ac8fc42c93a4aa2043f8174ac506e emul-linux-x86-java-1.6.0.02.ebuild 2644
-EBUILD emul-linux-x86-java-1.6.0.ebuild 3659 RMD160 970fc225d8950dc0135860c92526504c70631cee SHA1 b1ceaaf622594c7cf331ff97aa29b51b1333dfb1 SHA256 5e00d104f73d653b8bb0be41fd07fd593fedefa1b279679f49cb6f25ba42fd48
-MD5 6c1c22f566f7c451798246344ff11416 emul-linux-x86-java-1.6.0.ebuild 3659
-RMD160 970fc225d8950dc0135860c92526504c70631cee emul-linux-x86-java-1.6.0.ebuild 3659
-SHA256 5e00d104f73d653b8bb0be41fd07fd593fedefa1b279679f49cb6f25ba42fd48 emul-linux-x86-java-1.6.0.ebuild 3659
-MISC ChangeLog 7480 RMD160 4cdcef67b24585c9d0951680d500b51e356405e0 SHA1 0953dbd5d01dcc21cb0615a4f9d5ffebc9c45713 SHA256 2d652963f601acc748ac99661ffe31f000f670b48d3f74c0054f1513590dfbbb
-MD5 ed1a3d2056a6baf90a7fac13f6173360 ChangeLog 7480
-RMD160 4cdcef67b24585c9d0951680d500b51e356405e0 ChangeLog 7480
-SHA256 2d652963f601acc748ac99661ffe31f000f670b48d3f74c0054f1513590dfbbb ChangeLog 7480
+MISC ChangeLog 7722 RMD160 331fdbc4b72821b3b311a33516f35a1f6dc8eb77 SHA1 9b8b357c23c50cac5848961fb52d054af47ae09e SHA256 4646cde4c1d6da85e50d9379aa5cbc029e05965f16ad3875856cf9be8fc721d3
+MD5 ba128588fb62fa582558a1497311ede0 ChangeLog 7722
+RMD160 331fdbc4b72821b3b311a33516f35a1f6dc8eb77 ChangeLog 7722
+SHA256 4646cde4c1d6da85e50d9379aa5cbc029e05965f16ad3875856cf9be8fc721d3 ChangeLog 7722
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
 MD5 d7708cacbaa71dba43d860aa46c2ea82 metadata.xml 179
 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe metadata.xml 179
@@ -70,28 +51,16 @@ SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8 metadata
 MD5 132c52c1b863a8946fb168f79619e91d files/digest-emul-linux-x86-java-1.4.2.03-r2 271
 RMD160 3788f95de69c44708182938ec98e905da0b44922 files/digest-emul-linux-x86-java-1.4.2.03-r2 271
 SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/digest-emul-linux-x86-java-1.4.2.03-r2 271
-MD5 ab159652e4126c0070640bec7ba9e05f files/digest-emul-linux-x86-java-1.5.0.11 280
-RMD160 2c4fc8a7626a73fc519c7a15952fcdb4ba615b96 files/digest-emul-linux-x86-java-1.5.0.11 280
-SHA256 d45f41801f33a45e20fcd5d142301f5ab50e31d8964f7aafa1af837c3bde052f files/digest-emul-linux-x86-java-1.5.0.11 280
 MD5 0d96221fc33f680529da21231473fd01 files/digest-emul-linux-x86-java-1.5.0.12 280
 RMD160 ae7dbe5d2a37e6717924e67b5a46d3dd94245983 files/digest-emul-linux-x86-java-1.5.0.12 280
 SHA256 c1f2ae4e1b177f5c22ac2816f61303fd5da311b0aca7ff9b8165b78cd2046e1c files/digest-emul-linux-x86-java-1.5.0.12 280
-MD5 35eac157f9b69bbbd07333c5a6a3f922 files/digest-emul-linux-x86-java-1.6.0 259
-RMD160 1451526c43309c014d81ea9645251f568208a9b5 files/digest-emul-linux-x86-java-1.6.0 259
-SHA256 7bfbfcb961d132341e65eaf06b2fbf36ed8d1387b0fbaa35f160ffc2fb217abe files/digest-emul-linux-x86-java-1.6.0 259
-MD5 35eac157f9b69bbbd07333c5a6a3f922 files/digest-emul-linux-x86-java-1.6.0-r1 259
-RMD160 1451526c43309c014d81ea9645251f568208a9b5 files/digest-emul-linux-x86-java-1.6.0-r1 259
-SHA256 7bfbfcb961d132341e65eaf06b2fbf36ed8d1387b0fbaa35f160ffc2fb217abe files/digest-emul-linux-x86-java-1.6.0-r1 259
-MD5 ee0922da1918727c0c435d9b7d53faba files/digest-emul-linux-x86-java-1.6.0.01 262
-RMD160 c9e6e53a1454b00e5ddcf872268af18cf4b30bcf files/digest-emul-linux-x86-java-1.6.0.01 262
-SHA256 20f7eb548591de853fbfb78b175e27bf5fa9a5259548ca0f95df38e0f0471c4b files/digest-emul-linux-x86-java-1.6.0.01 262
 MD5 5be2a04f7af1cb74822382632271e073 files/digest-emul-linux-x86-java-1.6.0.02 265
 RMD160 e36748f33160800177a0fa7c6b5fb5a11226bea1 files/digest-emul-linux-x86-java-1.6.0.02 265
 SHA256 d49ac42bd6f13a8df61fda465f544d350147740f73c891b487ba23fe8e0e2b5e files/digest-emul-linux-x86-java-1.6.0.02 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGxXU5cxLzpIGCsLQRAgoIAJ947I/2SvIUUlJ1j0vu63fz33Kp+QCeMnWm
-BIHdw9urpsABgCvdxxB+f+A=
-=kOTn
+iD8DBQFGxXXHcxLzpIGCsLQRAn9OAKCAw7p44adFkePOKvQlzCDAp0RIwACfeb1A
+gsdtepg8YXR2F6ON4V2YgQo=
+=ofzA
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild
deleted file mode 100644
index 735cf3779b23..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2007 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.11.ebuild,v 1.6 2007/07/22 10:21:07 dberkholz Exp $
-
-inherit java-vm-2 eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-At="jdk-${MY_PVA}-dlj-linux-i586.bin"
-DESCRIPTION="32bit version Sun's J2SE Development Kit"
-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? ( media-libs/alsa-lib )
-	X? ( x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXt
-		x11-libs/libXtst )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-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"
-
-QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	if [[ ! -r ${DISTDIR}/${At} ]]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	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"
-
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html
-	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
-	fi
-
-	# TODO Don't think we still needs these -nichoj
-	# 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
-
-	# 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
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	# 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 java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/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
-
-	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-r1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0-r1.ebuild
deleted file mode 100644
index d96d7ab0d59e..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2007 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-r1.ebuild,v 1.4 2007/07/22 10:21:07 dberkholz Exp $
-
-inherit pax-utils java-vm-2 eutils
-
-#MY_PVL=${PV%.*}_${PV##*.}
-#MY_PVA=${PV//./_}
-
-#At="jdk-${MY_PVA}-dlj-linux-i586.bin"
-At="jdk-6-dlj-linux-i586.bin"
-DESCRIPTION="32bit version Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.6.0/"
-SRC_URI="http://download.java.net/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? ( media-libs/alsa-lib )
-	X? ( x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXt
-		x11-libs/libXtst )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-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"
-
-src_unpack() {
-	if [[ ! -r ${DISTDIR}/${At} ]]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	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"
-
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-
-	pax-mark m $(list-paxables "${D}"/opt/${P}/bin/*)
-
-	dodoc  README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html
-	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
-	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
-}
-
-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."
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.01.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.01.ebuild
deleted file mode 100644
index 73c8d6acf852..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.01.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2007 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.01.ebuild,v 1.4 2007/07/22 10:21:07 dberkholz 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.sh"
-DESCRIPTION="32bit version Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.6.0/"
-SRC_URI="http://download.java.net/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 )"
-
-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"
-
-src_unpack() {
-	if [[ ! -r ${DISTDIR}/${A} ]]; then
-		die "cannot read ${DISTDIR}/${A}. Please check the permission and try again."
-	fi
-
-	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"
-
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
-
-	pax-mark m $(list-paxables "${D}"/opt/${P}/bin/*)
-
-	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
-	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
-}
-
-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."
-}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild
deleted file mode 100644
index e1c900c6f77e..000000000000
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.6 2007/07/22 10:21:07 dberkholz Exp $
-
-inherit java-vm-2 eutils
-
-#MY_PVL=${PV%.*}_${PV##*.}
-#MY_PVA=${PV//./_}
-
-#At="jdk-${MY_PVA}-dlj-linux-i586.bin"
-At="jdk-6-dlj-linux-i586.bin"
-DESCRIPTION="32bit version Sun's J2SE Development Kit"
-HOMEPAGE="http://java.sun.com/j2se/1.6.0/"
-SRC_URI="http://download.java.net/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? ( media-libs/alsa-lib )
-	X? ( x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXt
-		x11-libs/libXtst )"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-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"
-
-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"
-
-src_unpack() {
-	if [[ ! -r ${DISTDIR}/${At} ]]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	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"
-
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc  README THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html
-	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
-	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
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	# 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 java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/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
-
-	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/digest-emul-linux-x86-java-1.5.0.11 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.11
deleted file mode 100644
index 77d5a8b673d7..000000000000
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9dfdad6a166ed403513c0a5509d82e4b jdk-1_5_0_11-dlj-linux-i586.bin 49598681
-RMD160 74c5bd78450397006ea145580c3554d77b64a31d jdk-1_5_0_11-dlj-linux-i586.bin 49598681
-SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705 jdk-1_5_0_11-dlj-linux-i586.bin 49598681
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0
deleted file mode 100644
index 451ffa45a63d..000000000000
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f4481c4e064cec06a65d7751d9105c6d jdk-6-dlj-linux-i586.bin 62718862
-RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac jdk-6-dlj-linux-i586.bin 62718862
-SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 jdk-6-dlj-linux-i586.bin 62718862
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0-r1 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0-r1
deleted file mode 100644
index 451ffa45a63d..000000000000
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f4481c4e064cec06a65d7751d9105c6d jdk-6-dlj-linux-i586.bin 62718862
-RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac jdk-6-dlj-linux-i586.bin 62718862
-SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 jdk-6-dlj-linux-i586.bin 62718862
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.01 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.01
deleted file mode 100644
index 6ae969b94c5c..000000000000
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.6.0.01
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d572feb1dbcf06a039d4e536cca708f jdk-6u1-dlj-linux-i586.sh 62816950
-RMD160 469824d7745e4f71aac29dabf2f6af9c084a5f91 jdk-6u1-dlj-linux-i586.sh 62816950
-SHA256 0919b6b20f982cf488f20c16c78fa705434481822db88b06bb5beb01970cc508 jdk-6u1-dlj-linux-i586.sh 62816950