summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/blackdown-jre/ChangeLog7
-rw-r--r--dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild8
2 files changed, 11 insertions, 4 deletions
diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index b689dd5da28d..19a5587972a1 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/blackdown-jre
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.43 2004/09/29 20:59:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.44 2004/10/03 02:12:31 lv Exp $
+
+ 02 Oct 2004; Travis Tilley <lv@gentoo.org>
+ blackdown-jre-1.4.2_rc1-r1.ebuild:
+ made the ebuild stop trying to install a plugin on amd64, we dont have one in
+ the jre. this should make blackdown-jre installable on amd64 again.
29 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1.ebuild,
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild
index 14d74f3d7a7a..40b1a252fd85 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.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-jre/blackdown-jre-1.4.2_rc1-r1.ebuild,v 1.5 2004/09/29 20:59:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild,v 1.6 2004/10/03 02:12:31 lv Exp $
inherit java
@@ -99,11 +99,13 @@ src_install () {
# Install mozilla plugin
if use mozilla; then
case ${ARCH} in
- amd64|x86) platform="i386" ;;
+ x86) platform="i386" ;;
ppc) platform="ppc" ;;
sparc*) platform="sparc" ;;
esac
- install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+ # news flash: amd64 doesnt have ANY plugin in the jre. and trying to
+ # install a plugin that doesnt exist makes the ebuild fail to install.
+ use !amd64 && install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
fi
sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/jre/lib/font.properties