summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-08-17 20:43:47 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-08-17 20:43:47 +0000
commitea56807d644afdaba40afea9d17cce41ab456b32 (patch)
tree54152e3574b34e8b63aed29ec3c6637ea34957eb /dev-java
parentMarked ppc (diff)
downloadgentoo-2-ea56807d644afdaba40afea9d17cce41ab456b32.tar.gz
gentoo-2-ea56807d644afdaba40afea9d17cce41ab456b32.tar.bz2
gentoo-2-ea56807d644afdaba40afea9d17cce41ab456b32.zip
Fixed for amd64, ala bug #144192
(Portage version: 2.1.1_pre4-r4)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/sun-jre-bin/ChangeLog11
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild6
2 files changed, 14 insertions, 3 deletions
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index d8a6397e91e4..0aca94393053 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for dev-java/sun-jre-bin
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.52 2006/08/17 07:21:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.53 2006/08/17 20:43:47 nichoj Exp $
+
+ 17 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+ sun-jre-bin-1.5.0.08.ebuild:
+ Fixed for amd64, ala bug #144192
+
+ 17 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+ sun-jre-bin-1.5.0.08.ebuild:
+ No longer attempts to install javaws on amd64, because it isn't available
+ there.
*sun-jre-bin-1.5.0.08 (17 Aug 2006)
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild
index 2cf318b83cbd..4fcd3ad01cb9 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.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/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild,v 1.1 2006/08/17 07:21:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild,v 1.2 2006/08/17 20:43:47 nichoj Exp $
inherit java-vm-2 eutils
@@ -67,7 +67,9 @@ src_unpack() {
}
src_install() {
- local dirs="bin javaws lib man plugin"
+ local dirs="bin lib man"
+ # only X86 has the plugin and javaws
+ use x86 && dirs="${dirs} javaws plugin"
dodir /opt/${P}
for i in $dirs ; do