Version bump, security bug #287490.

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

4 files changed, 20 insertions, 243 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index e96cf6d3b1b7..ee3968995c74 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.209 2009/10/15 15:08:47 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.210 2009/10/18 19:52:15 caster Exp $
+
+*ibm-jdk-bin-1.6.0.6 (18 Oct 2009)
+
+  18 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jdk-bin-1.6.0.0.ebuild, -ibm-jdk-bin-1.6.0.4.ebuild,
+  +ibm-jdk-bin-1.6.0.6.ebuild:
+  Version bump, security bug #287490.
 
   15 Oct 2009; Mounir Lamouri <volkmar@gentoo.org>
   ibm-jdk-bin-1.5.0.10.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index db1cd883060a..7ddc8db978f9 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -11,26 +11,22 @@ DIST IBMJava2-SDK-1.4.2-13.0.ppc.tgz 67149283 RMD160 d4fbdecbffcce41a30c099f2663
 DIST IBMJava2-SDK-1.4.2-13.0.ppc64.tgz 65363596 RMD160 6878cf80813a216e8368e706ff6f4417d2f92c1d SHA1 c95fbd1bfad15cb3d88c8e97eb0894e772843602 SHA256 2f68c37f6d9717396e7f9fbfa92af4cdd16769c4f6e1fe19b994f90916037fe5
 DIST IBMJava2-SDK-1.4.2-13.0.tgz 59094335 RMD160 77235dd15bd0c11fd66ddcfa27f16211dcdd6201 SHA1 6e58988f6099e388899f62f3777493935d130e7c SHA256 f631218b86ac7bba487e0beca091ce832d9c8ba137c05ac6785385ebc1535667
 DIST IBMJava2-SDK-AMD64-1.4.2-13.0.x86_64.tgz 57358200 RMD160 5d90751932d5e0a64f05e197b69ccd8f1f30c34b SHA1 7a5525a0f573bb862ec0be24a1d7b3c2e3f06fe1 SHA256 67559e72b8a5df7d1e8d5a790cda98395629da9be3d9f371ccebafa4a9cf7844
-DIST ibm-java-javacomm-6.0-4.0-linux-i386.tgz 336897 RMD160 c22d3ad9d09f869ec743fab599463a9dbea0511e SHA1 6b645130654596096ee3949c530d1c2fc49c62f1 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
-DIST ibm-java-javacomm-6.0-4.0-linux-ppc.tgz 343028 RMD160 711d942d7895ea016d060d2f0db549a5fda130e4 SHA1 3932368b932bb3e69b05e4995aad0b57baf9eea3 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
-DIST ibm-java-javacomm-6.0-4.0-linux-ppc64.tgz 342371 RMD160 57f9d943079ace31ea5777717c449c79ccefd4a8 SHA1 e54dd49c71bb014af3e33a05579b60a7e0751186 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
-DIST ibm-java-javacomm-6.0-4.0-linux-x86_64.tgz 339256 RMD160 ec5f116aca6c534528572b73c1a8db3ac936b67d SHA1 39c32392233baadfb234b54b7f44c67c48166d20 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c
 DIST ibm-java-javacomm-6.0-5.0-linux-i386.tgz 336897 RMD160 c22d3ad9d09f869ec743fab599463a9dbea0511e SHA1 6b645130654596096ee3949c530d1c2fc49c62f1 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
 DIST ibm-java-javacomm-6.0-5.0-linux-ppc.tgz 343028 RMD160 711d942d7895ea016d060d2f0db549a5fda130e4 SHA1 3932368b932bb3e69b05e4995aad0b57baf9eea3 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
 DIST ibm-java-javacomm-6.0-5.0-linux-ppc64.tgz 342371 RMD160 57f9d943079ace31ea5777717c449c79ccefd4a8 SHA1 e54dd49c71bb014af3e33a05579b60a7e0751186 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
 DIST ibm-java-javacomm-6.0-5.0-linux-x86_64.tgz 339256 RMD160 ec5f116aca6c534528572b73c1a8db3ac936b67d SHA1 39c32392233baadfb234b54b7f44c67c48166d20 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c
