Add mising x86 keyword per ago's permission. Cleanup including ppc/pp64 stable keywords, bug #525464.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

11 files changed, 14 insertions, 418 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index bfd0500f5449..79edaaf7a327 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 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.111 2014/11/01 17:00:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.112 2014/11/02 13:18:15 caster Exp $
+
+  02 Nov 2014; Vlastimil Babka <caster@gentoo.org>
+  -java-sdk-docs-1.6.0.25.ebuild, -java-sdk-docs-1.7.0.25.ebuild,
+  -java-sdk-docs-1.7.0.51.ebuild, -java-sdk-docs-1.7.0.55.ebuild,
+  -java-sdk-docs-1.7.0.60.ebuild, -java-sdk-docs-1.7.0.67.ebuild,
+  java-sdk-docs-1.7.0.71.ebuild, -java-sdk-docs-1.8.0.0.ebuild,
+  -java-sdk-docs-1.8.0.5.ebuild:
+  Add mising x86 keyword per ago's permission. Cleanup including ppc/pp64
+  stable keywords, bug #525464.
 
   01 Nov 2014; Agostino Sarubbo <ago@gentoo.org> java-sdk-docs-1.7.0.71.ebuild:
   Stable for amd64, wrt bug #525464
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 55eba5269671..13df27457d16 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,46 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST jdk-1_5_0-doc-r1.zip 46191338 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
-DIST jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip 59089445 SHA256 6e115142c3cf5627f9a378934bf3b807e72c2b979385019d5f23e79019727937
 DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
-DIST jdk-7u25-apidocs.zip 60766618 SHA256 fe99e1b909a9d877fb30c49732a2dcc0a1cc310517073016489750cf04600377 SHA512 21dbebcee94f9a8125d11959c855f8eabee4e25135370dc6a99e5d60bd56f5847c89cb1e5928de65148651034b69b93493f4d20063010d0450d4ed6db7d771e4 WHIRLPOOL cd9fdf16367fd2b3248a8403cebef5b61d529ea0aea8e67208a4a6e111bdcfc923743fbb4aa624bf59c8d29289897d82b9c08d7de795a328f3ad8e8271e50a48
-DIST jdk-7u51-apidocs.zip 61116819 SHA256 01f567699e9152009505cefa7267b7ac68138aaf1c9d85f16155f2ab30c2bec4 SHA512 31bbe1ef7c48fab381063a937b14b296147d1045a8b41c4cedc4c130965af746cea41e1ee91117fec3b20c1fc04e5917a4c97f1329f01675441f224794213bc3 WHIRLPOOL 7347efb5a36b7de81f2685a3e335e5af92d168c90fd85ced18591bc2fcb8a1e427ccd5ad1726434e420674e27c041d0113960a3ba533546235b529e92ccfe061
-DIST jdk-7u55-apidocs.zip 61123597 SHA256 f5c5a7cc33c45e5b7442076465c5a934bf44d006cdfcff080d7ed00bdf5845e4 SHA512 a7c38a0882aa694552ceb7e50162b75ab2bdcfcaddd0d4f1a730f4fdf70fe55d92076ec237ae756aa7ba7ae62d57d0e0b2e6caee8db6a1864316ceb247dfc5db WHIRLPOOL f2f751fcdb4a2a324c75b1697be526404829d9a4dee7e9a7d8923ebb3c97a51a80d49edaec3c48c3c50f1c8c6992467fc334d307b1667903b4755de78131f11f
-DIST jdk-7u60-apidocs.zip 61152728 SHA256 6dffd325e1d1f28cda64a84c42adad14f1bfc8220471494dac14badf275cdb88 SHA512 aa13c96cab29705be47d533e6d51d1b01806b7e56e9f18e616f218dd524c9b36f47b977d7676bc6d0ecfded29ca9993e3dcadf5e86da35faf32c8e2fce66f1fa WHIRLPOOL 4cdec3412d5504843f306176d4572315ec7dea21cd6a9281405bf11a87145465f877a01f840ba84d2a06ac140fb13ff06aeeef374445ee81604e2f6204e98789
-DIST jdk-7u67-apidocs.zip 61161584 SHA256 bc2d1a5103c26b464a7584a8277eaf70349488bdeaaea7909cbebe93fde7c2b2 SHA512 9d0c1cb03c89dcfeb41ce240bf93de26e5d8e2804ea51841bba129b48e954e30a1c825360d38612177321881c90bcc0a752dd356e637c64b798c29d9961df401 WHIRLPOOL adbf3f8a9934496df6a5bea0a443c7313be1b74245907553361bdf60c45cf7466dfed0ec5dd82d6aa3111d138bc2099d29edfec8403f1465add70d9af45472dc
 DIST jdk-7u71-docs-all.zip 61124091 SHA256 f573f8dd01812ebcb72e8bcfb4bc1c73dbeea9dcc5a1cbb12406b6b51060e17c SHA512 a9cc8b22b734150a30c504b06c757e62cbdd52ebf9760bfa881f1f70ae13dfa88a2df0bb7ce9414844ce16e9fdf2599bdd461939679b885c9cb0cf566dab71de WHIRLPOOL 295369f2893f3d8426f8236d1032acdc8fbe6b83352fd4fc26b01a033750d20cd64664b992e3fa7ba1dfa6c9e78d5f7e512e6f80fcc9f40fbed3733044b63a94
