Version bump to 1.7.0.21. Fixes bug #468084 reported by Sven Müller (musv).

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 63 insertions, 9 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index 724187c6654c..7a4834f9f511 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.89 2013/03/10 12:07:03 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.90 2013/05/10 09:16:00 tomwij Exp $
+
+*java-sdk-docs-1.7.0.21 (10 May 2013)
+
+  10 May 2013; Tom Wijsman <TomWij@gentoo.org> +java-sdk-docs-1.7.0.21.ebuild:
+  Version bump to 1.7.0.21. Fixes bug #468084 reported by Sven Müller (musv).
 
 *java-sdk-docs-1.7.0.17 (10 Mar 2013)
 
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 3e1da3d64cd0..98fe408c9e10 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -8,6 +8,7 @@ DIST jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip 59089445 SHA256 6e115142c3cf56
 DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
 DIST jdk-7u11-apidocs.zip 60762021 SHA256 64f95701ac951af78aa23ca21e965cf430a76a2178173816d39395e9f86c78d4 SHA512 22d483556d4fd8b380daa0fdadff530a5cce11c625cfe3d12fc98243072173f03c8dca5e01d4c7d98d2fa08195f73d04863bb61b551907319b782ed11e915616 WHIRLPOOL 689bad1d20490c33a6f97d524556ec06aeab035e316e7cb1033ffadd9cc382ebd89187588069475168abddd99d5e1d3075195baaa06c0ead808874b806fa3a19
 DIST jdk-7u17-apidocs.zip 60736131 SHA256 dc97bb4e76e288830668a9dae96454d615cf74d6f88f38008923b3248836baba SHA512 668cd818a2893a69b5103a63463584d5c85fe6532e05763dbd7edea7fe7e55d060a36571d2bfb67ae4cbbb6115816d9c86a5b00150b1d07c2a3318eb8c561959 WHIRLPOOL 23be4bfddfda0e7350bd310216491adbcf32cc70c0fff64063496f7e01d671532097093d93eba1dcca45535bd68e1651edab8cb4d527dc80947bb51602a09092
+DIST jdk-7u21-apidocs.zip 60738398 SHA256 06afff0fa76987d52c4a083d73cd8f1d9ebc04d3e732f09f8b7275760bf16bef SHA512 5a7cff4e5e64642fe1f3e0971731ef44f408c1bca50216358fce3f96310276d61ce193dd27d705733041d79f3ad2bfab69bc98a76198adbc26a6f4fe06352eee WHIRLPOOL 3bd6dd47078c123eaf9f691d388b6086c7fce7971b141b2cb3e770111136b288068aa03abfdb80eb1e5a895fee09e092271ddbc14b969394ce6cac648d370709
 EBUILD java-sdk-docs-1.4.2.ebuild 886 SHA256 09d1b90444fc7dac7d0d536a67380125b28a6fbb95173c156f370058b7e43f30 SHA512 1a4b7366387f6e56220b34118011ff971fd8c3e573bddb28878d5f1300a981cb5501aed674fe8d1eac7c908842a28b91ed16706c0d079e733413ebe02867f06d WHIRLPOOL 78109d2191514f39d1db068aa9db5a67bdb6319970c760a8cba92788114903686efaf54e4391ddcdb283447d5b57fba41d00140f53a42a3c6bc4c77ed5291402
 EBUILD java-sdk-docs-1.5.0-r1.ebuild 1586 SHA256 e36befc28935b01a628d745f40bd342819643b6b9ea281c75fb80305783bc87e SHA512 ec4be077de6377c425f7daa334cb0520f638f0e720c98a85722af994534e96fc47333ee8b6106eea7984ab1f52f58fe8c6773752c9aee102cecb407263fba14f WHIRLPOOL 496aa76d5790c1d8f9ef6c280d26412a3f4dc03076e7f0efb494f2a82a76b915437c5bae325ece24ac0da74c79d927ad8105d2d30ba1ffd74a7674e842ec629a
 EBUILD java-sdk-docs-1.6.0.23.ebuild 1771 SHA256 3bda18f63db4039b16a31c0f7fa4020b9de12c4356665fcd615a498347e82156 SHA512 c2940e8bfa50a7684b62b9ecce7c53d10bdef4a380fb7ecf238350f5146a41f9d649901c676f007e8b7f176f12da031ad394766b9af1c14169f456d0dcb0aaca WHIRLPOOL 8aaf02ed6bb2906428773ff489579fea31f01f3bd4797db8d74704e3bf4da47dc029c378e86707dd55587dbd437e83640d13f98ceee4b0dfeecf88272fb31de9
