Cleanup vulnerable versions.

Package-Manager: portage-2.1.3_rc8

8 files changed, 10 insertions, 481 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 073ec4f01023..435bf52b9e6a 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.105 2007/07/22 18:59:26 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.106 2007/07/22 21:08:29 caster Exp $
+
+  22 Jul 2007; Vlastimil Babka <caster@gentoo.org>
+  -sun-jre-bin-1.4.2.14.ebuild, -sun-jre-bin-1.5.0.11.ebuild,
+  -sun-jre-bin-1.6.0.01-r1.ebuild:
+  Cleanup vulnerable versions.
 
   22 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
   sun-jre-bin-1.5.0.12.ebuild, sun-jre-bin-1.6.0.02.ebuild:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 9efd4f8d59e6..96c329d76223 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX construct-1.6.sh 6798 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 SHA1 014a26831f8f3cee9653d42cd194216cda2e1787 SHA256 32639949b003703e236257f3d2d3272659ab89c80b2819bdb552af2d5f3070d7
 MD5 7d7c11a7876fbf6faa240eba586f7793 files/construct-1.6.sh 6798
 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 files/construct-1.6.sh 6798
@@ -25,70 +22,37 @@ AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1
 MD5 27f75fd381ee6bd36aa37f540323185b files/sun-jre-bin-1.6.env 891
 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 files/sun-jre-bin-1.6.env 891
 SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09 files/sun-jre-bin-1.6.env 891
-DIST j2re-1_4_2_14-linux-i586.bin 14373288 RMD160 7054f23ae3a4fd304dfbb7e9c73da8462507c720 SHA1 28704686d1200cc1830a03c48452731f04603888 SHA256 1d211f9f2f34f108d9f3fde745838965b83695301d953775e60fcf8cc3c163d3
 DIST j2re-1_4_2_15-linux-i586.bin 14379874 RMD160 59dbbc023495f558ad36361a2c4b98c98c6a71d8 SHA1 ce44b3a5f5dba895d9c8b0b2b0474d1b68cb772c SHA256 c62c136cfd5a9ad1ae0e552fa4704089b874ec52419811aa4dd80240720d7464
-DIST jdk-1_5_0_11-dlj-linux-amd64.bin 43954177 RMD160 bd865019d3fb2268800696207dba158ea2986a7f SHA1 151315b9eb70f81ac88712e151da5c0a5aeaca23 SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db
-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-amd64.bin 43854594 RMD160 b9790d2cc33c7c7f749f6fd055da2b215c054dff SHA1 80566a30c2d065668a97db8b229f3515817e6c2d SHA256 7be91d7544ac682c28bfcad60fa7856303e70fbf8e9857a93d701553dc40c144
 DIST jdk-1_5_0_12-dlj-linux-i586.bin 49646174 RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 SHA1 ff909ca469587ae132816868c5f201757e533ed0 SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0
-DIST jdk-6u1-dlj-linux-amd64.sh 56395232 RMD160 90f03c9359808126c73abedabed765a1191e04f0 SHA1 e2656303a3b0eef237f2cd233a3bd28185c65f12 SHA256 13b40146ef514ff6756b35a7d26ed2e8e84cadcfbbd24d1cbb35d871d9b7e78b
-DIST jdk-6u1-dlj-linux-i586.sh 62818812 RMD160 2858ae3036db3315c6bbd2bd43cd05cf0af6e43e SHA1 1f35c785e810d3c0ff012c79c7ffa509eb01dae5 SHA256 1a49eaadcaf480c9eec4aa558ab7392e93b7c88b8f79f53be9a8fc03a6714ddc
 DIST jdk-6u2-dlj-linux-amd64.bin 51985841 RMD160 a137169b04acf1e95a63490bd238c3c18c4c568d SHA1 ad7b4356025d5af917d232f87d8efe9fa0726eb8 SHA256 5a06581756e8e8076f00ec096f9ad02bcbd032cbaafcc3e1324de094a3aad7be
 DIST jdk-6u2-dlj-linux-i586.bin 58408110 RMD160 3b0c124693401ebc07dea50dfbf05bc9c2d47c28 SHA1 d3e58749ffb457ea338facb86bd800d084e98fe1 SHA256 6d25968debfcac1397fb3dc36c505d0cce8f787f0fc135aab8d6a7d517df68c2
