Remove obsolete 1.4.1 version and unused 1.6.0 revision; Remove all -arch keywords and add ~ppc ~ppc64 and ~ia64 to 1.4.2 and 1.5.0-r1 where applicable. Because this package just unpacks bunch of html files and thus makes no sense to restrict on any arch.

Package-Manager: portage-2.1.2.4

10 files changed, 49 insertions, 131 deletions

diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index e8069630dc74..61ad2a7bdde9 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -49,22 +49,26 @@ EBUILD ibm-jdk-bin-1.4.2.7.ebuild 5511 RMD160 7fa64330251c8e802d96d1cc7ba721e50d
 MD5 db65d69f647a93c17a4c6e88f56f7935 ibm-jdk-bin-1.4.2.7.ebuild 5511
 RMD160 7fa64330251c8e802d96d1cc7ba721e50dd66071 ibm-jdk-bin-1.4.2.7.ebuild 5511
 SHA256 26527130a3d49f051fb33cd67fc6f36c76db19a180d3e33bb7505e880cbf6a03 ibm-jdk-bin-1.4.2.7.ebuild 5511
-EBUILD ibm-jdk-bin-1.4.2.8.ebuild 5990 RMD160 2677c210324c91d03fa1f5bb135ff2e89b9baa64 SHA1 ede95167a8208061a5f2e00c749018239b79a31c SHA256 23232d0115e926ab7828354d8c90e626e4de155eee753843f245ad1efdd648c3
-MD5 db612e8e69bb1b9019903a598cc455e4 ibm-jdk-bin-1.4.2.8.ebuild 5990
-RMD160 2677c210324c91d03fa1f5bb135ff2e89b9baa64 ibm-jdk-bin-1.4.2.8.ebuild 5990
-SHA256 23232d0115e926ab7828354d8c90e626e4de155eee753843f245ad1efdd648c3 ibm-jdk-bin-1.4.2.8.ebuild 5990
+EBUILD ibm-jdk-bin-1.4.2.8.ebuild 5974 RMD160 93f4240769717e54de48e388af375bab938352c5 SHA1 da7d45ac0ee9e6132bfd1d585a79434936a3e409 SHA256 b1f3995b5c7ebb6cd87f421aaf787730792a2adedb209f9f1f4b1df81a127ef6
+MD5 95858a7b662e832f1292a528251a6ef0 ibm-jdk-bin-1.4.2.8.ebuild 5974
+RMD160 93f4240769717e54de48e388af375bab938352c5 ibm-jdk-bin-1.4.2.8.ebuild 5974
+SHA256 b1f3995b5c7ebb6cd87f421aaf787730792a2adedb209f9f1f4b1df81a127ef6 ibm-jdk-bin-1.4.2.8.ebuild 5974
 EBUILD ibm-jdk-bin-1.5.0.3-r1.ebuild 7916 RMD160 92a3cf988fb406250cb27932f8c63e614ee62dd4 SHA1 923bdaa9ddf88dfce9bfb3fe276457f925c5023c SHA256 155794eb9d539103a3d19d54a6594cc7f8762885dd0e7506aa069952cbfdeca5
 MD5 97dd67ba7991d1cab4b03c02d16ba4fb ibm-jdk-bin-1.5.0.3-r1.ebuild 7916
 RMD160 92a3cf988fb406250cb27932f8c63e614ee62dd4 ibm-jdk-bin-1.5.0.3-r1.ebuild 7916
 SHA256 155794eb9d539103a3d19d54a6594cc7f8762885dd0e7506aa069952cbfdeca5 ibm-jdk-bin-1.5.0.3-r1.ebuild 7916
