Same pkg_nofetch improvements as in sun-jre-bin.

(Portage version: 2.0.53_rc5)

3 files changed, 32 insertions, 34 deletions

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 73d781d9c04d..a726c340eeec 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,33 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3a0cb65b1b04ec878b9c96908ed5149a sun-jdk-1.4.2.08-r1.ebuild 6786
-MD5 5213a160fff46bbc88446cb67f44bf1e sun-jdk-1.3.1.13.ebuild 3729
-MD5 c7ea8614185f77bd8657b327b5a70cf9 sun-jdk-1.4.2.09.ebuild 6784
-MD5 6e6334f4e89e27aca419bc2dea752336 sun-jdk-1.2.2.017.ebuild 2898
-MD5 c54b9d9bb647d3f68b7885759578cf21 sun-jdk-1.5.0.05.ebuild 7206
-MD5 704f374a634a0fcfc7ec341421a028e8 sun-jdk-1.4.2.08.ebuild 6485
-MD5 5d49aa4b2d517a27f6a7ff6c4d1e0e4b sun-jdk-1.5.0.04.ebuild 7206
 MD5 4ead8a5aaaaaeaf1683faa01b02fd366 ChangeLog 25200
-MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
-MD5 0f94a657aa38fbca24dd767967474bc4 files/sun-jdk-1.3.1.13 475
-MD5 a09b1bc3e393f76692593707b8a273c0 files/sun-jdk-1.4.2.08 640
-MD5 ca5181076e4ba09c94548af2da8690dd files/sun-jdk-1.4.2.09 646
-MD5 dd77d4988db134284732594414f5e93c files/sun-jdk-1.5.0.04 613
-MD5 50d600429785f626eef0bb4048cbc009 files/sun-jdk-1.5.0.05 613
-MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
-MD5 49cf0d15bb5d59149d1828735355d139 files/digest-sun-jdk-1.4.2.08-r1 140
 MD5 d1e29e8acce3cfec9912e23aa366478a files/digest-sun-jdk-1.3.1.13 76
 MD5 49cf0d15bb5d59149d1828735355d139 files/digest-sun-jdk-1.4.2.08 140
+MD5 49cf0d15bb5d59149d1828735355d139 files/digest-sun-jdk-1.4.2.08-r1 140
 MD5 ce8f1c0c94a74aadae5d58b68c254161 files/digest-sun-jdk-1.4.2.09 140
 MD5 3bb18cb5771d0bf04e97de8d08d41117 files/digest-sun-jdk-1.5.0.04 212
-MD5 0de34a344da0c7e14ce6b3b952d8b840 files/digest-sun-jdk-1.5.0.05 212
+MD5 40541411b01ed36dc30322d7a5ab2ee9 files/digest-sun-jdk-1.5.0.05 212
 MD5 64ade01a917993ba9712b2c0d2f4a580 files/javaws-waitid.c 833
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDPYB6/rLF9B432nYRAh5fAJ0Zn5c8Ej3ySRohrTtwZzBqZrBP7wCgs0zw
-2Zw0vgjomCsf8bN+4uI1drE=
-=1NlB
------END PGP SIGNATURE-----
+MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
+MD5 0f94a657aa38fbca24dd767967474bc4 files/sun-jdk-1.3.1.13 475
+MD5 a09b1bc3e393f76692593707b8a273c0 files/sun-jdk-1.4.2.08 640
+MD5 ca5181076e4ba09c94548af2da8690dd files/sun-jdk-1.4.2.09 646
+MD5 dd77d4988db134284732594414f5e93c files/sun-jdk-1.5.0.04 613
+MD5 50d600429785f626eef0bb4048cbc009 files/sun-jdk-1.5.0.05 613
+MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
+MD5 6e6334f4e89e27aca419bc2dea752336 sun-jdk-1.2.2.017.ebuild 2898
+MD5 5213a160fff46bbc88446cb67f44bf1e sun-jdk-1.3.1.13.ebuild 3729
+MD5 3a0cb65b1b04ec878b9c96908ed5149a sun-jdk-1.4.2.08-r1.ebuild 6786
+MD5 704f374a634a0fcfc7ec341421a028e8 sun-jdk-1.4.2.08.ebuild 6485
+MD5 c7ea8614185f77bd8657b327b5a70cf9 sun-jdk-1.4.2.09.ebuild 6784
+MD5 5d49aa4b2d517a27f6a7ff6c4d1e0e4b sun-jdk-1.5.0.04.ebuild 7206
+MD5 4dea74fa0059e29fe521e09b5ac98409 sun-jdk-1.5.0.05.ebuild 7271
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.05 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.05
index 08109d330184..409a9686fac0 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.05
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.05
@@ -1,3 +1,3 @@
-MD5 2f83bf2a38fff1f8ac51b02ec7391ca3 jdk-1_5_0_05-linux-i586.bin 48836045
-MD5 96e9743687a173287fc915665b81b939 jdk-1_5_0_05-linux-amd64.bin 43557465
 MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
+MD5 96e9743687a173287fc915665b81b939 jdk-1_5_0_05-linux-amd64.bin 43557465
+MD5 2f83bf2a38fff1f8ac51b02ec7391ca3 jdk-1_5_0_05-linux-i586.bin 48836045
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild
index d2cd62bf58d3..480d6f1ff037 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild,v 1.1 2005/09/16 13:18:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild,v 1.2 2005/10/10 16:23:12 betelgeuse Exp $
 
 inherit java eutils
 
@@ -51,9 +51,17 @@ FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetail
 
 
 pkg_nofetch() {
+	local archtext=""
+
+	if use x86; then
+		archtext="Linux"
+	elif use amd64; then
+		archtext="Linux AMD64"
+	fi
+
 	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "(Select the Self-extracting (.bin) for Linux or Linux AMD64, depending on your arch)"
+	einfo "${FETCH_SDK}"
+	einfo "Select the ${archtext} self-extracting file"
 	einfo "and move it to ${DISTDIR}"
 
 	if use jce; then
@@ -156,8 +164,8 @@ src_install() {
 	set_java_env ${FILESDIR}/${VMHANDLE}
 
 	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
+	#	  creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
+	#	  is a directory and will not be gzipped ;)
 }
 
 pkg_postinst() {
@@ -221,6 +229,6 @@ pkg_postinst() {
 	if ! use browserplugin && use mozilla; then
 		ewarn
 		ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-		ewarn "has been renamed to 'browserplugin' please update your USE"
+		ewarn "has been renamed to 'browserplugin' please update your USE."
 	fi
 }