-DIST ibm-java-sdk-6.0-0.0-linux-i386.tgz 86573879 RMD160 6489716e491907193c0d27050d08b3a1e1ab0a44 SHA1 0d7186d76eb1d79b245ff84342905af972e74b34 SHA256 c72e43e1f52e5910f84634ce87f186a4832dc73f93adc6a727a2069b62cd4a1d
-DIST ibm-java-sdk-6.0-0.0-linux-ppc.tgz 88854304 RMD160 626bec6e1f97e3fb214915c4e51421b5e206bd5d SHA1 d17570549080fd434c973298b68ee6e11eb273dd SHA256 b299eca3276a35b794f9543768e51e707051dda74d819d67f0d6660352be36f7
-DIST ibm-java-sdk-6.0-0.0-linux-ppc64.tgz 90297044 RMD160 23e96a95c714bfe8e0384d806e056c6228386d89 SHA1 a5a515b312c42fd526e6ccbbe21f0d736f32a6b7 SHA256 0aa829dc7498bcb8031de2f759622bc754981a7417a89e434d1b87b4f59e41a2
-DIST ibm-java-sdk-6.0-0.0-linux-x86_64.tgz 84220678 RMD160 be7dbbc05c6ff5d0108d49be3610ee3d1aa4b379 SHA1 eac9beb66734a3d4d95b0287797769c877b0e81a SHA256 d43a7bf89e1457bfc68464fc84d9533d6d49f4cebb354ee0a12ce6dff9f6a191
-DIST ibm-java-sdk-6.0-4.0-linux-i386.tgz 90258217 RMD160 21b739c30ffcbfbd1fc552ae4125d77c7cf726d5 SHA1 3b7458e41e27533718f9feeba03e663cafc530de SHA256 24ee9721250504cf0599d3a1344d5e18985f2fdde3500e20307692579abe85d0
-DIST ibm-java-sdk-6.0-4.0-linux-ppc.tgz 92415505 RMD160 44fb6752a5fbaaeb4a5858d5aa62fbfc6b6ec239 SHA1 3f3f0544a91e3f26142383cc5d2f573174bb7994 SHA256 4f190afa6b428b9d9f8dce992e55e37790537b860ca4c223c21234092c31d3d1
-DIST ibm-java-sdk-6.0-4.0-linux-ppc64.tgz 96947121 RMD160 57e7579de3e241954353320f6ab4b25c9b8514b0 SHA1 e5c59073547405903a61fce0e165bfbe551dac24 SHA256 ddd38464395042ff60a3578ce43bdbe96f8ec5061fa18a2be2545e302f6137da
-DIST ibm-java-sdk-6.0-4.0-linux-x86_64.tgz 88254741 RMD160 3269fb539da0e20555d15bcd27522188456c57e4 SHA1 1c0f9580101d01c9e254f43d82cb79d6af18a00e SHA256 2ede679ebef141bb0abc07f85307b197dbb1b14aefdde24b3bbc13574649541d
+DIST ibm-java-javacomm-6.0-6.0-linux-i386.tgz 336897 RMD160 c22d3ad9d09f869ec743fab599463a9dbea0511e SHA1 6b645130654596096ee3949c530d1c2fc49c62f1 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
+DIST ibm-java-javacomm-6.0-6.0-linux-ppc.tgz 343028 RMD160 711d942d7895ea016d060d2f0db549a5fda130e4 SHA1 3932368b932bb3e69b05e4995aad0b57baf9eea3 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
+DIST ibm-java-javacomm-6.0-6.0-linux-ppc64.tgz 342371 RMD160 57f9d943079ace31ea5777717c449c79ccefd4a8 SHA1 e54dd49c71bb014af3e33a05579b60a7e0751186 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
+DIST ibm-java-javacomm-6.0-6.0-linux-x86_64.tgz 339256 RMD160 ec5f116aca6c534528572b73c1a8db3ac936b67d SHA1 39c32392233baadfb234b54b7f44c67c48166d20 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c
 DIST ibm-java-sdk-6.0-5.0-linux-i386.tgz 91908789 RMD160 6dea3c05627e1f80944f7d63d1eebfce8e502d89 SHA1 6b56acb94d003089015d36d537080b4548e5c5aa SHA256 79ff87ac2615dbdc4f6bd8bc1bac8e23f2aee6c72862cd94a6895ad0f6477424
 DIST ibm-java-sdk-6.0-5.0-linux-ppc.tgz 94077034 RMD160 f9c477b40fb8c7f7d1fb3f49cbffca00e9de15c5 SHA1 57b99a36455294a8829c0333eef773129151f1b6 SHA256 163ace45acc31ef7025d4000067ad6c26ee33f09f8ee691815c08bc0330f4b88
 DIST ibm-java-sdk-6.0-5.0-linux-ppc64.tgz 98352471 RMD160 0c6f63cc5a8d78b37d5bf771385604e943743692 SHA1 f7d28c726f16731c42d6415bfc61addca1ef8add SHA256 876ab123496a26f29e950a7e404b84d928c3a7760b9155b59bf66a1952be4cce
 DIST ibm-java-sdk-6.0-5.0-linux-x86_64.tgz 89419783 RMD160 5cb733ca1aa0626294aea6ab531df4be16a84117 SHA1 5369f40393292754af97a436515593f50c5aa9e7 SHA256 f94aba4597eccfa60cbe0dd46c1e87c7864a87c80371d39f67f59c01a57e5dfb