-EBUILD sun-jre-bin-1.4.2.14.ebuild 4627 RMD160 d1525be7baa1d9e23803eb2d1a5941f5a789b1c3 SHA1 9749429fc69e6c582fb8c1c8867aa4677dc34d14 SHA256 9221160aa58835fff15763fb82517c77beb6ea639c7243ebfabacd4e7b56c974
-MD5 883e8cef02883ec0031210034020b74d sun-jre-bin-1.4.2.14.ebuild 4627
-RMD160 d1525be7baa1d9e23803eb2d1a5941f5a789b1c3 sun-jre-bin-1.4.2.14.ebuild 4627
-SHA256 9221160aa58835fff15763fb82517c77beb6ea639c7243ebfabacd4e7b56c974 sun-jre-bin-1.4.2.14.ebuild 4627
 EBUILD sun-jre-bin-1.4.2.15.ebuild 3680 RMD160 eb1bfc7dd7c2bbba1706479da53d2663cdc49d77 SHA1 fcf8e7e05a019a4a94127835c3b000edb74dd924 SHA256 208e500fc741292a8e539f4ad6a7a1db56b94ee9174639350d99c73d7d3724f0
 MD5 b503bef7bb666d18d44109b10ce845a7 sun-jre-bin-1.4.2.15.ebuild 3680
 RMD160 eb1bfc7dd7c2bbba1706479da53d2663cdc49d77 sun-jre-bin-1.4.2.15.ebuild 3680
 SHA256 208e500fc741292a8e539f4ad6a7a1db56b94ee9174639350d99c73d7d3724f0 sun-jre-bin-1.4.2.15.ebuild 3680
-EBUILD sun-jre-bin-1.5.0.11.ebuild 3743 RMD160 5616cadbaf96c91348b69443458c18f40ab28529 SHA1 2379c0793ceeab6a622771e824bd6e23b1ec5ed2 SHA256 bea0e1202b8e51d90a8f2d594bad6aa6fa2a63d0af519faf8b69822a0ffa40dd
-MD5 27fd27207db9212580ecf27601db2c1a sun-jre-bin-1.5.0.11.ebuild 3743
-RMD160 5616cadbaf96c91348b69443458c18f40ab28529 sun-jre-bin-1.5.0.11.ebuild 3743
-SHA256 bea0e1202b8e51d90a8f2d594bad6aa6fa2a63d0af519faf8b69822a0ffa40dd sun-jre-bin-1.5.0.11.ebuild 3743
 EBUILD sun-jre-bin-1.5.0.12.ebuild 3578 RMD160 341eb0cd727f81368a2d0adf102315e5f4d5a02b SHA1 e4d6d4d0093d2e7d6f358f12af1a0da46e392042 SHA256 30454ca07a66a1150cc8a2280a7020a6c4ddc8191fb133e7cb7d3dfea62294d5
 MD5 8b958cb6ff1a310eca0cc0080eb291a8 sun-jre-bin-1.5.0.12.ebuild 3578
 RMD160 341eb0cd727f81368a2d0adf102315e5f4d5a02b sun-jre-bin-1.5.0.12.ebuild 3578
 SHA256 30454ca07a66a1150cc8a2280a7020a6c4ddc8191fb133e7cb7d3dfea62294d5 sun-jre-bin-1.5.0.12.ebuild 3578
-EBUILD sun-jre-bin-1.6.0.01-r1.ebuild 3803 RMD160 d2f743f25b3527c9e217e7373aa971c0706d480b SHA1 cf14e537fd753ffbf5ac396b7126e7008b69a987 SHA256 7d3ad3bdc7e59648b573ff65facbfb0af1b5ca0098a68dadbf5e84c4bd5c9bac
-MD5 c029c8eed2bd9a763ea85cfccf32652a sun-jre-bin-1.6.0.01-r1.ebuild 3803
-RMD160 d2f743f25b3527c9e217e7373aa971c0706d480b sun-jre-bin-1.6.0.01-r1.ebuild 3803
-SHA256 7d3ad3bdc7e59648b573ff65facbfb0af1b5ca0098a68dadbf5e84c4bd5c9bac sun-jre-bin-1.6.0.01-r1.ebuild 3803
 EBUILD sun-jre-bin-1.6.0.02.ebuild 3609 RMD160 51b5b8a741a37f9c234467637dcf1e3af5096a25 SHA1 b766894b556748b61a0ca99b8b50e015a672e779 SHA256 67cb8a2e43279d7786c99df693debcea038124f70c5081a4b4dfe25881af4dc3
 MD5 94867dc2fef43b4f95f29f2c43f03f90 sun-jre-bin-1.6.0.02.ebuild 3609
 RMD160 51b5b8a741a37f9c234467637dcf1e3af5096a25 sun-jre-bin-1.6.0.02.ebuild 3609
 SHA256 67cb8a2e43279d7786c99df693debcea038124f70c5081a4b4dfe25881af4dc3 sun-jre-bin-1.6.0.02.ebuild 3609
