Fixed vm.jar path bug for ppc64 as well. Reported by Brent Baude <ranger@gentoo.org>

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

3 files changed, 29 insertions, 11 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index adb187a71959..417172ceb65e 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.199 2009/04/22 14:27:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.200 2009/04/22 21:37:47 serkan Exp $
+
+  22 Apr 2009; Serkan Kaba <serkan@gentoo.org> ibm-jdk-bin-1.6.0.4:
+  Fixed vm.jar path bug for ppc64 as well. Reported by Brent Baude
+  <ranger@gentoo.org>
 
   22 Apr 2009; Brent Baude <ranger@gentoo.org>
   ibm-jdk-bin-1.5.0.9-r1.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 525c35d93d4c..0b33df899df8 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cpuinfo 12 RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d SHA1 2c35d51e0110bd74f2c4cf9f7f063358837ea907 SHA256 b90ea3549103fa261cd711ecb3d11158c984bc20a020630aa3ebc3f8b402ec11
 AUX ibm-jdk-bin-1.4.env 1125 RMD160 9ee81d807088259b7c2f0a5062965e0e94195cef SHA1 d20ed99899733c15b57494ae0c90e61517fc8814 SHA256 72c0d5ac1ea2e132a40a8e74402d01faa6c99af6abc8465bf8c4c7a4be03a2a1
 AUX ibm-jdk-bin-1.5.env 1149 RMD160 04ac562f22f2e16ae0a21380bcf6781f2e05b6e1 SHA1 93d3694d723cbcb1f776a8d064200f5a91394896 SHA256 1ccf08c7cc6429065978a6a0c038654c4e9768c8c150c56c39eb5408c1abe21d
@@ -47,6 +50,13 @@ EBUILD ibm-jdk-bin-1.4.2.13.ebuild 5023 RMD160 13e8a22582159c3bd68988035167d89b8
 EBUILD ibm-jdk-bin-1.5.0.9-r1.ebuild 7620 RMD160 57f1b9b16b6cc684e3a0a8b845c6b7ea4f5986c7 SHA1 6b95250fca06e7934bfdb01fb1812d257d9a7c6c SHA256 8f2160680d56d3bc58dadb94d1bbc3ace19070c9323bfe441ebfaad6a39fc4df
 EBUILD ibm-jdk-bin-1.5.0.9.ebuild 7385 RMD160 b4599f2f5b2676f4fbd1eafe302e2a16195a7cce SHA1 0092f5129faffe52b910216fcbdb9358ca640f9b SHA256 6cb74ed1f160db23bed87528d218d5f122135829039ab33dafe084caa626ed65
 EBUILD ibm-jdk-bin-1.6.0.0.ebuild 6974 RMD160 84625cb36b4b366ed22169396229c8750141644a SHA1 2a77f60a72c8996d4b3e03756ea2f604b6dc2138 SHA256 c29aba6cce9d0f997006df201f366550e87f382f513bab8bb9ffffd93a3d18ba
-EBUILD ibm-jdk-bin-1.6.0.4.ebuild 8977 RMD160 8e7392a09c0f1fe5fc9773f7ff05eab88ca83aa8 SHA1 58b2e1d70faf053e3c7e44ffd992f04d8d1f977d SHA256 ccbe3fede29fab434c5bd434bbe127a8a05e90a8ad0e22fc1cff592fc1b3702d
-MISC ChangeLog 31167 RMD160 bcb77be9f55eecbdbb2c07d53e42621d4016a248 SHA1 74c7acfb46eff9918ee9d7df5c691c198f7145a3 SHA256 66ac1338009ae51566f7c99936195428b880bc7740ea4ceda143b60af38517bc
+EBUILD ibm-jdk-bin-1.6.0.4.ebuild 9154 RMD160 bb2ef9d3e1084ff935caa310c9345f510b9e93e4 SHA1 86893ed22380392a0185660f70af2f01ac1a82d7 SHA256 c90cef5531e9b93157c9d0955e10b7b1734b9cec429e32c4029047050b0d2acf
+MISC ChangeLog 31325 RMD160 4c56f410a9123baad217e3fa573ffa0c2dbc5a4c SHA1 14bdc4b4fe97302f717b115661f57a3b782d8198 SHA256 630e676649203f2a5bdc75b67e1d9a62197df502aa364e3ccfa85f3e07401023
 MISC metadata.xml 310 RMD160 ac3496cf91b69c0bab3ab8fb6656fbcbf8845f8d SHA1 c8bca85a871e8f7c11481456b490a0fd09175884 SHA256 ffd62e0957318b6c4f3308be446258eae8ce7b8436075f231a30e2ae4691fabf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknvjjEACgkQRh6X64ivZaIodgCdHFiitcvwW9qxss/uucjOiakb
+Rl4AnRNedgJCslRY7/9bxVgpYL2BMm1N
+=jV43
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild
index 85cdbdd45eb6..08d185b37bda 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v 1.2 2009/03/30 15:56:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v 1.3 2009/04/22 21:37:47 serkan Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -226,13 +226,6 @@ src_install() {
 		fi
 	fi
 
-	if use amd64; then
-		# a workaround to fix the BOOTCLASSPATH in our env file
-		# this is not optimal, using -Xcompressedrefs would probably make it
-		# expect the compressedrefs version...
-		dosym /opt/${P}/jre/lib/amd64/default/jclSC160/vm.jar /opt/${P}/jre/lib/
-	fi
-
 	local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
 	if [[ -f "${desktop_in}" ]]; then
 		local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
@@ -252,5 +245,16 @@ src_install() {
 	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
 
 	set_java_env
+
+	# a workaround to fix the BOOTCLASSPATH in our env file
+	# this is not optimal, using -Xcompressedrefs would probably make it
+	# expect the compressedrefs version...
+	if use amd64; then
+		sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+	if use ppc64; then
+		sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+
 	java-vm_revdep-mask
 }