+DIST ibm-java-sdk-6.0-6.0-linux-i386.tgz 92341726 RMD160 9c8345dcbc7be831ff5f0bce1dbe61136559f253 SHA1 fd24679229fda5b05f4e42b0d000e2c16a09d559 SHA256 ca5b9ab1e0fd0beff4b6b475f0b4a441e06e4f7ffe4cac4acd71f2eb51dea46a
+DIST ibm-java-sdk-6.0-6.0-linux-ppc.tgz 94489677 RMD160 5c1388df06abccff56acb5c9fabfee226f12b357 SHA1 eaeb66aa6a8b24f00835b4fea0d70a18f040da1d SHA256 7879d3bbd04692ad537cd2fbbb5f9357752aec6bac4dac448cdd4ec3a91f23f5
+DIST ibm-java-sdk-6.0-6.0-linux-ppc64.tgz 96885825 RMD160 ddfb1b739375cfd9c44c14a57d3734fcceb70138 SHA1 4267ab643392eb737d7a648b22ef242f34575a57 SHA256 110cb9d9582f24ed87057e10b063bc18b72d1ee09258196ee68519a31ecc8734
+DIST ibm-java-sdk-6.0-6.0-linux-x86_64.tgz 93411950 RMD160 29b31df7fb68035c5e54b3e7ea6b77ba60450d69 SHA1 911425b011947ff427bf80ff68924c1e9598c3f6 SHA256 f868cf14274c38c53fda52c1821639e1dfa60477463c6dd997b23714f95b97a7
 DIST ibm-java2-javacomm-5.0-10.0-linux-i386.tgz 120018 RMD160 55f92b556fb60c13743e9ba9bcd02297e4459e9d SHA1 d2a0e18d30c91d6d72043a2f1a5ca3ee4df6e11c SHA256 72ab8e1c0f9617c63fc991def5e196945a7704d48455cf240639d90ab965ce5c
 DIST ibm-java2-javacomm-5.0-10.0-linux-ppc.tgz 124733 RMD160 f542634f87becaf330996c073d1fbe9f5e1b9b10 SHA1 47ea6ba585e6512b1526e271ad96767f11468ccc SHA256 8d8067a30a8a8ea0d44eb65cea4ef3a929168da2ba281a26513f8106eb0b307e
 DIST ibm-java2-javacomm-5.0-10.0-linux-ppc64.tgz 128252 RMD160 b2d26cfb219f412a71bbda89ed6c64413abc3fd0 SHA1 d4a80a4c7f7a08b01d73558c808be225523bdef2 SHA256 6a9c40dd4d9f7ab8fa07bcbefc8ff0b531e3e06807f820e62aa1777d5c1b2cd6
@@ -47,15 +43,10 @@ DIST ibm-java2-sdk-5.0-9.0-linux-i386.tgz 65023960 RMD160 55821a14427ad8494f3175
 DIST ibm-java2-sdk-5.0-9.0-linux-ppc.tgz 72849470 RMD160 745bfae794ecc9fdfa0a5d98782699e499e068fe SHA1 9688a553e4687171c8f3f9ca1840928f7c9e04b2 SHA256 5399d02e7d63272f609c94189a31dd39f67633d62525422e402905d95782cbe8
 DIST ibm-java2-sdk-5.0-9.0-linux-ppc64.tgz 70883997 RMD160 783260752b670a709b431586635412f1ee7db9a9 SHA1 5ef4657bdda2d65486978515ea578d74d4366570 SHA256 4654a4d6ced5a7e0503c41e54cd25f2c5c9823acd4f6b213f224c04b02b064d5
 DIST ibm-java2-sdk-5.0-9.0-linux-x86_64.tgz 66597248 RMD160 7cf8f8349a0e551cc39e02d6d7d914dbcef500ef SHA1 cac186135ac63c8efa2f0ac54a1eda1cfec5a34b SHA256 db370edb5197c5308ab5c667c27aebf5d780ef53724338666eaea6400601ee5f
