Version bump, fixes bug #319235

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 56 insertions, 12 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index a1303ecc42c6..951211b63ec9 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.68 2010/01/03 20:49:01 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.69 2010/05/11 07:53:15 caster Exp $
+
+*java-sdk-docs-1.6.0.18 (11 May 2010)
+
+  11 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +java-sdk-docs-1.6.0.18.ebuild:
+  Version bump, fixes bug #319235
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   java-sdk-docs-1.6.0.10.ebuild:
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index a6bb34ad3350..eb93af1803f9 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-6u10-docs.zip 58890428 RMD160 c01d0a80f606ee59f70525e723814f38b2c53e4b SHA1 5390e7dbb566b0fa8cc491bdf102fe5a53e483cf SHA256 429e805af7d8c01f357e3ae2c600a0913b17f207b35f7f9f3b22cdcea6476481
+DIST jdk-6u18-docs.zip 59037591 RMD160 dec02b2ee726bbd82d36e446bd3ae8e0e85f853b SHA1 d6fe50a5f65145297ffb2cfe51095d262e78bb8d SHA256 2fb5435825a6a7a524e762c8eaf7d765e7c4f64f90ad452b68f8e9646f13b50a
 EBUILD java-sdk-docs-1.4.2.ebuild 886 RMD160 4399350bc73201bdd7802acfbe4009a70aa78772 SHA1 97922217b405748ce1dd29d154bc863546c8224b SHA256 09d1b90444fc7dac7d0d536a67380125b28a6fbb95173c156f370058b7e43f30
 EBUILD java-sdk-docs-1.5.0-r1.ebuild 1584 RMD160 b9a20a5a4c9c6b0fd35f2f18d9a3c11fefabb7e2 SHA1 cbdf80b3e8c0f6ec32dc0058fe6555aab6769a66 SHA256 2cd389433a0a46ea3a46ea04290fc5163a85a40545a4aaa9507dbde4755581a8
 EBUILD java-sdk-docs-1.6.0.10.ebuild 1562 RMD160 63a196d2952fd1a7abbb3d03aa34a44bcfbeb3ed SHA1 e84761f8b9eb88543073e396cc29ab21e07cb21a SHA256 d5b6ef8f34b6ffbfe791a4d7cff2655e96605cf0b3d08d491d26f32a265d93b0
-MISC ChangeLog 9675 RMD160 6c17423f0034d5d477f637533928be2e13b2ba3d SHA1 5ae08ecdfa5efdd6bef1e1a32964da79ddf4cabe SHA256 c87f7b320f5a778d5f1517b1e2235a2039452128c99471bd8cf500b4fd1049ef
+EBUILD java-sdk-docs-1.6.0.18.ebuild 1767 RMD160 c6002c8076fb8c1a1044da7008e79077b88eb501 SHA1 2eb9993e92957bcc7a8ea1bfb73f367108a85c9c SHA256 8fd63899bfc8584781b8a6a53e50b17515d37bbeaa0dd3fbb6e04f9d482e41c5
+MISC ChangeLog 9835 RMD160 ecf7086fec45fed472dcc4543f8e97baa4409e17 SHA1 10522cbeb2b7d2fed36b8b591df95e005cbc4be6 SHA256 22ada49468a8429a0aa1804dca1a9edae19ab77661050f508c752239799001e1
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktBAsMACgkQNQqtfCuFnePFcACfS9/hrByZJb9eIfuWq3WIYI9u
-+L8AnR4oDlv2s1w7Ld5/zi2y+/znaSFx
-=x5hn
------END PGP SIGNATURE-----
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.18.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.18.ebuild
new file mode 100644
index 000000000000..3dc82de230f4
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.18.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 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.18.ebuild,v 1.1 2010/05/11 07:53:15 caster Exp $
+
+ORIG_NAME="jdk-6u18-docs.zip"
+SRC_URI="jdk-6u18-docs.zip"
+DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://java.sun.com/javase/6/docs/"
+LICENSE="sun-j2sl-6"
+SLOT="1.6.0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=""
+RESTRICT="fetch"
+
+DOWNLOAD_URL="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jdk-6u18-docs-oth-JPR@CDS-CDS_Developer"
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${ORIG_NAME} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(select English and agree to the licence) and place it in ${DISTDIR}"
+
+# It appears they at least bump the filename nowadays
+#	einfo "named as ${SRC_URI}. 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 for existing and new downloads."
+#	einfo ""
+
+	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
+}