-DIST jdk-8-apidocs.zip 88317932 SHA256 3de88cc21051c3a2e94a7def9e937208fec94ed1423dcf7611e26b8a28f00b45 SHA512 2edda9d73ad23e64abbdb5b2363342dc1542d49f04614fac36f5bbec29109e51dfdcec970dad68da7ced75584109c6d29b62c16c37fcce86a504560d2524a45d WHIRLPOOL c013e840759df220686e73d118dd7abf94ff1c1a8d37576f1023d3baac49c724769ade56d62af87a48da308b0fcad97be99a2842f4fc08b11ed9844d808f9b58
 DIST jdk-8u20-docs-all.zip 89937288 SHA256 6d94e2b05beee90bb76492980945ea9ee5bc95ecb9420ee96eba769932bdf6b4 SHA512 2a067fb2a11f5396456abec5ccf61e9de57bd21383dece9d33532524f9163b819079439c376846b0baaf0b549ea38f30fe764f8bab53ab6e971f3518829bb764 WHIRLPOOL fd5effb852f32eeff0fa3cb32819b35185dbeacefcc1516ddd7f709df4a54b1a636d838dae4eaa75eca5ff3409c2406784c84a4b0938f2650a8b4a887537ef1e
-DIST jdk-8u5-apidocs.zip 88441146 SHA256 89696b9d189066b08ef956345998bc12d0b5a6bea39f22000b7f374afe76f6fe SHA512 f1fc0b194a4e6bfd6e1c2bebb9d1ac066945d32eb0112b521372f2ff440b613fd39d8d357c08f66c5b328346fc09e86ea6758c50c62d9dff355f4500521cd0b5 WHIRLPOOL 5a2215d0a2d067d409bfef8c364c680550be0cb0860cd6b52f4269d22304384ad98c9e807eec66f379e4871ed514d3c68e227a019e801cfe30543fe55b36e80f
 EBUILD java-sdk-docs-1.5.0-r1.ebuild 1586 SHA256 e36befc28935b01a628d745f40bd342819643b6b9ea281c75fb80305783bc87e SHA512 ec4be077de6377c425f7daa334cb0520f638f0e720c98a85722af994534e96fc47333ee8b6106eea7984ab1f52f58fe8c6773752c9aee102cecb407263fba14f WHIRLPOOL 496aa76d5790c1d8f9ef6c280d26412a3f4dc03076e7f0efb494f2a82a76b915437c5bae325ece24ac0da74c79d927ad8105d2d30ba1ffd74a7674e842ec629a
-EBUILD java-sdk-docs-1.6.0.25.ebuild 1478 SHA256 35bac3d6c761e9fb882cb0da58eb1c2e86ab192d57981a379c80803c20437eae SHA512 f784f31fce0b3476cad505cec2c7ae3a9c65b693bbe6d70beba33039eb55451bc6f29c95ac38f1ef9d5e73e99b0d4a0f5f84fe6bbfde31d67a2c789e998e3fce WHIRLPOOL 8d15f412450e775bb8fa8a3b12a4553034f4dae2fdb0245f27f5324284aaf89c5c5a10e0ae2bf6cdb18b0b35f374596c5ef4987608446901e92bf94d34ca6885
 EBUILD java-sdk-docs-1.6.0.30.ebuild 1564 SHA256 389c2cd0367d619a2ea660b5b5a9c5e370c6043486470bf9c1a7127e84aa32da SHA512 bf84b5458071f61798b819ad1186ac15f623df19bf39eb33c1ab29e2e4633c53fee762396de47d03ee51e6990f4886f7a0572e7c7cf6f2ece37444687fa9a8c7 WHIRLPOOL ab8654edcb87a6ebdd91457552c404e9020fc1cfdef00c3b7c0c5d2cd4c2cc61a5b7c7cac6ea6b92c0e7a4e6cad4f3a80cd153ba9dfc52fc43b86758beca4132