+EBUILD ibm-jdk-bin-1.5.0.4-r1.ebuild 8604 RMD160 22487fbb702419dfce0aaf5b33cf44bd1166cc05 SHA1 80d1fa262fd477ae029f289c9e2aea44f9b4115f SHA256 fc2bba3b0841eb4d87d75a15d5483edbb3093147af4fe0594de3b952d88aff8a
+MD5 23626bc336c3c23175e9610fa9d85a27 ibm-jdk-bin-1.5.0.4-r1.ebuild 8604
+RMD160 22487fbb702419dfce0aaf5b33cf44bd1166cc05 ibm-jdk-bin-1.5.0.4-r1.ebuild 8604
+SHA256 fc2bba3b0841eb4d87d75a15d5483edbb3093147af4fe0594de3b952d88aff8a ibm-jdk-bin-1.5.0.4-r1.ebuild 8604
 EBUILD ibm-jdk-bin-1.5.0.4.ebuild 8065 RMD160 8e16ee133b7137ed3cb1e38f81ef8f1f09616815 SHA1 de7e90c8e39e708133e5eb0eab3283c2b09f1fb1 SHA256 713566b4b9e1d63259ff2dda157e84c2fc4cc13e220be61ae6a120d774bfcfb2
 MD5 5330cac3a88689064f592ba311dec964 ibm-jdk-bin-1.5.0.4.ebuild 8065
 RMD160 8e16ee133b7137ed3cb1e38f81ef8f1f09616815 ibm-jdk-bin-1.5.0.4.ebuild 8065
 SHA256 713566b4b9e1d63259ff2dda157e84c2fc4cc13e220be61ae6a120d774bfcfb2 ibm-jdk-bin-1.5.0.4.ebuild 8065
-MISC ChangeLog 18321 RMD160 460153d6fbe221dc17d5de0fa951251cdf018892 SHA1 ed64b07547c00955259deeee6193cf20a19409de SHA256 ac2f47d937772b2acb1c5d9b1838c1b3a2a2281600f659732390f923bf5bdfeb
-MD5 2a56c9027685065ab842a1cfaddb8455 ChangeLog 18321
-RMD160 460153d6fbe221dc17d5de0fa951251cdf018892 ChangeLog 18321
-SHA256 ac2f47d937772b2acb1c5d9b1838c1b3a2a2281600f659732390f923bf5bdfeb ChangeLog 18321
+MISC ChangeLog 18782 RMD160 634289bf0af57957c9ebd95cb3fc91c0f2314986 SHA1 f3d90702dcdecd8fa1b01fb81ef13bdb6054a95c SHA256 1015f63b65ab2641d45303380ba466a79416bb0b7bd821c142d8be39ed0fde71
+MD5 3c65ddcbcf120cfc07f71a09b25a72b6 ChangeLog 18782
+RMD160 634289bf0af57957c9ebd95cb3fc91c0f2314986 ChangeLog 18782
+SHA256 1015f63b65ab2641d45303380ba466a79416bb0b7bd821c142d8be39ed0fde71 ChangeLog 18782
 MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
 MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
@@ -81,3 +85,6 @@ SHA256 e961c91ba6dc3a8afb2e2d763a0d92a82c6a178ea7800b8ab3cce00ecebe5af8 files/di
 MD5 92aabb82564bb9df1884ed3ea30dd528 files/digest-ibm-jdk-bin-1.5.0.4 2408
 RMD160 902144350804c4212e9fa8d0da2b448a05ca2283 files/digest-ibm-jdk-bin-1.5.0.4 2408
 SHA256 e31663711f172865b338cfa939253f2686482803a2dffc43e8d7a9939f9bd035 files/digest-ibm-jdk-bin-1.5.0.4 2408
