From: Petteri Räty <betelgeuse@gentoo.org>
Date: Sun, 29 Apr 2007 21:19:50 +0000 (+0000)
Subject: Fix BOOTCLASSPATH to match sun.boot.class.path property.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef038e0ef154cbd1e8cd1f707be3330e56c6410d;p=gentoo.git

Fix BOOTCLASSPATH to match sun.boot.class.path property.
Package-Manager: portage-2.1.2.5
---

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index a3fb80d2d0f1..e0bb6d572f35 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.194 2007/04/19 19:25:16 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.195 2007/04/29 21:19:50 betelgeuse Exp $
+
+  29 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> files/sun-jdk-1.6.env:
+  Fix BOOTCLASSPATH to match sun.boot.class.path property.
 
 *sun-jdk-1.6.0-r2 (19 Apr 2007)
 *sun-jdk-1.5.0.11-r1 (19 Apr 2007)
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index dc78b399ac07..2d453ae8815b 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -13,10 +13,10 @@ AUX sun-jdk-1.5.env 925 RMD160 6042c2849330d0a7b7ef87f2680209a27707a370 SHA1 d93
 MD5 9b9e4337c1fb2f73b1adad1db1e01325 files/sun-jdk-1.5.env 925
 RMD160 6042c2849330d0a7b7ef87f2680209a27707a370 files/sun-jdk-1.5.env 925
 SHA256 9faf2bfbdec7fd92e6fc3509a22ae8ec9a3527d850f9763cef42575e0dec13fe files/sun-jdk-1.5.env 925
-AUX sun-jdk-1.6.env 925 RMD160 cac1306ba6dd05dcf74fb2e536bf40bd3f03bee1 SHA1 02587c415e0dffefdf8900fad5884d2bd604056c SHA256 8fd2d12405a41b923b3c64d56b9e42a89d2479323fd78703f2b065fb0ee7ec2b
-MD5 f356c5b7e3ccb4243bac775c0286c4fb files/sun-jdk-1.6.env 925
-RMD160 cac1306ba6dd05dcf74fb2e536bf40bd3f03bee1 files/sun-jdk-1.6.env 925
-SHA256 8fd2d12405a41b923b3c64d56b9e42a89d2479323fd78703f2b065fb0ee7ec2b files/sun-jdk-1.6.env 925
+AUX sun-jdk-1.6.env 976 RMD160 65f45a343475ec6ccd925804235fab94b499239c SHA1 d4abe528c7093f42b2cb713522b6b005203f4ec5 SHA256 651eb286a0354aedfeeafb2a75abe9074040734f1dc01f76ef82b5e5f62becbe
+MD5 dd9c41b5fdcb8165d847d21a0d5c849a files/sun-jdk-1.6.env 976
+RMD160 65f45a343475ec6ccd925804235fab94b499239c files/sun-jdk-1.6.env 976
+SHA256 651eb286a0354aedfeeafb2a75abe9074040734f1dc01f76ef82b5e5f62becbe files/sun-jdk-1.6.env 976
 DIST j2sdk-1_4_2_13-linux-i586.bin 36361814 RMD160 cefb731ae6740f36a17242aa79b36d79dda2e102 SHA1 12c679cfa2e212bfa90ae6ef6ad6c477e427bbba SHA256 f5dd8045fe791bd5c52bddf33a1cf65968ee03981e0663f75cd97a942daa24e2
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 DIST jdk-1_5_0_10-dlj-linux-amd64.bin 43906073 RMD160 2d13d637b6d7351410f9e18d581206a05091effe SHA1 b0c4440f7059b2d477a437e5c58f135820e86326 SHA256 5bbac3fb78db48f7f996e412d45229db3a0b759886f360504cca61c93d4b5f61
@@ -57,10 +57,10 @@ EBUILD sun-jdk-1.6.0-r2.ebuild 5252 RMD160 ccbfb62a918ac7d15571f52882f67f2e46869
 MD5 db8862f92fb8cf93bbf50c163d764c2d sun-jdk-1.6.0-r2.ebuild 5252
 RMD160 ccbfb62a918ac7d15571f52882f67f2e46869983 sun-jdk-1.6.0-r2.ebuild 5252
 SHA256 8813bf7ef638c88a06c2cc0bb53aaf63223fea7e351399804bb4649f0ee87875 sun-jdk-1.6.0-r2.ebuild 5252
-MISC ChangeLog 38059 RMD160 c172488a8c9d274c4c0ea9188cc1c2655e712352 SHA1 1a51266c25e8c53f614798c03907b0703a0a7713 SHA256 d203ad4496a76fd37dc263ddc298e77c64f0f10118951a90c223bcbb746cc501
-MD5 ac52764143d2fa77d21f587e27984c3e ChangeLog 38059
-RMD160 c172488a8c9d274c4c0ea9188cc1c2655e712352 ChangeLog 38059
-SHA256 d203ad4496a76fd37dc263ddc298e77c64f0f10118951a90c223bcbb746cc501 ChangeLog 38059
+MISC ChangeLog 38195 RMD160 4991d8370006df69c8ea0ccf2b2d1fd40b06d20f SHA1 2c2ab1ebb8b34d8e50953fd21994e36230a961cf SHA256 3b98d85ff6c5caac40d15d4703e0cfa10e28ec469d572711790976c856fec24c
+MD5 54fcba9f65f676c83e2637b7ce7c2f29 ChangeLog 38195
+RMD160 4991d8370006df69c8ea0ccf2b2d1fd40b06d20f ChangeLog 38195
+SHA256 3b98d85ff6c5caac40d15d4703e0cfa10e28ec469d572711790976c856fec24c ChangeLog 38195
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -92,7 +92,7 @@ SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJ8IlcxLzpIGCsLQRAptLAJ4lSaWlVPUy1snsmnujkczppkxVgQCff/n4
-2r6i7DM/A6oSXUMMnXjeBiM=
-=m96D
+iD8DBQFGNQwDcxLzpIGCsLQRAgOvAJ40c+gPypO0aI//M/kISYE3H71VzQCdHNtT
+J2SuEUs4lG8gF9fZY2xGKxo=
+=jVQ0
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.6.env b/dev-java/sun-jdk/files/sun-jdk-1.6.env
index dcbac3ea4cf9..dac2aefc95c3 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.6.env
+++ b/dev-java/sun-jdk/files/sun-jdk-1.6.env
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.6.env,v 1.1 2006/12/13 22:54:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.6.env,v 1.2 2007/04/29 21:19:50 betelgeuse Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
@@ -12,6 +12,7 @@ LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_
 MANPATH="/opt/@P@/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.6"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
 GENERATION="2"
 ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"