-EBUILD java-sdk-docs-1.7.0.25.ebuild 1471 SHA256 04a3b6984cef6617df0f85affa0c6e74517b400e7f4b19af6b8d4cffdcba99ff SHA512 4efe44613bf21b96de8f54e5bd21c04c072769701a457e52b1a218a2fd49fe1a0ee1628b742def4bba171f0e8cc909cabbf46b0e8c9f08355b3e7ccfe3a61902 WHIRLPOOL b88986360bf064c0960cb74da9337072cbcdcc6fda8db7ca87b620cf14c5aa8ce89d6dff56dcc19024f9578b108d6c28a8b0a794bb66e803a553eb1d0c6b01d8
-EBUILD java-sdk-docs-1.7.0.51.ebuild 1475 SHA256 aa4d631eb4dacb416b4447a30434ff6870482904cd9dfa25661a230e0a555dc5 SHA512 735c371b9c22fe24dc7560457ccfea87d068b7e70a78af121b925eef3d7455cc2e7156a86e797cebec04ebb9b5e345a7106ca93a5ea9f392c9da58fec200e2f9 WHIRLPOOL 9a6b02aedfb1b08bd8d425765806ee34c18428d16687855ccee36214b478b905e528fb476070182e61da7a22b55764fc0c95853f651e7a04b3e856fab1065050
-EBUILD java-sdk-docs-1.7.0.55.ebuild 1479 SHA256 00b2cc90793664c7b6252e1889f2fe6eb853ccb2c45e03661d5061c473cc91e5 SHA512 2fefc96fd3c80be5f30e410d146808ad937ed9373a6b518e3c87a51ee7ed799177b29b2778ca4bb91d82fd75cf1094de0ef069f3770c80de820e8c70af05c49a WHIRLPOOL a90aeb6c66a6fca8f91fdd2a97822744f665bef7e03191226a3881624e592304a44cd0464be650bfb1a7aab579d6b0503b6e9c4621fb8dcb4ff7376600872157
-EBUILD java-sdk-docs-1.7.0.60.ebuild 1473 SHA256 bfc545e93618a6aa66b4c184d3d4db7f8aae68349713a73f8cfce84117233bb4 SHA512 88dc7ec33b389dabd75a1423fa39c8dd49f06b594733c5355a91718e63af3b0df43a58ed6da69aad94a6b7716c55f5a5eb79973019091a85e89603aaa7523810 WHIRLPOOL 6cc645b5077d0c4458503763d7c7bf82564afb6086f45894489d1f0d75985a6f279e858f4d2834db01329e3ba0c4912cb3e690c44e5c827785b411bb9c2a992d
-EBUILD java-sdk-docs-1.7.0.67.ebuild 1482 SHA256 c05c8532b28be807d7e978e038ac222a3d1b788ac0a6b73f61c8203ebbc93a8a SHA512 64eeacaeb3a24d1914780c9ec5b30320572527fde8551fb7248f4bd3403d2bf75c9af4a54c4f83c10bb84064954a91804ed3da68ed20b23638786e661e60f4fc WHIRLPOOL 2a5d05636b351036176ad3be1de2a95c13bfa413e2ba99594a6f94d623793677edc10e3ee27a3a59e4a864328696a26f3d5afa2926d8afd02fd6802c3ba9523e
-EBUILD java-sdk-docs-1.7.0.71.ebuild 1477 SHA256 245c45189011a66358b51066cefb8e67b198edfe3151e5ea7d2f1c7601911180 SHA512 51fb92c526bb514d17bbfb7b021aceedbe4b73b36629dd63498c3d113194965ebcd48fa7c2510c58ad6cee711520bc42a625e86a2743750fc0d3c083cd5c30a9 WHIRLPOOL 8d13533dcc7760c522bfce83c3b0379d9c4c9b9572e874c5bcdf8ad22c9ffbe9965a7d2af521351f0f1b662f022a33a4c3b4eaec19b90210a8bdabdc5a22f6b4
-EBUILD java-sdk-docs-1.8.0.0.ebuild 1594 SHA256 56fccaddd933c3201e888d83d806f9aba561bbbda3465e71d9ddc8ff1709d405 SHA512 bd04a31a56c5d0ad184b4ba061862614a8b0ed6a2f4fdf7f7cf324a2b9795a7636436cdcb32cd7add369f0086270d8e6187e11d4bd58855d1d45a778c995c154 WHIRLPOOL 8e334e1e0d905d69b953d4c0d1d22d364d44b833a3d95b973e8ec4120efd07c2fd11f197a8ed5f79af5c8718cde2fa854cadc9b6fb47620f03774695ff868ae4
+EBUILD java-sdk-docs-1.7.0.71.ebuild 1479 SHA256 2411acb80d098c5b5713527a193a03ff4d83fa390b06a9c780315c512e7a5050 SHA512 eb507a721732d8aca4081174cf50bf87586042e674e524785b8c6a6793536ed5ad57ec591f1a24632167f8c3015c727b3311e99f2529c28098e3569894357fc0 WHIRLPOOL 828679e5da4f1c65f1410366c85caec8d188f25c183a478cc7bee4b641aad13a75acc6f3061ca41a5936e4bbfe724f787152b5dd83880ce9ffab8d482707eece
 EBUILD java-sdk-docs-1.8.0.20.ebuild 1598 SHA256 cb29859c4cd258b7d14ec9ac4926c655ab88e4541f055ce2fc8399e2cd6f68b2 SHA512 8b7e3627cfdc45d0d125ac30b952108f1bba9edfeb8a3af1d2533f940cf97ff2dd661b065396e475443094374b702b58b700f4e91b61a60d972db4e0cc1ebbb4 WHIRLPOOL 56ab91aec459d60e794d6845deecd2b0e3c20f13a1737323b962ded6a6b534f9dad4d3f4acc8560ebbbee673e1b18f7235e96058abe517cf9215a5cbb715b6a2
