summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-10-01 04:40:56 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-10-01 04:40:56 +0000
commit4f7e1b8dfce3b52675d0862a264d9222f26a5ac6 (patch)
treebd147fc775a7a52ab7d7bb54f7eafacba14ee99b /dev-java
parentversion bump (Manifest recommit) (diff)
downloadgentoo-2-4f7e1b8dfce3b52675d0862a264d9222f26a5ac6.tar.gz
gentoo-2-4f7e1b8dfce3b52675d0862a264d9222f26a5ac6.tar.bz2
gentoo-2-4f7e1b8dfce3b52675d0862a264d9222f26a5ac6.zip
fix mozilla plugin path for amd64 closes 65960
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/blackdown-jdk/ChangeLog6
-rw-r--r--dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild7
-rw-r--r--dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild9
3 files changed, 13 insertions, 9 deletions
diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 296fdb6bcaf0..4f6ec4e02b49 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/blackdown-jdk
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.57 2004/09/29 20:59:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.58 2004/10/01 04:40:56 axxo Exp $
+
+ 01 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+ blackdown-jdk-1.4.2_rc1-r1.ebuild, blackdown-jdk-1.4.2_rc1.ebuild:
+ fix mozilla plugin path for amd64 closes 65960
29 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
blackdown-jdk-1.3.1-r10.ebuild, blackdown-jdk-1.3.1-r8.ebuild,
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild
index 6296afbeaf21..7433cb7362f5 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild
@@ -1,8 +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/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild,v 1.3 2004/09/29 20:59:28 axxo Exp $
-
-IUSE="doc mozilla"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild,v 1.4 2004/10/01 04:40:56 axxo Exp $
inherit java
@@ -21,6 +19,7 @@ HOMEPAGE="http://www.blackdown.org"
SLOT="1.4.2"
LICENSE="sun-bcla-java-vm"
KEYWORDS="-* ~x86 ~amd64"
+IUSE="doc mozilla"
DEPEND="virtual/libc
>=dev-java/java-config-0.2.6
@@ -95,7 +94,7 @@ src_install() {
dohtml README.html
# Install mozilla plugin if mozilla use flag is set
- if use mozilla ; then
+ if use mozilla; then
case ${ARCH} in
amd64) platform="amd64" ;;
ppc) platform="ppc" ;;
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
index 63c842bccd49..680bbfb55e99 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.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/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild,v 1.14 2004/09/29 20:59:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild,v 1.15 2004/10/01 04:40:56 axxo Exp $
inherit java
@@ -19,6 +19,7 @@ HOMEPAGE="http://www.blackdown.org"
SLOT="1.4.2"
LICENSE="sun-bcla-java-vm"
KEYWORDS="-* ~x86 amd64"
+IUSE="doc mozilla"
DEPEND="virtual/libc
>=dev-java/java-config-0.2.6
@@ -28,7 +29,6 @@ PROVIDE="virtual/jdk-1.4.2
virtual/jre-1.4.2
virtual/java-scheme-2"
-IUSE="doc mozilla"
# Extract the 'skip' value (offset of tarball) we should pass to tail
get_offset() {
@@ -94,10 +94,11 @@ src_install() {
dodoc COPYRIGHT LICENSE README INSTALL
dohtml README.html
- # Install mozilla plugin
+ # Install mozilla plugin if mozilla use flag is set
if use mozilla; then
case ${ARCH} in
- amd64|x86) platform="i386" ;;
+ amd64) platform="amd64" ;;
+ x86) platform="i386" ;;
ppc) platform="ppc" ;;
sparc*) platform="sparc" ;;
esac