3 files changed, 12 insertions, 45 deletions
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 7e0d165de2b6..db0dee87c255 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -3,7 +3,7 @@ DIST j2sdk-1_4_1-doc.zip 32765641
 DIST j2sdk-1_4_2-doc.zip 34397778
 DIST jdk-1_2_2_006-doc.tar.gz 10832069
 DIST jdk-1_5_0-doc-r1.zip 46191338 RMD160 d783f2175f84d76f867b7358705a2819be5afb68 SHA1 86e30770a4ecc395bf8fbaea1bdef4d2a81df877 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
-DIST jdk-1_5_0-doc.zip 45635523
+DIST jdk-6-doc.zip 54897973 RMD160 0bb5e2294e35a06b4bb490ec6de5db7a77daee56 SHA1 ccfdf83aca93fcd64ad80424ef691167ed697ead SHA256 b7db4124017708e85303c0269e2e0d49639df2ff5aecbbd870e3fa35bd8ab279
 EBUILD java-sdk-docs-1.2.2.006.ebuild 963 RMD160 086349c1a0cd1eeeff93c24ba73eb608321b7997 SHA1 507d6f643c1f23beb64060476b1a6d5f98a9738b SHA256 8269f701c6d2bc7ca1b03d6fd8e7e072e5b7a72aedfb15ac7d88c74e60beff59
 MD5 618c9d9a726fb108e5ccdb00a218918e java-sdk-docs-1.2.2.006.ebuild 963
 RMD160 086349c1a0cd1eeeff93c24ba73eb608321b7997 java-sdk-docs-1.2.2.006.ebuild 963
@@ -24,14 +24,14 @@ EBUILD java-sdk-docs-1.5.0-r1.ebuild 1499 RMD160 a2f80f445008a29e15b2ecdb162b39f
 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.5.0.ebuild 940 RMD160 34ca62991dac7ca6072a25571a93ce9dd35a6beb SHA1 c6b79ca9d61a6ec0037b63b4ee60a37522b38287 SHA256 7b1b1cecc26985441d5c190f9f5f0b9d66f38b6cb7770a5eed6d92fe2c1df108
-MD5 ca9101e412259fcd15561bca9ee5db9a java-sdk-docs-1.5.0.ebuild 940
-RMD160 34ca62991dac7ca6072a25571a93ce9dd35a6beb java-sdk-docs-1.5.0.ebuild 940
-SHA256 7b1b1cecc26985441d5c190f9f5f0b9d66f38b6cb7770a5eed6d92fe2c1df108 java-sdk-docs-1.5.0.ebuild 940
-MISC ChangeLog 5994 RMD160 b37aa424deec905dc323d61d76cab91c7722d9ce SHA1 c482d6f4a6d2b3eaa76fd24e86e34103f02a2f51 SHA256 92ef09d09555d1726fde321a4762d3732d88366a98061dc6e3ec903165dc1908
-MD5 4bd8f37b45bffe9c4df94acb9326baa0 ChangeLog 5994
-RMD160 b37aa424deec905dc323d61d76cab91c7722d9ce ChangeLog 5994
-SHA256 92ef09d09555d1726fde321a4762d3732d88366a98061dc6e3ec903165dc1908 ChangeLog 5994
+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 6175 RMD160 d382c1b18f0e075931a407cf2564e0c2cb2faeff SHA1 458ad0c5d26854647b1208ab674666e676da6b9c SHA256 ab4c05a1a3149782427269ec5978f2cde884cde6655168d43e0cb1d050999b23
+MD5 ccac13f8e15386272369aafc06474bc2 ChangeLog 6175
+RMD160 d382c1b18f0e075931a407cf2564e0c2cb2faeff ChangeLog 6175
+SHA256 ab4c05a1a3149782427269ec5978f2cde884cde6655168d43e0cb1d050999b23 ChangeLog 6175
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -48,9 +48,9 @@ SHA256 7f8aca3d63282c7924f271cf8e065cdc9a7661717c1c75355e168afaadd6911c files/di
 MD5 a4380575c5e11174354f8f4bac538fbd files/digest-java-sdk-docs-1.4.2 66
 RMD160 f4c3bb9d464586296e70428dbb7478e26c39ff57 files/digest-java-sdk-docs-1.4.2 66
 SHA256 5367ac81eefbfdcbcf821b3d86a0950645014338cde70603c1aefa02cc9ee0d0 files/digest-java-sdk-docs-1.4.2 66
-MD5 b8ce8e1af0f32a08098988c3df744f7c files/digest-java-sdk-docs-1.5.0 64
-RMD160 ef57b209d58e092bccdeebf2ada587fa73efe5ab files/digest-java-sdk-docs-1.5.0 64
-SHA256 114e783e085520f110942c7f2856763f9b5041bce7ffeec94317d21af1ae2822 files/digest-java-sdk-docs-1.5.0 64
 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
diff --git a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.5.0 b/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.5.0
deleted file mode 100644
index 81eb3d4e78c2..000000000000
--- a/dev-java/java-sdk-docs/files/digest-java-sdk-docs-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7393821092bb4e14ad6c8e0149ddb46 jdk-1_5_0-doc.zip 45635523
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0.ebuild
deleted file mode 100644
index 135c58bdc58c..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0.ebuild
+++ /dev/null
@@ -1,32 +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.5.0.ebuild,v 1.9 2006/10/14 01:41:59 tsunam Exp $
-
-SRC_URI="jdk-1_5_0-doc.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"
-IUSE=""
-DEPEND=">=app-arch/unzip-5.50-r1"
-RESTRICT="fetch"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-1.5.0-doc-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_install(){
-	dohtml index.html
-
-	local dirs="api guide images relnotes tooldocs"
-	for i in $dirs ; do
-		cp -r $i ${D}/usr/share/doc/${P}/html
-	done
-}