Revbump to correct wrong BOOTCLASSPATH in the jre's env file, discovered in bug #199252. Straight to stable - the env file is shared by whole slot anyway.

(Portage version: 2.1.4_rc9, RepoMan options: --force)

5 files changed, 30 insertions, 21 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 88f1a410b899..f4118b7b73e1 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.78 2007/11/18 18:18:41 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.79 2007/12/12 15:14:09 caster Exp $
+
+*ibm-jre-bin-1.5.0.6-r1 (12 Dec 2007)
+
+  12 Dec 2007; Vlastimil Babka <caster@gentoo.org>
+  files/ibm-jre-bin-1.5.env, -ibm-jre-bin-1.5.0.5a.ebuild,
+  +ibm-jre-bin-1.5.0.6-r1.ebuild:
+  Revbump to correct wrong BOOTCLASSPATH in the jre's env file, discovered in
+  bug #199252. Straight to stable - the env file is shared by whole slot
+  anyway.
 
   18 Nov 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   ibm-jre-bin-1.5.0.6.ebuild:
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5a b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5a
deleted file mode 100644
index 66e507eaad7e..000000000000
--- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.5a
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 e745d755b7f18100ab6b97491016b1a6 ibm-java2-jre-5.0-5.1-linux-i386.tgz 43146484
-RMD160 d265291dfdc45076040a2eee35416bfd3a72a41c ibm-java2-jre-5.0-5.1-linux-i386.tgz 43146484
-SHA256 ccefe0711cf7ef170e03c050b51d65df191647f9b6b08c49c61021ca53660c3c ibm-java2-jre-5.0-5.1-linux-i386.tgz 43146484
-MD5 bfed0bf7242a9bf1fbbbd0d27cefffdf ibm-java2-jre-5.0-5.1-linux-ppc.tgz 49778743
-RMD160 3fae444a71b4fa791b9cb2c068f25b13ba1ac261 ibm-java2-jre-5.0-5.1-linux-ppc.tgz 49778743
-SHA256 face09a028df5bb3a46def327d785f159b7e39afaf13aec5b2bd7aec008d802b ibm-java2-jre-5.0-5.1-linux-ppc.tgz 49778743
-MD5 294a13b08736d20a476a60ea24762664 ibm-java2-jre-5.0-5.1-linux-ppc64.tgz 49615158
-RMD160 fb075e5b045acfa421a222f7726454d84187adcc ibm-java2-jre-5.0-5.1-linux-ppc64.tgz 49615158
-SHA256 a4dfba413275f43e12e62bd9a8e8c239b081782eb8fa2d93e74e217c77d3392d ibm-java2-jre-5.0-5.1-linux-ppc64.tgz 49615158
-MD5 8271c0c2a509761c0efbe4c8d5169111 ibm-java2-jre-5.0-5.1-linux-x86_64.tgz 45419369
-RMD160 6932ae186a32ff8a220c3b7ea3870a00958d831c ibm-java2-jre-5.0-5.1-linux-x86_64.tgz 45419369
-SHA256 22818d84e472f15cf8f8c15ebd49c0ae3f1dc0f1c98f85ca9a4f378218a16284 ibm-java2-jre-5.0-5.1-linux-x86_64.tgz 45419369
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.6-r1 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.6-r1
new file mode 100644
index 000000000000..d53d868f2514
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.6-r1
@@ -0,0 +1,12 @@
+MD5 473e099189e9e8b4a39fa2a4be34143e ibm-java2-jre-5.0-6.0-linux-i386.tgz 43484118
+RMD160 e07c82a30248f137285a7d7c24511e96421a3245 ibm-java2-jre-5.0-6.0-linux-i386.tgz 43484118
+SHA256 bf9a89e4341a3f761519bf6d53b641b8c4abfa08655e655e1ecef61a8ca87099 ibm-java2-jre-5.0-6.0-linux-i386.tgz 43484118
+MD5 2250c9eea6641a562d6139831d9ef1b9 ibm-java2-jre-5.0-6.0-linux-ppc.tgz 50320536
+RMD160 ebc98dde508a1990e1c9745333509b6deecb9697 ibm-java2-jre-5.0-6.0-linux-ppc.tgz 50320536
+SHA256 740cc4610ffb5c9ec0c98146906976c1c37b7ed20d550e71cb318fb9d4541e58 ibm-java2-jre-5.0-6.0-linux-ppc.tgz 50320536
+MD5 7ab489a31c09d1a84468153e73d148e8 ibm-java2-jre-5.0-6.0-linux-ppc64.tgz 49588981
+RMD160 b8df215a3d69aa23a6672fa91ddc94915d3bb158 ibm-java2-jre-5.0-6.0-linux-ppc64.tgz 49588981
+SHA256 1cbafb5bee54e5856330a479f72f7b997fd034745ede705e3926d2cb4c80538b ibm-java2-jre-5.0-6.0-linux-ppc64.tgz 49588981
+MD5 12ea59fc1bb538af0bac4b9d9972a3dc ibm-java2-jre-5.0-6.0-linux-x86_64.tgz 45671486
+RMD160 f4f62cac048f118585d19181705338879f223351 ibm-java2-jre-5.0-6.0-linux-x86_64.tgz 45671486
+SHA256 1ddb9b2bfbb43359d33a9833bbf67523ee2be30f9c0f0f8894e5cf4b5635a37a ibm-java2-jre-5.0-6.0-linux-x86_64.tgz 45671486
diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env
index 4ee3f6d37480..a81e9e8fa679 100644
--- a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env
+++ b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env,v 1.1 2007/06/08 21:21:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env,v 1.2 2007/12/12 15:14:10 caster Exp $
 
 VERSION="IBM JRE @PV@"
 JAVA_HOME=/opt/@P@
