Restore java-sdk-dos:1.7 stable ebuild, fixes bug #509582.

Package-Manager: portage-HEAD/cvs/Linux x86_64
RepoMan-Options: --force
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 b345cacd791b..4fe0e26a89e9 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.99 2014/05/04 20:32:07 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.100 2014/05/05 12:28:46 tomwij Exp $
+
+*java-sdk-docs-1.7.0.25 (05 May 2014)
+
+  05 May 2014; Tom Wijsman <TomWij@gentoo.org> +java-sdk-docs-1.7.0.25.ebuild:
+  Restore java-sdk-dos:1.7 stable ebuild, fixes bug #509582.
 
 *java-sdk-docs-1.8.0.5 (04 May 2014)
 
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index eb416f33d411..fe7f1aa660a9 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -4,6 +4,7 @@ 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-8-apidocs.zip 88317932 SHA256 3de88cc21051c3a2e94a7def9e937208fec94ed1423dcf7611e26b8a28f00b45 SHA512 2edda9d73ad23e64abbdb5b2363342dc1542d49f04614fac36f5bbec29109e51dfdcec970dad68da7ced75584109c6d29b62c16c37fcce86a504560d2524a45d WHIRLPOOL c013e840759df220686e73d118dd7abf94ff1c1a8d37576f1023d3baac49c724769ade56d62af87a48da308b0fcad97be99a2842f4fc08b11ed9844d808f9b58
@@ -11,20 +12,21 @@ DIST jdk-8u5-apidocs.zip 88441146 SHA256 89696b9d189066b08ef956345998bc12d0b5a6b
 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 1475 SHA256 fa4377e95e76db837c04d1793f84fab2e491ca3936533a8fd7e3ebfbdf6fd9e2 SHA512 55e91f357381b63e1bdb36f9f6bf03f53865c4a31ba4936d1552c8e1e67ac5c19ac45bd48b380c571c12c9941c50eb5f99c970f046f16366de6329fb49a5bdcb WHIRLPOOL 44e221d3f7796a56f0a231fa1786e4975c894e4e2ee77c2d41d6147f32ed97ce4b5d1433a28fa171bad83b1e4aad81b0d9ff88b114eb759e0d061d840bee4d75
 EBUILD java-sdk-docs-1.8.0.0.ebuild 1594 SHA256 56fccaddd933c3201e888d83d806f9aba561bbbda3465e71d9ddc8ff1709d405 SHA512 bd04a31a56c5d0ad184b4ba061862614a8b0ed6a2f4fdf7f7cf324a2b9795a7636436cdcb32cd7add369f0086270d8e6187e11d4bd58855d1d45a778c995c154 WHIRLPOOL 8e334e1e0d905d69b953d4c0d1d22d364d44b833a3d95b973e8ec4120efd07c2fd11f197a8ed5f79af5c8718cde2fa854cadc9b6fb47620f03774695ff868ae4
 EBUILD java-sdk-docs-1.8.0.5.ebuild 1594 SHA256 f2805916b8bcc699c2f3598900e5ef74415f6bc2744a265a8610c470a814d366 SHA512 931ffdd906f9b55304157b5b66f48f0711454feb6d27e866e6d8180f4c2d5e5c7885393a4350ec8cb6e3bf2fcdcc878137f56446c743780111f1fc6b995f7075 WHIRLPOOL 308dce152b4e1b6d3c61486fd52bb54b27734af402d308a94f1f1a48ee2cea2db3e5b289fb2409035257af2417fe2c1a077ff38c463e6f69b800bb0962d9d6bc
-MISC ChangeLog 15102 SHA256 d99a478eb6308167ba5246eee8b6244ba18fe9e2d8c54cfe00e90803617aba7f SHA512 accf912fb0037dfa9014eb61931eff033505876bce4ef8c2d528ef55da701506fd9ab0b330292a0e01a21054aca2a3b8e811f0b10cb0520d14d9ba8e3b8dd674 WHIRLPOOL 62870e6275ff51a9ca059bc70014b8fcdcb0af387a7fcfd9dd2ab6cb8123a5b12f72022f861c86c2db4c2e88019e1584ffa312f957d97c9fc81235bcb305794d
+MISC ChangeLog 15283 SHA256 1ac3bd632d76aad3cb8a6f44ece890ed5fa105b520443ca7481c64daa9a409c7 SHA512 538e987344f9c8476a27570edf2a48734cce3286dda6cca1bccee3b598f98a43ce236707f3cc8f68fb2e10b32578ef82156c099ed47a5099601d50f67decc281 WHIRLPOOL 596e6df58e63efc2d5bc4936c9c23f8d4ad60dcb3c80790e3b7b97133fd7626dd0bc50e221c4a7ac044ba35d0c6910fb13cca5c176f0323c56f8201eeba84243
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTZqPMAAoJEJWyH81tNOV9GOIH/1ebj7WKkmQZuWqpvGB+jjp0
-0IBRV/rO6ghVLyg2CE3fZskB+dPFrthnDtmM2BUnNl0XGCxCi4SeJ7FxCQDaOHZ3
-/vhz2kUF7vntLbl1OiEKZRT3UrM48twe+cE9gLo/sikBn9wbRcjg3oAUh01TwWL5
-uy+76ocEXeQx+nnJk8EVmrMYuOy4sJ4+0sdfL5jiFv1LQH6ldXwCjgFT5SYfsUmb
-S3yMTeDfAhduiHCTbj+tl3HZJKX1K5mwaNXdsp4RXXK0EeU25Lc8/OzQk4eoFljw
-Zxdohj070IAVjz5GW3NWotQVaqgt1VddN42DknnPI2Ky9+E6/s07EJx39PVIxNA=
-=LFg6
+iQEcBAEBCAAGBQJTZ4QCAAoJEJWyH81tNOV9fl8IAKdeuykm4kcIrk8HHefn80GL
+sSxHUIvBQV/h8ucs6IspXrRNlT76pVNQAFX01ksPjFqja82uM7JUw15UBw3nP1W+
+rzsPt+EKSOnbHSPmAG6IxXLTdXPlQZGOfULOHnv8A7ukhi+tVUJwSyKNuQQGxVnG
+hMJxis8+dTeDPweAKNl8Uazg/jemmyNBCtANrQ8RwYlGmDEkNiWmNoJuk42/bwNF
+DT4OTLjvbNdWMy3PH3en+qrXCgMZJGL0qO61EXIRX5HEQ30dL6t+mN42ic+mOCq7
+4J9AApDZ8C1CPdPdCD8hQ5tLyz6Be2pGHDPCQY62KQFFJGFakZrnfZsr9hew59g=
+=4Q3L
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..9c33018fa439
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.25.ebuild
@@ -0,0 +1,47 @@
+# 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
+}