-MISC ChangeLog 18977 RMD160 75909fb9867db69ea0437ef49f6e01530441a09d SHA1 8dc5620c40ef253ae051623a995a02275aa50b72 SHA256 f613a2a1d665fedeb7cec856e4d83fedb49c68241cd2a3d1b799d4ac7bfef79a
-MD5 b37488c31384569315642110435ae147 ChangeLog 18977
-RMD160 75909fb9867db69ea0437ef49f6e01530441a09d ChangeLog 18977
-SHA256 f613a2a1d665fedeb7cec856e4d83fedb49c68241cd2a3d1b799d4ac7bfef79a ChangeLog 18977
+MISC ChangeLog 19153 RMD160 158407b0081d7e6d6b4f559ff71c751fe40a8c22 SHA1 8cc81e5b6156d46d01730a22ef6ef3a4d417ecfa SHA256 989dc958d1f4b75d88d4cd14febe08cc3962e05fbfdc8156d1310ece980a4427
+MD5 ba25dc256b40ac2a55281aa7084503a8 ChangeLog 19153
+RMD160 158407b0081d7e6d6b4f559ff71c751fe40a8c22 ChangeLog 19153
+SHA256 989dc958d1f4b75d88d4cd14febe08cc3962e05fbfdc8156d1310ece980a4427 ChangeLog 19153
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
 MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240
 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240
 SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f metadata.xml 240
-MD5 070ceb09f81531b78a08dea1545ad98f files/digest-sun-jre-bin-1.4.2.14 271
-RMD160 02e004d8c192e9333e0d0212af899e827f40c886 files/digest-sun-jre-bin-1.4.2.14 271
-SHA256 6b13dcea204a1fef7f2ff53dd6e222d2d747ee0b2b9f5d56d5a5cfd3b86207f4 files/digest-sun-jre-bin-1.4.2.14 271
 MD5 a44fd16ec6662c70babe6b055e55dced files/digest-sun-jre-bin-1.4.2.15 271
 RMD160 9f32106eb11986b15518639cfc77e423d38391c2 files/digest-sun-jre-bin-1.4.2.15 271
 SHA256 a87b2556a700fa7bb3a1131de7f4b495d9d3bb87db7b87db59319f206f820c18 files/digest-sun-jre-bin-1.4.2.15 271
-MD5 03a3655dea58f8ecfdf9b222a82c13d1 files/digest-sun-jre-bin-1.5.0.11 563
-RMD160 baf28f80473123c2c382cda0d6e3908a455aec27 files/digest-sun-jre-bin-1.5.0.11 563
-SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/digest-sun-jre-bin-1.5.0.11 563
 MD5 b3ed855f254e21db31908fe33e52e40c files/digest-sun-jre-bin-1.5.0.12 563
 RMD160 79e7250f7ad67e1a6710e7d94c89673fd4b468dc files/digest-sun-jre-bin-1.5.0.12 563
 SHA256 fe20684f392de1933a60985b262579874f0843a67ce16a1c9031ce8ece643c60 files/digest-sun-jre-bin-1.5.0.12 563
