Update download links to new Sun scheme. Bug #221007.

Package-Manager: portage-2.1.5

4 files changed, 15 insertions, 11 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index bfe5e122f1d0..31ca9201956f 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.59 2008/05/12 10:52:35 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.60 2008/05/20 14:36:58 caster Exp $
+
+  20 May 2008; Vlastimil Babka <caster@gentoo.org>
+  java-sdk-docs-1.5.0-r1.ebuild, java-sdk-docs-1.6.0-r1.ebuild:
+  Update download links to new Sun scheme. Bug #221007.
 
   12 May 2008; nixnut <nixnut@gentoo.org> java-sdk-docs-1.6.0-r1.ebuild:
   Stable on ppc wrt bug 217442
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 6e6c168d734e..f3bf597cebd2 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -2,7 +2,7 @@ DIST j2sdk-1_4_2-doc.zip 34397778 RMD160 0c7646893ee73988327ebd97bf9ff6469c0bb7f
 DIST jdk-1_5_0-doc-r1.zip 46191338 RMD160 d783f2175f84d76f867b7358705a2819be5afb68 SHA1 86e30770a4ecc395bf8fbaea1bdef4d2a81df877 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
 DIST jdk-6-doc-r1.zip 54898268 RMD160 d23c95a90cbf92206499f2c73b2f66b61d8363da SHA1 e27ea67e6a1691cd01046804462bec79ec9440e8 SHA256 30df77761591681cbb259dce028a728926813fcd18e7f87ad9631f64fe7f08bd
 EBUILD java-sdk-docs-1.4.2.ebuild 875 RMD160 909e8284b1b3ffaeccd6919b831d7d88d34ab102 SHA1 aa9cca72e691d235809bef67aa8d8c2fd6d280df SHA256 60d4a2c847f1bbe68e8fc15e0d74b6f9da0deef72fcc4a0b5e9411c39cede876
-EBUILD java-sdk-docs-1.5.0-r1.ebuild 1498 RMD160 34f1c03b97881ab5ee59de4f9f6f6a20ee8aea55 SHA1 ea8cdf43390d9cd6dd3b9b309e4072c238f0f766 SHA256 7b3d7547f5e3362a01cbe0f3e586c8a7fdd22d27756627b3f0a4bdefb449f6fc
-EBUILD java-sdk-docs-1.6.0-r1.ebuild 1487 RMD160 64d1d9f74651c2a375df89a2b3eaf4abae143c6a SHA1 f87eb2610da5b5825acb942236567dd828f3eaa7 SHA256 51578997bc5bd7bbf8ccda4bf8fc8564f485c7d3f3f8dc0850d1abc117c3b0c0
-MISC ChangeLog 8385 RMD160 f7699f3fa362570349637eb0bb3177ab2bc62f98 SHA1 8c4b61220d36ca342ca491722c2e1eeb034b1e75 SHA256 1c975c8112ff0153c678c95bdccf818379041c2eb1172a4e6f333bbdcb1f2f54
+EBUILD java-sdk-docs-1.5.0-r1.ebuild 1571 RMD160 c8a9ea3333fa6488712a690249d417a250227f79 SHA1 2109cbaadcafcc11fff94f66dfaccc284bc7d2fb SHA256 90679ce7bc09568f67351837bdd52134bf3a59b58c4326a62f1e6136ffb32acb
+EBUILD java-sdk-docs-1.6.0-r1.ebuild 1564 RMD160 366f8996b954e7987a3632464bc51324c7906b15 SHA1 8408f94e3e05e6818d5fa0b0cc682471a2822dc6 SHA256 9498022e7bfedcc118bc7db76c9603decfc32b2f15bf9ebaa49cc90d5ac2da97
+MISC ChangeLog 8557 RMD160 ecca98058335e6cf5abfdd1c6ca055aafb292254 SHA1 62d28d98b282bf1f846faf14be21f02e0b7732e4 SHA256 7259e622c7d55f20b0bd9420fb94245cdb5019be9be07f1877851423bec10fc3
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
index f863e1aa781a..aedc48d893d5 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.9 2008/01/05 22:26:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild,v 1.10 2008/05/20 14:36:58 caster Exp $
 
 SRC_URI="jdk-1_5_0-doc-${PR}.zip"
 DESCRIPTION="Javadoc for Java SDK version 1.5.0 Beta 2"
@@ -13,14 +13,14 @@ DEPEND=">=app-arch/unzip-5.50-r1"
 RDEPEND=""
 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"
+DOWNLOAD_URL="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jdk-1.5.0-doc-oth-JPR@CDS-CDS_Developer"
 
 S="${WORKDIR}/docs"
 
 pkg_nofetch() {
-	einfo "Please download jdk-1_5_0-doc.zip from "
+	einfo "Please download jdk-1_5_0-doc.zip from"
 	einfo "${DOWNLOAD_URL}"
-	einfo "and place it in ${DISTDIR} named as"
+	einfo "(select English and agree to the licence) and place it in ${DISTDIR} named as"
 	einfo "${SRC_URI}. Notice the ${PR}. 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 existing and new downloads."
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild
index de7dd4066fd1..1dfd0f623fbb 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.10 2008/05/12 10:52:35 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild,v 1.11 2008/05/20 14:36:58 caster Exp $
 
 ORIG_NAME="jdk-6-doc.zip"
 SRC_URI="jdk-6-doc-${PR}.zip"
@@ -14,14 +14,14 @@ DEPEND="app-arch/unzip"
 RDEPEND=""
 RESTRICT="fetch"
 
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-6-doc-oth-JPR&SiteId=JSC&TransactionId=noreg"
+DOWNLOAD_URL="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jdk-6-doc-oth-JPR@CDS-CDS_Developer"
 
 S="${WORKDIR}/docs"
 
 pkg_nofetch() {
 	einfo "Please download ${ORIG_NAME} from "
 	einfo "${DOWNLOAD_URL}"
-	einfo "and place it in ${DISTDIR} named as"
+	einfo "(select English and agree to the licence) and place it in ${DISTDIR} named as"
 	einfo "${SRC_URI}. Notice the ${PR}. 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."