@@ -10,6 +10,6 @@ ROOTPATH="${JAVA_HOME}/bin"
 LDPATH="/opt/@P@/bin/:/opt/@P@/bin/classic"
 PROVIDES_TYPE="JRE"
 PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/lib/core.jar:${JAVA_HOME}/lib/graphics.jar:${JAVA_HOME}/lib/security.jar:${JAVA_HOME}/lib/server.jar:${JAVA_HOME}/lib/xml.jar:${JAVA_HOME}/lib/charsets.jar:${JAVA_HOME}/lib/ibmjgssprovider.jar:${JAVA_HOME}/lib/ibmjaaslm.jar:${JAVA_HOME}/lib/ibmorbapi.jar:${JAVA_HOME}/lib/ibmorb.jar:${JAVA_HOME}/lib/ibmjcefw.jar:${JAVA_HOME}/lib/ibmjssefips.jar:${JAVA_HOME}/lib/ibmjsseprovider.jar:${JAVA_HOME}/lib/ibmpkcs.jar:${JAVA_HOME}/lib/ibmcertpathprovider.jar"
+BOOTCLASSPATH="${JAVA_HOME}/lib/vm.jar:${JAVA_HOME}/lib/core.jar:${JAVA_HOME}/lib/charsets.jar:${JAVA_HOME}/lib/graphics.jar:${JAVA_HOME}/lib/security.jar:${JAVA_HOME}/lib/ibmpkcs.jar:${JAVA_HOME}/lib/ibmorb.jar:${JAVA_HOME}/lib/ibmcfw.jar:${JAVA_HOME}/lib/ibmorbapi.jar:${JAVA_HOME}/lib/ibmjcefw.jar:${JAVA_HOME}/lib/ibmjgssprovider.jar:${JAVA_HOME}/lib/ibmjsseprovider2.jar:${JAVA_HOME}/lib/ibmjaaslm.jar:${JAVA_HOME}/lib/ibmcertpathprovider.jar:${JAVA_HOME}/lib/server.jar:${JAVA_HOME}/lib/xml.jar"
 GENERATION="2"
 ENV_VARS="JAVA_HOME JRE_HOME JAVAC PATH ROOTPATH LDPATH"
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.5a.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild
index bb273bcf484d..d3fd4811890d 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.5a.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.5a.ebuild,v 1.5 2007/09/08 01:23:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.1 2007/12/12 15:14:09 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
 JDK_RELEASE=$(get_version_component_range 2-3)
 SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}a"
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.1"
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
+TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
 
-JRE_DIST_PREFIX="ibm-java2-jre-${RPM_PV}-linux"
+JRE_DIST_PREFIX="ibm-java2-jre-${TGZ_PV}-linux"
 
 X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz"
 AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz"
@@ -186,7 +186,7 @@ src_compile() { :; }
 src_install() {
 	# Copy all the files to the designated directory
 	dodir /opt/${P}
-	cp -pR ${S}/jre/* ${D}/opt/${P}/
+	cp -pR "${S}"/jre/* "${D}/opt/${P}/"
 
 	# setting the ppc stuff
 	#if use ppc; then
@@ -223,7 +223,7 @@ src_install() {
 	use !alsa && rm "${jrebindest}/libjsoundalsa.so"
 
 	dohtml -a html,htm,HTML -r docs || die
-	dodoc ${S}/COPYRIGHT || die
+	dodoc "${S}/COPYRIGHT" || die
 
 	set_java_env
 }