-EBUILD java-sdk-docs-1.8.0.5.ebuild 1594 SHA256 f2805916b8bcc699c2f3598900e5ef74415f6bc2744a265a8610c470a814d366 SHA512 931ffdd906f9b55304157b5b66f48f0711454feb6d27e866e6d8180f4c2d5e5c7885393a4350ec8cb6e3bf2fcdcc878137f56446c743780111f1fc6b995f7075 WHIRLPOOL 308dce152b4e1b6d3c61486fd52bb54b27734af402d308a94f1f1a48ee2cea2db3e5b289fb2409035257af2417fe2c1a077ff38c463e6f69b800bb0962d9d6bc
-MISC ChangeLog 16626 SHA256 11a245e03d74bf415f44e772b684a836ed5b2a7d6ece7b4e88435b6d72567150 SHA512 325fb10c9b0da4d9428f612a67c3ee222679e6b218ef012f6418fe7d9a2ee26bb50b629ebab7d4d36fe9e795002457fdc597b843084759dee5d3032b72739c27 WHIRLPOOL bf4f89766a0d6ae9f05e87c03a990124f79e2edf50d355fac3b81edaceabdec2e3e173705c7178df95e56546d6ff397c470786b7a0760d66cee261071653e097
+MISC ChangeLog 17082 SHA256 c1ca3fb32492a05e1fbe450c3db11aeb4e9733a22cc8916946e3ee0f4d294a84 SHA512 132b55c1de801e77e124eb0f51a2557b0b5f48a9d1be6edaa8c2d5e1ae5a549f13ee175a0289d5c57d006f4d7761412d3b2f75d7a1877498778abff651eef4bf WHIRLPOOL 0fe10b89acfe990aa6a8bbefd150b69d264b43a7cc0553976bb3f530cc69c33426ea46695bdb2c5fda7b6b71058c28abfd52841440eaeb04e73b2c90d3692ee1
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUVRG/AAoJELp701BxlEWfDLMQAI+lmpNgNi57w7C0NRz3TDbW
-yPLokih4O+UW/JV48MoXF5ld+zGjaB6wgwQdn1skWd3u9+t5Uk1h7E+GXLDeV48+
-Nk9Dphvo7I5ebtNbp7E+RMTMif0VEIqC5/7CV3QTay4F0TDZDirTOsH9wGhTWFxF
-1hTYimPQs4jk8o1VLqVy/s0Pe43QJfUol4hEEhiC6MQ4PghdF+WMjROwP5h3tBp4
-y4aIDN0BP5vIN3ASpYZvSicIXYLqSToZQglE+1U+Iw0OlixlbFVy0Lwukfk1s99j
-EPWgXLDMoJLRHatIF4fwrsaEGmEW1SoYimkoTBMmpyCuBmX5K858MS4JGgCKta1d
-dT4cSkUvxdUPnYr6aAqvDK+qmHYE/t75B4WrLNvV7WuDT+Mnfl8CGdivIGDuUpKD
-IZc1DBhqs6kpBv3cc/QzKKni/O6coM5V6Lt4pHMjixMpN01Uwksk5mKK4hbzReHp
-raYxbq51QPHki317PL71rlA5Ii8UR3MDnkfhWM9lAvF/Z8ybbQoLpNwM8olOBkGg
-uRKFFgCZbIszAXiRuJiYlmfEcNIpnzuj9p5WgraxS4QBOPWwiDNj3VZPOCLTvoDY
-c0Y7Mg2A5fX2NGDtNPEVBJShZHCDir3cSLwbCle+vrmFBgeGW/14Q2hMugZuOTZ2
-a3CX5CSZqXUMTbhnjsms
-=EKqm
------END PGP SIGNATURE-----
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.25.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.25.ebuild
deleted file mode 100644
index 939a463e114b..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.25.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 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.25.ebuild,v 1.4 2012/03/06 21:10:32 ranger Exp $
-
-ORIG_NAME="jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip"
-SRC_URI="jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip"
-DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/6/docs/index.html"
-LICENSE="oracle-java-documentation"
-SLOT="1.6.0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-RESTRICT="fetch"
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u25-doc-download-355137.html"
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. 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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild
deleted file mode 100644
index 9c33018fa439..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 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.7.0.25.ebuild,v 1.4 2014/05/05 12:28:46 tomwij Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. 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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.51.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.51.ebuild
deleted file mode 100644
index 572e55714dac..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.51.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 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.7.0.51.ebuild,v 1.1 2014/02/26 17:27:08 tomwij Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. 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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.55.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.55.ebuild
deleted file mode 100644
index 11b11f047944..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.55.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 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.7.0.55.ebuild,v 1.2 2014/05/23 13:26:21 mrueg Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. 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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild
deleted file mode 100644
index 1e51e0fa4e01..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 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.7.0.60.ebuild,v 1.5 2014/07/13 14:12:47 ago Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. 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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.67.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.67.ebuild
deleted file mode 100644
index 5b18e9fb1716..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.67.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 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.7.0.67.ebuild,v 1.1 2014/09/26 11:02:04 fordfrog Exp $
-
-EAPI=5
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
-ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. 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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.71.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.71.ebuild
index 6d2c9d399b76..63faf612e13b 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.71.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.7.0.71.ebuild,v 1.2 2014/11/01 17:00:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.71.ebuild,v 1.3 2014/11/02 13:18:15 caster Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="${ORIG_NAME}"
 
 LICENSE="oracle-java-documentation-7"
 SLOT="1.7"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.0.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.0.ebuild
deleted file mode 100644
index 4c3490857227..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 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.8.0.0.ebuild,v 1.1 2014/03/28 13:20:38 tomwij Exp $
-
-EAPI="5"
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-doc-downloads-2133158.html"
-
-[[ "$(get_version_component_range 4)" == 0 ]] \
-	|| MY_PV_EXT="u$(get_version_component_range 4)"
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-ORIG_NAME="jdk-${MY_PV}-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/8/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-8"
-SLOT="1.8"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="app-arch/unzip:0"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. 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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.5.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.5.ebuild
deleted file mode 100644
index 848bc45e778b..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 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.8.0.5.ebuild,v 1.1 2014/05/04 20:32:07 tomwij Exp $
-
-EAPI="5"
-
-inherit versionator
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-doc-downloads-2133158.html"
-
-[[ "$(get_version_component_range 4)" == 0 ]] \
-	|| MY_PV_EXT="u$(get_version_component_range 4)"
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-ORIG_NAME="jdk-${MY_PV}-apidocs.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/8/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-8"
-SLOT="1.8"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="app-arch/unzip:0"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. 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
-}