-DIST ibm-javacomm-3.0-0.0-linux-i386.tgz 398689 RMD160 ef72d2210532f8534184b9c578705edd41ed7741 SHA1 a8a00d1110a172a47da2c6c9e4dd2664db3acb6d SHA256 6f438ec0a13e00645ba6e68ee0b16cc85df9f0295cab3479b107765b17a8c836
-DIST ibm-javacomm-3.0-0.0-linux-ppc.tgz 403218 RMD160 b791c0b5a2f8dd8165bda31443b689201137ded3 SHA1 442747354d2a74c3970f5ed2c8a7cd5558fe2111 SHA256 1dfc49f3b93ca01b25f3dc4a315232754910da8c7b50d26413ef9352414e388d
-DIST ibm-javacomm-3.0-0.0-linux-ppc64.tgz 407966 RMD160 d7c1185660e680b4f8d2a3591616cb29be6cee83 SHA1 c257cdf07b3a379e51718c4f4360c501d15600a5 SHA256 ef135dc9b13484b6b5bc81c11d186de1d65ca4db2dde765c4a8b41a4970f1fe8
-DIST ibm-javacomm-3.0-0.0-linux-x86_64.tgz 401081 RMD160 ac9e7fe4dfc47e7b54bd01e9b806644bcfcf1a8c SHA1 adab954713c52d419ea47b7266a59b90d6f71161 SHA256 181cc8d90a3404345a40dc11b4f83230d919cdce025256418483314d11f91dfd
 EBUILD ibm-jdk-bin-1.4.2.13.ebuild 5026 RMD160 9cb6c1147e87a3a3c9791ac4f973af3aa06040a8 SHA1 fb28abe5605acfa051f730aa01f60fb9f72040cb SHA256 622c82344134d03b5f288b520562da6d4f27d32d0c5ebbed241956653c7d4ea2
 EBUILD ibm-jdk-bin-1.5.0.10.ebuild 7613 RMD160 9cfaa1adfd5429399079a70f2d795aeaab18cee3 SHA1 53b9771501cecd2dfd4a5e443e535cc1b7f85c7c SHA256 11a0bbb037d52f91b412e6b98c88d281c5413769a31ec2d1b501a81e761ac52f
 EBUILD ibm-jdk-bin-1.5.0.9-r1.ebuild 7613 RMD160 c6bf678e91d20ad274aa93943d9f7f590a94f153 SHA1 763047a089607ccdcf170f48cd57db1fd3ce3334 SHA256 bfa54be696933b3acd231b831b1406a0c425bcb91b1f471793d6b110abd8c04e
-EBUILD ibm-jdk-bin-1.6.0.0.ebuild 6969 RMD160 c30cf46a9135f90452c3c7746d2a4468db21b286 SHA1 2b855b25ea4071f0f689a14a001882ff7a8b46a7 SHA256 cd2a7cb30ad43c60673c8dfa3bc375da57430ab7316368c17771ba2da54c7329
-EBUILD ibm-jdk-bin-1.6.0.4.ebuild 9149 RMD160 b574d12f9d094adf03776aa3b14c68272434c028 SHA1 f6c4bc9926f4d1e2b57916d935aa598f829084a7 SHA256 795032fab5a280b3c41862ad023c451227d3ab065b040717362ea4c1326650a1
 EBUILD ibm-jdk-bin-1.6.0.5.ebuild 9149 RMD160 708467e765d9763ec94e67b8ce83ca8a43022676 SHA1 5091a1119acefa00ed3f057995ec1153d8ba1c08 SHA256 151c593f4242a610bde4e1c5bbf8532efbfbb172a3ca0f7b2195551b2cbdec72