+MD5 92aabb82564bb9df1884ed3ea30dd528 files/digest-ibm-jdk-bin-1.5.0.4-r1 2408
+RMD160 902144350804c4212e9fa8d0da2b448a05ca2283 files/digest-ibm-jdk-bin-1.5.0.4-r1 2408
+SHA256 e31663711f172865b338cfa939253f2686482803a2dffc43e8d7a9939f9bd035 files/digest-ibm-jdk-bin-1.5.0.4-r1 2408
diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index 114e4abd8d7a..6f62bd909321 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.45 2007/02/04 23:40:09 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.46 2007/04/20 10:48:04 caster Exp $
+
+  20 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  -java-sdk-docs-1.4.1.ebuild, java-sdk-docs-1.4.2.ebuild,
+  java-sdk-docs-1.5.0-r1.ebuild, -java-sdk-docs-1.6.0.ebuild,
+  java-sdk-docs-1.6.0-r1.ebuild:
+  Remove obsolete 1.4.1 version and unused 1.6.0 revision; Remove all -arch
+  keywords and add ~ppc ~ppc64 and ~ia64 to 1.4.2 and 1.5.0-r1 where
+  applicable. Because this package just unpacks bunch of html files and thus
+  makes no sense to restrict on any arch.
 
 *java-sdk-docs-1.6.0-r1 (04 Feb 2007)
 
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 679885b37912..84252c31ce36 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,48 +1,32 @@
-DIST j2sdk-1_4_1-doc.zip 32765641 RMD160 94f9aa56bc81f76f03b44db7f925273271fdf627 SHA1 30c678f64bcd614c302c4034d00b6ef53fc7999c SHA256 cd076431c16f37ee1a1eb020418454fdbad185500cfcf8e3454de0e9aad49c25
 DIST j2sdk-1_4_2-doc.zip 34397778 RMD160 0c7646893ee73988327ebd97bf9ff6469c0bb7ff SHA1 498cbabb3cfa9e130dce1bed521effd7431ff3d7 SHA256 5d7ef04d1a9fa721f03eca7751f8eaaebd0de2d629ff90dc1a0d5628bc64ba58
 DIST jdk-1_5_0-doc-r1.zip 46191338 RMD160 d783f2175f84d76f867b7358705a2819be5afb68 SHA1 86e30770a4ecc395bf8fbaea1bdef4d2a81df877 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
 DIST jdk-6-doc-r1.zip 54898268 RMD160 d23c95a90cbf92206499f2c73b2f66b61d8363da SHA1 e27ea67e6a1691cd01046804462bec79ec9440e8 SHA256 30df77761591681cbb259dce028a728926813fcd18e7f87ad9631f64fe7f08bd