@@ -15,16 +16,17 @@ EBUILD java-sdk-docs-1.6.0.25.ebuild 1478 SHA256 35bac3d6c761e9fb882cb0da58eb1c2
 EBUILD java-sdk-docs-1.6.0.30.ebuild 1564 SHA256 389c2cd0367d619a2ea660b5b5a9c5e370c6043486470bf9c1a7127e84aa32da SHA512 bf84b5458071f61798b819ad1186ac15f623df19bf39eb33c1ab29e2e4633c53fee762396de47d03ee51e6990f4886f7a0572e7c7cf6f2ece37444687fa9a8c7 WHIRLPOOL ab8654edcb87a6ebdd91457552c404e9020fc1cfdef00c3b7c0c5d2cd4c2cc61a5b7c7cac6ea6b92c0e7a4e6cad4f3a80cd153ba9dfc52fc43b86758beca4132
 EBUILD java-sdk-docs-1.7.0.11.ebuild 1420 SHA256 9777ed547157167818c20d8380e4451418651b96f325c7ae4d519032d5947fd2 SHA512 a344394b65821a3d0b0b6890d0ca04e4ccb8f2d1b4e84434cea1b64663110b7b8eec7eb1dc7711ce5369ad0be06581d6124d3bec2132965b5ebc4d0aa987a005 WHIRLPOOL 432310e53be27f71c4901bbdce8777c7501b091ae1c643462c9813c2a3c5fb5b5da8a7d02f5b1639a108f663c6c3c446c94c032aaee57fc04f2f54b769d89e4e
 EBUILD java-sdk-docs-1.7.0.17.ebuild 1473 SHA256 65901b44411f0c204934b22358c08d80a434d4142a97703cb40eaaf0cb68345e SHA512 3309def902fb7a7e57bcee8d1b2f1002d1a8a8e4897914bc1aa63a4d57e51866e594ca8af4dbc3bbfbc3d85f95665dec42a4b6f88412cd0303cf0824584edd12 WHIRLPOOL 0bf3246a298b9043d0c0630bc04edad2aa69cd6f3bf9ca1645842e1dcf24fa67f2df6eeb5082201f4dc2ee1e719830ffa041660dd044e9629f58449ea0e4a68b
-MISC ChangeLog 12804 SHA256 81110cab7b0e3948b15b55d7969c644d19c780c2ba745996fb70f4a6f98c9ddf SHA512 291e19290fa9f208623c5a7d275f7af53f7077c6cce76a08cd721f322e07b891dd915de2425be7f244798d948b4067d4d361a279276903db8a37f00aeca97c16 WHIRLPOOL d28293e373c474df90eda188912121f5ec8eb887edf448f018fc59764198cf792b22f9f36dec544990d4abb95bc27c283d4d32ea38be2ddef11d332df2830f9a
+EBUILD java-sdk-docs-1.7.0.21.ebuild 1475 SHA256 e20b8988144a18f134eed36aedb46dc3fedd2e88ceca1b40211b96a4db84fa34 SHA512 94004f53b51786b124ead41714b39c3a19ddee190b5cff0a3e3a23b78adba288be3fef1b8f64bde1e1f6f85683c248519e2c3168340b0c0f2391f60293131aaa WHIRLPOOL d4dee10ff655437d69a0f730e0ac4e9f88503fcca734870f9fbf7471629444447dc8e8f7e3b77b20f014e45b8342e4106d53791729fd09e47edf71fd4984530a
+MISC ChangeLog 13004 SHA256 49a842d7464032b0819d7182e4be323668883c9bb47f257ad75294f6d56638a3 SHA512 6e838450597f4c68327c6e4732b74b00519bd2b905f4320821f04f3c43501151b8c9f748fb66cac1958cd653086f883d681724f3cde15df82fa84c2df598d112 WHIRLPOOL a4d4ea19186f6fe86a51db9f249c4ac74e7365c1ae522b175674a1ce3739246f36a599c56687d5d817d114e069304c048b26de9f63d86e41b0414a86583ed1c2
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRPHd0AAoJELjwI6Q8XPdau7YH/1kvRVLNGakEWJoC6iodgqfi
-JnKMEgun1cjvRQM/JUfUoLW7xkROxznI3UmDUsYVhxVx34eetimF8UVlsvI38XWE
-z6K4Co2SSPwrkXMQm3Asa96vRDiFCAkrQhXHspiwfkQDbm6WpBTGOlBRVmv4bSQD
-a9v7TobUGQhqDIjW5Gaao1thwqNi/471mgQ2y9DutzKqLyOc6Jek72qPJGAxtxdO
-vTsfAhhlk3TIrVQmeHxPjL2qov2cRdAKrB8hVsmENRROYEuBLu3xlCktdGyr8zzC
-4gcSL9ArLVhr6nCTxRE/ZxFIr68WP7/1dZLuuRL1Gb+7bC5okJbIcCbG/47JInc=
-=T9+X
+iQEcBAEBCAAGBQJRjLp4AAoJEJWyH81tNOV92g8IAKqXMKroJ9xmWZzDzCoOu2x/
+U9iFdTAI7k0u8Xe0BNpte3rIVezndzk1q4HfyN+y8z/sZw+lVw5jCAgYiRdh3Bkn
+uQQ5o3ZVsxvcDvTUpVYXk69X4IXh61fNW/q3HGJ73kqfI6igVCuT7g1Ev5MowCu6
+Q/UZseebfT/rbH/KtHB9tazCckOF4UPQlnE769GMDW0KJ8HI4q3feISVt/ZunE62
+gt3AW9V/JJ5e/lz4OrhVG1kDPVtj8i2OT1c3AGFIbdgkxiUHrOy/KFEdJu2Jz8sl
+WG13t57myeMG6TOARLwlyWCVLAtGkeB/gBOVAMsarJ2f/LB/EPwXzc8lh/epEYI=
+=N0oN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.21.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.21.ebuild
new file mode 100644
index 000000000000..e717ef8ef293
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.21.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 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.21.ebuild,v 1.1 2013/05/10 09:16:00 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
+}