From: Jochen Maes <sejo@gentoo.org>
Date: Sat, 20 Nov 2004 11:18:38 +0000 (+0000)
Subject: mozilla plugin doesn't work with amd64, removing it
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54b11a5ba916e18213204d8e90b1a9a209857f3e;p=gentoo.git

mozilla plugin doesn't work with amd64, removing it
---

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 38c5504e75be..c5c5b1da2632 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.21 2004/11/20 10:58:14 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.22 2004/11/20 11:18:38 sejo Exp $
+
+  20 Nov 2004; <SeJo@gentoo.org> ibm-jdk-bin-1.4.2.ebuild:
+  mozilla plugin doesn't work with amd64, removing it
 
   20 Nov 2004; <SeJo@gentoo.org> ibm-jdk-bin-1.4.2.ebuild:
   mumble mumble something with amd64 in stead of amd in S
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 036667cc7a05..27136fb4973e 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,7 +1,7 @@
-MD5 637d06c7d05237f9fceddf3081feec53 ChangeLog 2832
+MD5 4c01e9087cad5a1fb194866a1cc16882 ChangeLog 2946
 MD5 774041e39d1180afd2e12e0211b93354 ibm-jdk-bin-1.4.1-r2.ebuild 2167
 MD5 2f88465cd5ad6adb1c76759ff3078666 metadata.xml 348
-MD5 36c7b8aecf402d1ebed083d6a216c3c7 ibm-jdk-bin-1.4.2.ebuild 2374
+MD5 15647dbfc295b9d696aa36d9b5aea530 ibm-jdk-bin-1.4.2.ebuild 2390
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
 MD5 b218ad416aab8e8299f77cb1f749e4aa files/digest-ibm-jdk-bin-1.4.1-r2 355
 MD5 cfb8abeb0f582ad72b0971269e7dee32 files/digest-ibm-jdk-bin-1.4.2 443
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
index f209ccb76f34..23105413ecf0 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
@@ -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-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.16 2004/11/20 10:58:14 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.17 2004/11/20 11:18:38 sejo Exp $
 
 inherit java eutils
 
@@ -57,7 +57,7 @@ src_install() {
 		doins ${FILESDIR}/cpuinfo
 	fi
 
-	if useq mozilla && ! useq ppc; then
+	if useq mozilla && ! useq ppc && ! useq amd64; then
 		local plugin="libjavaplugin_oji.so"
 		if has_version '>=gcc-3*' ; then
 			plugin="libjavaplugin_ojigcc3.so"