-DIST jdk-6-doc.zip 54897973 RMD160 0bb5e2294e35a06b4bb490ec6de5db7a77daee56 SHA1 ccfdf83aca93fcd64ad80424ef691167ed697ead SHA256 b7db4124017708e85303c0269e2e0d49639df2ff5aecbbd870e3fa35bd8ab279
-EBUILD java-sdk-docs-1.4.1.ebuild 873 RMD160 9fb7556543b160e80b09a66b0b0f7e1fedbd4a29 SHA1 b8dd5ac53345df9aefd60dd692d9667408ab1725 SHA256 d611866e873ee546bfa82bf6fd86f580ec13bb507a47353b8691846320b1bd67
-MD5 652692342b8613df6665065c0b20408f java-sdk-docs-1.4.1.ebuild 873
-RMD160 9fb7556543b160e80b09a66b0b0f7e1fedbd4a29 java-sdk-docs-1.4.1.ebuild 873
-SHA256 d611866e873ee546bfa82bf6fd86f580ec13bb507a47353b8691846320b1bd67 java-sdk-docs-1.4.1.ebuild 873
-EBUILD java-sdk-docs-1.4.2.ebuild 874 RMD160 ebb875d253c06273ed9c5f13ddeeba2924c9f718 SHA1 4d87b490f030927d4e569d2b5d7b24e7590a103b SHA256 f8eace8a030babce05491c8708f8151c8f0908d98b274a4bc5fe193a5a0522ec
-MD5 e65ffe845ead32c6c468ec63b0677eda java-sdk-docs-1.4.2.ebuild 874
-RMD160 ebb875d253c06273ed9c5f13ddeeba2924c9f718 java-sdk-docs-1.4.2.ebuild 874
-SHA256 f8eace8a030babce05491c8708f8151c8f0908d98b274a4bc5fe193a5a0522ec java-sdk-docs-1.4.2.ebuild 874
-EBUILD java-sdk-docs-1.5.0-r1.ebuild 1499 RMD160 a2f80f445008a29e15b2ecdb162b39f1a80b4b62 SHA1 721ccf804d06aca01bb7d944fb2855551260e263 SHA256 e616795fd28d9f8f5c9d5425d224dcefa2a8e773d4c35672a51344249fed425f
-MD5 6b7700d0c6d43495ef5dcf446a7585a6 java-sdk-docs-1.5.0-r1.ebuild 1499
-RMD160 a2f80f445008a29e15b2ecdb162b39f1a80b4b62 java-sdk-docs-1.5.0-r1.ebuild 1499
-SHA256 e616795fd28d9f8f5c9d5425d224dcefa2a8e773d4c35672a51344249fed425f java-sdk-docs-1.5.0-r1.ebuild 1499
-EBUILD java-sdk-docs-1.6.0-r1.ebuild 1509 RMD160 8977ae336b1d79184698aca98a165180a73f23a7 SHA1 8fcb756255920063b0217851190dd5730bbc8dcd SHA256 456044e2f6d6089d9aba9550cbc0cd67486bdf732d2989f2bde26fe5cba9d17b
-MD5 078fe405dab253f6d6d1b2949e32462f java-sdk-docs-1.6.0-r1.ebuild 1509
-RMD160 8977ae336b1d79184698aca98a165180a73f23a7 java-sdk-docs-1.6.0-r1.ebuild 1509
-SHA256 456044e2f6d6089d9aba9550cbc0cd67486bdf732d2989f2bde26fe5cba9d17b java-sdk-docs-1.6.0-r1.ebuild 1509
-EBUILD java-sdk-docs-1.6.0.ebuild 1509 RMD160 53f7bb221630a3bb20fc99e475affbc37d1a1b14 SHA1 506336cdd6da97b5dfc511783151d06ac005b885 SHA256 919467c8be4ebc4177373d8b9f86932b9bcb9c32957ae2e5e448c57614c4b236
-MD5 d32a57a1100310c4d335d862e4b17c1e java-sdk-docs-1.6.0.ebuild 1509
-RMD160 53f7bb221630a3bb20fc99e475affbc37d1a1b14 java-sdk-docs-1.6.0.ebuild 1509
-SHA256 919467c8be4ebc4177373d8b9f86932b9bcb9c32957ae2e5e448c57614c4b236 java-sdk-docs-1.6.0.ebuild 1509
-MISC ChangeLog 6651 RMD160 61f9796119e8e5c7caff34421a94196fe8892113 SHA1 81e05a47d60748651c09daaaaba9186970bea067 SHA256 aff6d1e62ee47d32154f1e56a8844bc12ad975549e05a028eec18741ae8e73ae
-MD5 4883ae5627e02e91acd3655fa17be849 ChangeLog 6651
-RMD160 61f9796119e8e5c7caff34421a94196fe8892113 ChangeLog 6651
-SHA256 aff6d1e62ee47d32154f1e56a8844bc12ad975549e05a028eec18741ae8e73ae ChangeLog 6651
+EBUILD java-sdk-docs-1.4.2.ebuild 859 RMD160 d5bea75686e505c0238d15484bdfe115da8c6834 SHA1 ef11bc92ab3fe1c47518f9b0519f67963ab92b96 SHA256 318b1bc7de58b2225d2fca219fac0025e1a936fa4aca078ef527e9adb837d6ca
+MD5 6c07277163ff2de6fbff28b1aff996ee java-sdk-docs-1.4.2.ebuild 859
+RMD160 d5bea75686e505c0238d15484bdfe115da8c6834 java-sdk-docs-1.4.2.ebuild 859
+SHA256 318b1bc7de58b2225d2fca219fac0025e1a936fa4aca078ef527e9adb837d6ca java-sdk-docs-1.4.2.ebuild 859
+EBUILD java-sdk-docs-1.5.0-r1.ebuild 1486 RMD160 96325990f60963a817ad8390ac983d8a9dca56a3 SHA1 1dfd610920f0970a096d652a3d056a75657d35f1 SHA256 5e92fb84ff7750f3c6f579c7171a76417d1936470723d77539772abb0bc062ef
+MD5 dd71bb28da0e0633aca78f6fd314a69f java-sdk-docs-1.5.0-r1.ebuild 1486
+RMD160 96325990f60963a817ad8390ac983d8a9dca56a3 java-sdk-docs-1.5.0-r1.ebuild 1486
+SHA256 5e92fb84ff7750f3c6f579c7171a76417d1936470723d77539772abb0bc062ef java-sdk-docs-1.5.0-r1.ebuild 1486
+EBUILD java-sdk-docs-1.6.0-r1.ebuild 1478 RMD160 0f8ca645f7ebda8f78f64e0c0a45cfcd8355effd SHA1 8004fc39a71ccceb59b75f9b1c962c5cd80d1a4c SHA256 a2464089919b31b36bb560d01c1c6c28a7b8f8e3ac2dde0d14976654457517f4
+MD5 062f398e1f81c060a476c92a4425c7d7 java-sdk-docs-1.6.0-r1.ebuild 1478
+RMD160 0f8ca645f7ebda8f78f64e0c0a45cfcd8355effd java-sdk-docs-1.6.0-r1.ebuild 1478
+SHA256 a2464089919b31b36bb560d01c1c6c28a7b8f8e3ac2dde0d14976654457517f4 java-sdk-docs-1.6.0-r1.ebuild 1478
+MISC ChangeLog 7121 RMD160 647c8aa13c7ccc5f04ba7bebf51e5565167e2630 SHA1 8fce34f597608c4900b8e07bd89cb42922432161 SHA256 0498668214fa495d217adce4b998310015a2cfd9d8991cf371dfc77b417d8853
+MD5 9cbf1a0d0a1acb89b54678eb4f675bc3 ChangeLog 7121
+RMD160 647c8aa13c7ccc5f04ba7bebf51e5565167e2630 ChangeLog 7121
+SHA256 0498668214fa495d217adce4b998310015a2cfd9d8991cf371dfc77b417d8853 ChangeLog 7121
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 abf254a3f2d929725a9de4341dc01779 files/digest-java-sdk-docs-1.4.1 244
-RMD160 53fba1a04e65e6c4990155a9352d288b1fbba023 files/digest-java-sdk-docs-1.4.1 244
-SHA256 e0319b99a2fb51724f5f62de207f6e0ef79e5473496b5f0d1797d258f3eedcc4 files/digest-java-sdk-docs-1.4.1 244
 MD5 3d099ce79b7ef128afef952958cae061 files/digest-java-sdk-docs-1.4.2 244
 RMD160 35e65802aece74b64fd3b9c21ed5ac65baad5ae7 files/digest-java-sdk-docs-1.4.2 244
 SHA256 d92d905639d5bebb464d7fc14b681ff06764b9511fc1016933363e84d28c828d files/digest-java-sdk-docs-1.4.2 244
 MD5 657cf8f18e219b6995f17957c295301e files/digest-java-sdk-docs-1.5.0-r1 247
 RMD160 9df2496fce50d8f35ca1a66a53f99704f778312e files/digest-java-sdk-docs-1.5.0-r1 247
 SHA256 4d47ec3d1b9a1ec20e669989dc0485dbcd660d3c3880db85a0593408104146f3 files/digest-java-sdk-docs-1.5.0-r1 247
