summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-06-30 12:15:35 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-06-30 12:15:35 +0000
commitd946bf987755c8ade0e649467bff84c52a7d8c0a (patch)
treed1ff2543664cf7477d87e8e263d307d6624ba83e /eclass
parentMark ~amd64. (diff)
downloadgentoo-2-d946bf987755c8ade0e649467bff84c52a7d8c0a.tar.gz
gentoo-2-d946bf987755c8ade0e649467bff84c52a7d8c0a.tar.bz2
gentoo-2-d946bf987755c8ade0e649467bff84c52a7d8c0a.zip
Updates to java-vm-2.eclass to support java-nsplugin eselect module.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/java-vm-2.eclass12
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index a9688c8a9883..80173b83e346 100644
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -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/eclass/java-vm-2.eclass,v 1.2 2006/06/25 16:28:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.3 2006/06/30 12:15:35 nichoj Exp $
#
# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
@@ -46,6 +46,12 @@ java-vm-2_pkg_postinst() {
# else... some other VM is being updated, so we don't have to worry
fi
+ if has nsplugin ${IUSE} && use nsplugin; then
+ if [[ ! -f /usr/lib/nsbrowser/plugins/javaplugin.so ]]; then
+ eselect java-nsplugin set ${VMHANDLE}
+ fi
+ fi
+
java_mozilla_clean_
}
@@ -129,9 +135,9 @@ install_mozilla_plugin() {
die "Cannot find mozilla plugin at ${D}/${plugin}"
fi
- local plugin_dir=$(java_get_plugin_dir_)
+ local plugin_dir=/usr/share/java-config-2/nsplugin
dodir ${plugin_dir}
- dosym ${plugin} ${plugin_dir}/javaplugin.so
+ dosym ${plugin} ${plugin_dir}/${VMHANDLE}-javaplugin.so
}
java_mozilla_clean_() {