Do the javaws symlink only on x86, other archs don't have javaws.

Package-Manager: portage-2.1.2_pre1

3 files changed, 23 insertions, 16 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 596ce427868f..f51397c55395 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.81 2006/09/19 16:01:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.82 2006/09/19 16:24:23 caster Exp $
+
+  19 Sep 2006; Vlastimil Babka <caster@gentoo.org>
+  ibm-jdk-bin-1.4.2.6-r4.ebuild:
+  Do the javaws symlink only on x86, other archs don't have javaws.
 
 *ibm-jdk-bin-1.4.2.6-r4 (19 Sep 2006)
 
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 512964976cfa..103e08efa989 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -63,10 +63,10 @@ EBUILD ibm-jdk-bin-1.4.2.6-r1.ebuild 4845 RMD160 c258b6eaebda22dabe88a5ac449e812
 MD5 886411b0d84fa070af3da8d19c271065 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
 RMD160 c258b6eaebda22dabe88a5ac449e812c6b535870 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
 SHA256 e70b5deff274b12016420fd84f6f57f8096bfd83138625d1d7bcfb767b686844 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
-EBUILD ibm-jdk-bin-1.4.2.6-r4.ebuild 4634 RMD160 b37eb228464b82823ffac9bec3390ec8c61e8b67 SHA1 b548b0273be804a5a876e203916757b6c0b6765a SHA256 9c6ce207a7767d4f8a1e773ad92461b8bcf6640f340aac7a1a372c559032e684
-MD5 e06d6972ea86b54429e16a6eaa9c8383 ibm-jdk-bin-1.4.2.6-r4.ebuild 4634
-RMD160 b37eb228464b82823ffac9bec3390ec8c61e8b67 ibm-jdk-bin-1.4.2.6-r4.ebuild 4634
-SHA256 9c6ce207a7767d4f8a1e773ad92461b8bcf6640f340aac7a1a372c559032e684 ibm-jdk-bin-1.4.2.6-r4.ebuild 4634
+EBUILD ibm-jdk-bin-1.4.2.6-r4.ebuild 4686 RMD160 fe711fbfd04d8a2b2facb7503273de29e86fc0e5 SHA1 192d29462be4ad478640741fb4f159e34c2efb08 SHA256 10bc795045b0375386b83c49dc3de3b26568e62178a5740a447235c36b1aae52
+MD5 4aa7c96071f136864d4d6e4f3281fa32 ibm-jdk-bin-1.4.2.6-r4.ebuild 4686
+RMD160 fe711fbfd04d8a2b2facb7503273de29e86fc0e5 ibm-jdk-bin-1.4.2.6-r4.ebuild 4686
+SHA256 10bc795045b0375386b83c49dc3de3b26568e62178a5740a447235c36b1aae52 ibm-jdk-bin-1.4.2.6-r4.ebuild 4686
 EBUILD ibm-jdk-bin-1.5.0.2.ebuild 4488 RMD160 cb81ec19d039c8c712724f59c835511232f99951 SHA1 482bf0a5e0a5424f596be287275853899aeb5e9f SHA256 64f4833e4f02a6ebd347d4775cd6b523fda8595651ec9e5d56b8fac107bf8c31
 MD5 015ec351a20fcd15b8ad557860a7ceb9 ibm-jdk-bin-1.5.0.2.ebuild 4488
 RMD160 cb81ec19d039c8c712724f59c835511232f99951 ibm-jdk-bin-1.5.0.2.ebuild 4488
@@ -75,10 +75,10 @@ EBUILD ibm-jdk-bin-1.5.0.ebuild 2956 RMD160 086616bb4e6575e2c68814bb5153b511b803
 MD5 b100e3010595d20ad0feb9e46aa49160 ibm-jdk-bin-1.5.0.ebuild 2956
 RMD160 086616bb4e6575e2c68814bb5153b511b8033498 ibm-jdk-bin-1.5.0.ebuild 2956
 SHA256 0310652770e7b791852d4c65ddd68f16602abe0fe50fd5f48cd5e3c534dc24b4 ibm-jdk-bin-1.5.0.ebuild 2956
-MISC ChangeLog 13151 RMD160 899a7e1c8e1772e316942a0d3010185b47e76f29 SHA1 62679be9cc0812c93be9b1be4be7e81edb64aeea SHA256 4d95f984902df995893fbf8ce30264ceb2271168b6356f17f33f84ba42c1034e
-MD5 e9f3b2a379c801102fd8fefac73d0723 ChangeLog 13151
-RMD160 899a7e1c8e1772e316942a0d3010185b47e76f29 ChangeLog 13151
-SHA256 4d95f984902df995893fbf8ce30264ceb2271168b6356f17f33f84ba42c1034e ChangeLog 13151
+MISC ChangeLog 13304 RMD160 2fb18bc830307368db53563cc74f5d65375dbebb SHA1 a68544e0999b134ea68b408ce124b7253df871c1 SHA256 03b19338ee9f03dab16f5c367e804908b6485c081729c98a70d3ffbf0f601e29
+MD5 23e123f00ca1d2554a0bf478b4a9789d ChangeLog 13304
+RMD160 2fb18bc830307368db53563cc74f5d65375dbebb ChangeLog 13304
+SHA256 03b19338ee9f03dab16f5c367e804908b6485c081729c98a70d3ffbf0f601e29 ChangeLog 13304
 MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
 MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
index f1ee414b25bb..9498503c01ec 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.4.2.6-r4.ebuild,v 1.1 2006/09/19 16:01:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.2 2006/09/19 16:24:23 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator rpm
@@ -94,12 +94,15 @@ pkg_nofetch() {
 src_compile() { true; }
 
 src_install() {
-	# The javaws execution script is 777 why?
-	chmod 0755 ${S}/jre/javaws/javaws
-
-	# bug #147259
-	dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
-	dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+	# javaws is on x86 only
+	if use x86; then
+		# The javaws execution script is 777 why?
+		chmod 0755 ${S}/jre/javaws/javaws
+
+		# bug #147259
+		dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+		dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+	fi
 
 	# Copy all the files to the designated directory
 	mkdir -p ${D}opt/${P}