-MD5 6f2023a5fa6712e7c401131b216c6fb1 files/digest-java-sdk-docs-1.6.0 226
-RMD160 4b23f84a2ae806b08196c4d7a3b2f6431d301992 files/digest-java-sdk-docs-1.6.0 226
-SHA256 971a0a0dc3696179073f5915ebcbde79ea1a11f87b7d4bfd94094c9569e8b5bf files/digest-java-sdk-docs-1.6.0 226
 MD5 ef91ff62fc88e71a3be58e0fb12efabc files/digest-java-sdk-docs-1.6.0-r1 235
 RMD160 e291bb1bd027c9be95226e3bf0d8a3f4de01d2df files/digest-java-sdk-docs-1.6.0-r1 235
 SHA256 ebcfdbaf12984eaa7ee43ea7a016fda9cf2bebdd149715664ea4d5d52ebc172b files/digest-java-sdk-docs-1.6.0-r1 235
diff --git a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.1 b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.1
deleted file mode 100644
index 4882e0aa86f8..000000000000
--- a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 105e236ee793b5d01be899527f36ca94 j2sdk-1_4_1-doc.zip 32765641
-RMD160 94f9aa56bc81f76f03b44db7f925273271fdf627 j2sdk-1_4_1-doc.zip 32765641
-SHA256 cd076431c16f37ee1a1eb020418454fdbad185500cfcf8e3454de0e9aad49c25 j2sdk-1_4_1-doc.zip 32765641
diff --git a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.6.0 b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.6.0
deleted file mode 100644
index 939671fa0ee4..000000000000
--- a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e1a5ecbeb576740cf673160ffae3606b jdk-6-doc.zip 54897973
-RMD160 0bb5e2294e35a06b4bb490ec6de5db7a77daee56 jdk-6-doc.zip 54897973
-SHA256 b7db4124017708e85303c0269e2e0d49639df2ff5aecbbd870e3fa35bd8ab279 jdk-6-doc.zip 54897973
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild
deleted file mode 100644
index cdde78f2d9be..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild,v 1.20 2006/10/05 17:21:26 gustavoz Exp $
-
-At="j2sdk-1_4_1-doc.zip"
-SRC_URI="j2sdk-1_4_1-doc.zip"
-DESCRIPTION="Javadoc for Java SDK version 1.4.1"
-HOMEPAGE="http://java.sun.com/products/archive/j2se/1.4.1_07/index.html"
-LICENSE="sun-j2sl"
-SLOT="1.4.1"
-KEYWORDS="x86 ppc -alpha amd64 ppc64"
-IUSE=""
-DEPEND=">=app-arch/unzip-5.50-r1"
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	unpack ${At} || die "Failed Unpacking"
-}
-
-src_install(){
-	dohtml index.html
-
-	local dirs="api guide images relnotes tooldocs"
-
-	for i in $dirs ; do
-		cp -a $i ${D}/usr/share/doc/${P}/html
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
index 6f7e8c158881..4a281fb397b8 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild,v 1.18 2006/10/05 17:21:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild,v 1.19 2007/04/20 10:48:04 caster Exp $
 
 At="j2sdk-1_4_2-doc.zip"
 S="${WORKDIR}/docs"
@@ -9,7 +9,7 @@ DESCRIPTION="Javadoc for Java SDK version 1.4.2"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
 LICENSE="sun-j2sl"
 SLOT="1.4.2"
-KEYWORDS="-alpha amd64 -hppa -mips ppc ppc64 s390 x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 s390 x86"
 IUSE=""
 DEPEND=">=app-arch/unzip-5.50-r1"
 RESTRICT="fetch"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
index f5a12011f832..b9f686a39583 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild,v 1.4 2006/10/14 15:51:03 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild,v 1.5 2007/04/20 10:48:04 caster Exp $
 
 SRC_URI="jdk-1_5_0-doc-${PR}.zip"
 DESCRIPTION="Javadoc for Java SDK version 1.5.0 Beta 2"
 HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
 LICENSE="sun-j2sl"
 SLOT="1.5.0"
-KEYWORDS="-alpha amd64 -hppa -mips -ppc -sparc x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 DEPEND=">=app-arch/unzip-5.50-r1"
 RESTRICT="fetch"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild
index 802e9d89ff05..1eac727b1bf1 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild,v 1.1 2007/02/04 23:40:09 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild,v 1.2 2007/04/20 10:48:04 caster Exp $
 
 ORIG_NAME="jdk-6-doc.zip"
 SRC_URI="jdk-6-doc-${PR}.zip"
@@ -8,7 +8,7 @@ DESCRIPTION="Documentation (including API Javadocs) for Java SDK version ${PV}"
 HOMEPAGE="http://java.sun.com/javase/6/docs/"
 LICENSE="sun-j2sl-6"
 SLOT="1.6.0"
-KEYWORDS="-alpha ~amd64 -hppa -mips -ppc -sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.ebuild
deleted file mode 100644
index 8f8beca6a1bd..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.ebuild,v 1.1 2006/12/13 01:26:31 caster Exp $
-
-SRC_URI="jdk-6-doc.zip"
-DESCRIPTION="Documentation (including API Javadocs) for Java SDK version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/docs/"
-LICENSE="sun-j2sl-6"
-SLOT="1.6.0"
-KEYWORDS="-alpha ~amd64 -hppa -mips -ppc -sparc ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-RESTRICT="fetch"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-6-doc-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "and place it in ${DISTDIR}"
-#	einfo "and place it in ${DISTDIR} named as"
-#	einfo "${SRC_URI}. Notice the ${PR}. Because Sun changes the doc zip file"
-#	einfo "without changing the filename, we have to resort to renaming to keep"
-#	einfo "the md5sum verification working existing and new downloads."
-#	einfo ""
-	einfo "If emerge fails because of a md5sum error it is possible that Sun"
-	einfo "has again changed the upstream release, try downloading the file"
-	einfo "again or a newer revision if available. Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}