-MISC ChangeLog 32571 RMD160 fc9af7d7178aa3094743994195e05014732c2b40 SHA1 8cda31a5119e23402a6798b5b2f33f33f9413150 SHA256 954c66cf065165f10f405898f54c8c3b4de6ddb59e89b523a3d51263408b0895
+EBUILD ibm-jdk-bin-1.6.0.6.ebuild 9151 RMD160 eff3cab21d8c34bc4962f839d3e7a4220502c67d SHA1 abc10f535e103825ab6358abdbdaa8a3f995db8b SHA256 1afd9bdcb24add2195f474925b4e3e0f5c952a05e703ba1a25732f2e0b1851f2
+MISC ChangeLog 32787 RMD160 b38230c4d3d0aff333605c73b47813da86e95e66 SHA1 0fc8e628f915f2bcfe68e67345753acf0786f4a6 SHA256 30ce8274e37eddb64eadd8198abe7a4557784a421c47900d6247cf379c686cd2
 MISC metadata.xml 310 RMD160 ac3496cf91b69c0bab3ab8fb6656fbcbf8845f8d SHA1 c8bca85a871e8f7c11481456b490a0fd09175884 SHA256 ffd62e0957318b6c4f3308be446258eae8ce7b8436075f231a30e2ae4691fabf
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
deleted file mode 100644
index 96d7ded3572f..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild,v 1.7 2009/05/29 20:37:25 caster Exp $
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-JAVACOMM_RELEASE=$(get_version_component_range 3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-javacomm-${JAVACOMM_PV}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
-
-if use x86; then
-	JDK_DIST=${X86_JDK_DIST}
-	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java-i386-60"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java-x86_64-60"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java-ppc-60"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java-ppc64-60"
-	LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.6"
-DESCRIPTION="IBM Java SE Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="
-	x86? ( ${X86_JDK_DIST} )
-	amd64? ( ${AMD64_JDK_DIST} )
-	ppc? ( ${PPC_JDK_DIST} )
-	ppc64? ( ${PPC64_JDK_DIST} )
-	javacomm? (
-		x86? ( ${X86_JAVACOMM_DIST} )
-		amd64? ( ${AMD64_JAVACOMM_DIST} )
-		ppc? ( ${PPC_JAVACOMM_DIST} )
-		ppc64? ( ${PPC64_JAVACOMM_DIST} )
-	)"
-LICENSE="IBM-J1.6"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc"
-
-RDEPEND="
-	X? (
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libX11
-		amd64? ( x11-libs/libXt )
-	)
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	odbc? ( dev-db/unixODBC )"
-
-DEPEND=""
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/motif21/libmawt.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9gc24.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
-opt/${P}/jre/lib/i386/j9vm/libjvm.so
-opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9hookable24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9dmp24.so
-opt/${P}/jre/lib/i386/libj9prt24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libiverel24.so
-opt/${P}/jre/lib/i386/libj9trc24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9shr24.so
-opt/${P}/jre/lib/i386/libj9gc24.so
-opt/${P}/jre/lib/i386/libj9bcv24.so
-opt/${P}/jre/lib/i386/classic/libjvm.so"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/lib/amd64/libjclscar_24.so
-opt/${P}/jre/lib/amd64/libj9jit24.so"
-
-QA_EXECSTACK_amd64="opt/${P}/jre/bin/classic/libjvm.so
-opt/${P}/jre/lib/amd64/j9vm/libjvm.so
-opt/${P}/jre/lib/amd64/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/libj9hookable24.so
-opt/${P}/jre/lib/amd64/libj9vm24.so
-opt/${P}/jre/lib/amd64/libjclscar_24.so
-opt/${P}/jre/lib/amd64/libj9thr24.so
-opt/${P}/jre/lib/amd64/libj9dmp24.so
-opt/${P}/jre/lib/amd64/libj9prt24.so
-opt/${P}/jre/lib/amd64/libj9jit24.so
-opt/${P}/jre/lib/amd64/libiverel24.so
-opt/${P}/jre/lib/amd64/libj9trc24.so
-opt/${P}/jre/lib/amd64/libj9dbg24.so
-opt/${P}/jre/lib/amd64/libj9shr24.so
-opt/${P}/jre/lib/amd64/libj9gc24.so
-opt/${P}/jre/lib/amd64/libj9bcv24.so
-opt/${P}/jre/lib/amd64/classic/libjvm.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under Java SE 6, download GA for your arch:" #SR${SERVICE_RELEASE}
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-
-	einfo "You can also use a direct link to your arch download page:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if GA is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_unpack() {
-	unpack ${JDK_DIST}
-	if use javacomm; then
-		mkdir "${WORKDIR}/javacomm/" || die
-		cd "${WORKDIR}/javacomm/"
-		unpack ${JAVACOMM_DIST}
-	fi
-	cd "${S}"
-
-	# bug #126105
-	epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
-	fi
-	if use javacomm; then
-		chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
-		cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die
-		cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die
-		cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
-		if use examples; then
-			cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die
-		fi
-	fi
-
-	if use x86 || use ppc; then
-		if use nsplugin; then
-			local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
-			install_mozilla_plugin "${plugin}"
-		fi
-	fi
-
-	local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
-	if [[ -f "${desktop_in}" ]]; then
-		local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			"${desktop_in}" > \
-			"${desktop_out}" || die
-
-		domenu "${desktop_out}" || die
-	fi
-
-	dohtml -a html,htm,HTML -r docs || die
-	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild
index ec40af9b4d8c..bab9a4cb0c08 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v 1.4 2009/05/29 20:37:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild,v 1.1 2009/10/18 19:52:15 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -81,7 +81,7 @@ SRC_URI="
 		ppc64? ( ${PPC64_JAVACOMM_DIST} )
 	)"
 LICENSE="IBM-J1.6"
-KEYWORDS="-* ~amd64 ppc ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples javacomm nsplugin odbc"