-MD5 c351694f359d60ac17fdc34f10212d9e files/digest-sun-jre-bin-1.6.0.01-r1 527
-RMD160 252605024d150447c298546438d37cafc9fcef1f files/digest-sun-jre-bin-1.6.0.01-r1 527
-SHA256 a3bbd6c7a23eeeab99bb3b1a4f67b9347bb4c2531b1ec4c381fd5d9d8e2ee327 files/digest-sun-jre-bin-1.6.0.01-r1 527
 MD5 7daf7303b9ba2943cfead2d83a4cf861 files/digest-sun-jre-bin-1.6.0.02 533
 RMD160 1166d18196ddbcdca039b8bca3a3418927658385 files/digest-sun-jre-bin-1.6.0.02 533
 SHA256 39e2a11f8029e348569b7be33139c6841e340440c1fd45591427dc3f9eb9481d files/digest-sun-jre-bin-1.6.0.02 533
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGo6kYCkvF58q80IkRAmZbAKCHQz9jkokN+av3QRMQmj94oj8CpgCeJVuq
-WQPtGee4hqAgthTSvfd2Cso=
-=H3CZ
------END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.14 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.14
deleted file mode 100644
index 5d53b3ab4198..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d7fc76d19c0800b0f94e1e7a781885df j2re-1_4_2_14-linux-i586.bin 14373288
-RMD160 7054f23ae3a4fd304dfbb7e9c73da8462507c720 j2re-1_4_2_14-linux-i586.bin 14373288
-SHA256 1d211f9f2f34f108d9f3fde745838965b83695301d953775e60fcf8cc3c163d3 j2re-1_4_2_14-linux-i586.bin 14373288
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11
deleted file mode 100644
index e6f312fcc9a8..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.11
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ace2fc1b8c9d381b4e297c66c5a9caa7 jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-RMD160 bd865019d3fb2268800696207dba158ea2986a7f jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db jdk-1_5_0_11-dlj-linux-amd64.bin 43954177
-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/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1
deleted file mode 100644
index 7f5d8d6c8fb8..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 177f241f071396f5f3d3c42ed82c2ecc jdk-6u1-dlj-linux-amd64.sh 56395232
-RMD160 90f03c9359808126c73abedabed765a1191e04f0 jdk-6u1-dlj-linux-amd64.sh 56395232
-SHA256 13b40146ef514ff6756b35a7d26ed2e8e84cadcfbbd24d1cbb35d871d9b7e78b jdk-6u1-dlj-linux-amd64.sh 56395232
-MD5 644a588f1ea9417fbf23b3e5505bbf8c jdk-6u1-dlj-linux-i586.sh 62818812
-RMD160 2858ae3036db3315c6bbd2bd43cd05cf0af6e43e jdk-6u1-dlj-linux-i586.sh 62818812
-SHA256 1a49eaadcaf480c9eec4aa558ab7392e93b7c88b8f79f53be9a8fc03a6714ddc jdk-6u1-dlj-linux-i586.sh 62818812
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild
deleted file mode 100644
index 5e7ab55dccb2..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.14.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2007 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.14.ebuild,v 1.5 2007/07/22 09:29:36 graaff Exp $
-
-inherit java-vm-2 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="X alsa nsplugin"
-
-DEPEND="sys-apps/sed"
-
-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
-	)"
-
-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"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/libawt.so
-	opt/${P}/plugin/i386/ns4/libjavaplugin.so
-	opt/${P}/plugin/i386/ns610/libjavaplugin_oji.so
-	opt/${P}/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(accept the license, then click on 'self-extracting file' under 'Linux Platform')"
-	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 '\0177\0105\0114\0106\0001\0001\0001')
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		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 -pPR $i ${D}/opt/${P}/
-	done
-
-	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html ControlPanel.html
-
-	if use nsplugin; then
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	fi
-
-	# bug #147259
-	dosym ../javaws/javaws /opt/${P}/bin/javaws
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch ${D}/opt/${P}/.systemPrefs/.system.lock
-	chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock
-	touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-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
-}
-
-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 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
-
-	if ! use X; then
-		echo
-		ewarn "Some parts of Sun's JDK require X11 libraries to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild
deleted file mode 100644
index ee8a9935b84b..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.11.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2007 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.11.ebuild,v 1.6 2007/07/22 09:29:36 graaff Exp $
-
-inherit pax-utils eutils java-vm-2
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-#S="${WORKDIR}/jdk${MY_PVL}"
-
-X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-RDEPEND="
-	sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXt
-		x11-libs/libXtst
-	)"
-
-DEPEND=""
-
-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_x86="opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so"
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${A} ]; then
-		die "cannot read ${A}. Please check the permission and try again."
-	fi
-
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash ${FILESDIR}/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_install() {
-	local dirs="bin lib man"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables ${S}/bin/*)
-
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} 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 || die
-	dohtml Welcome.html || die
-	dodir /opt/${P}/share/
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	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
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties \
-		fontconfig.properties || die
-
-	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."
-
-	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/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild
deleted file mode 100644
index af982070401b..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild,v 1.5 2007/07/22 09:29:36 graaff Exp $
-
-inherit versionator pax-utils eutils java-vm-2
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-X86_AT="jdk-${MY_PV}-dlj-linux-i586.sh"
-AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.sh"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.6"
-LICENSE="dlj-1.1"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
-IUSE="X alsa nsplugin"
-
-RDEPEND="
-	sys-libs/glibc
-	x86? ( =virtual/libstdc++-3.3 )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXt
-		x11-libs/libXtst
-	)"
-
-DEPEND=""
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/libdeploy.so
-	opt/${P}/lib/i386/server/libjvm.so"
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${A} ]; then
-		die "cannot read ${A}. Please check the permission and try again."
-	fi
-
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash ${FILESDIR}/construct-1.6.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-}
-
-src_install() {
-	local dirs="bin lib man"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables ${S}/bin/*)
-
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
-
-	dodoc README THIRDPARTYLICENSEREADME.txt || die
-	dohtml Welcome.html || die
-	dodir /opt/${P}/share/
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	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
-
-	# install control panel for Gnome/KDE
-	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
-		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
-			${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-			${T}/sun_jre-${SLOT}.desktop || die
-		domenu ${T}/sun_jre-${SLOT}.desktop || die
-	fi
-
-	# bug #56444
-	insinto /opt/${P}/lib/
-	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
-
-	set_java_env
-}
-
-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"
-}