summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Rothe <corsair@gentoo.org>2005-05-10 08:20:28 +0000
committerMarkus Rothe <corsair@gentoo.org>2005-05-10 08:20:28 +0000
commit11ac2be3321d7e38c21f436d43fb1c81bfaca44b (patch)
tree09e13dbaa6bbc9e3c651f641e6da496ad998b852 /dev-java/ibm-jre-bin
parent2.1.3.200503070918 keyworded ~alpha (diff)
downloadhistorical-11ac2be3321d7e38c21f436d43fb1c81bfaca44b.tar.gz
historical-11ac2be3321d7e38c21f436d43fb1c81bfaca44b.tar.bz2
historical-11ac2be3321d7e38c21f436d43fb1c81bfaca44b.zip
don't install mozilla plugin on ppc64
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-java/ibm-jre-bin')
-rw-r--r--dev-java/ibm-jre-bin/ChangeLog5
-rw-r--r--dev-java/ibm-jre-bin/Manifest16
-rw-r--r--dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild4
3 files changed, 9 insertions, 16 deletions
diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 9c2637e93a81..8d9fdd027491 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/ibm-jre-bin
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.15 2005/03/31 22:29:53 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.16 2005/05/10 08:20:28 corsair Exp $
+
+ 10 May 2005; Markus Rothe <corsair@gentoo.org> ibm-jre-bin-1.4.2.ebuild:
+ don't install mozilla plugin on ppc64
01 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> ibm-jre-bin-1.4.2.ebuild:
fixed a typo which prevented a successful installation of the java plugin.
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 329199c7fa01..b18fd1659822 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dbda75ce0d6522086129ca13817da9c1 ibm-jre-bin-1.4.2.ebuild 1464
+MD5 1993cc46c8971f176de9cabd459d3b3d ChangeLog 2331
MD5 9efe89786363057fdf47e2c2b4c40fcb ibm-jre-bin-1.4.1-r1.ebuild 1453
-MD5 1182da9272fd7ab20062bf14806ffd98 ChangeLog 2217
+MD5 55b0d46493c4b2a2742a6b9482ace79a ibm-jre-bin-1.4.2.ebuild 1480
MD5 fb2a9b7b6110f3fc99c228068cac96b8 metadata.xml 284
MD5 51a2a58cc1b1113444ccc5c545f2674e files/digest-ibm-jre-bin-1.4.1-r1 211
+MD5 2e39286179863d6cfd0686f84e4907f6 files/digest-ibm-jre-bin-1.4.2 211
MD5 8bd327361eb4826b3903c4358cc44a2b files/ibm-jre-bin-1.4.1 685
MD5 dbb65981559a5881a93e19de3dde0b7c files/ibm-jre-bin-1.4.2 681
-MD5 2e39286179863d6cfd0686f84e4907f6 files/digest-ibm-jre-bin-1.4.2 211
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCTHns06ebR+OMO78RAu3dAJ9vbdniFIy7kG6g51Lk9J6XZyZt7wCfWJyE
-PeQEuwZ5k7dI6mioTD2PGw8=
-=72FI
------END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
index a972aace6c3d..24223a4fc556 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.4.2.ebuild,v 1.6 2005/03/31 22:29:53 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.7 2005/05/10 08:20:28 corsair Exp $
inherit java
@@ -48,7 +48,7 @@ src_install() {
> ${D}/etc/env.d/java/20${P} \
|| die "unable to install environment file"
- if useq mozilla && ! useq ppc; then
+ if useq mozilla && ! ( useq ppc || useq ppc64 ); then
local plugin="libjavaplugin_oji.so"
if has_version '>=gcc-3*' ; then
plugin="libjavaplugin_ojigcc3.so"