diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2008-08-29 19:10:19 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2008-08-29 19:10:19 +0000 |
| commit | 6148228899a82899f125f2eb545ebc587f7d3f7a (patch) | |
| tree | 43924c80a06d686676baaffd557b8479582ed38d /eclass | |
| parent | Added -fno-tree-pre to compilation options as partial redundancy elimination ... (diff) | |
| download | gentoo-2-6148228899a82899f125f2eb545ebc587f7d3f7a.tar.gz gentoo-2-6148228899a82899f125f2eb545ebc587f7d3f7a.tar.bz2 gentoo-2-6148228899a82899f125f2eb545ebc587f7d3f7a.zip | |
Add a 'variant' parameter to install_mozilla_plugin() to allow installing multiple nsplugin variants of one JRE, bug #235869.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-vm-2.eclass | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index c41a9c1516b6..cfae4c3e3885 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.22 2008/07/07 16:54:56 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.23 2008/08/29 19:10:19 caster Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -230,15 +230,20 @@ java_get_plugin_dir_() { } install_mozilla_plugin() { - local plugin=${1} + local plugin="${1}" + local variant="${2}" - if [ ! -f "${D}/${plugin}" ] ; then + if [[ ! -f "${D}/${plugin}" ]]; then die "Cannot find mozilla plugin at ${D}/${plugin}" fi - local plugin_dir=/usr/share/java-config-2/nsplugin - dodir ${plugin_dir} - dosym ${plugin} ${plugin_dir}/${VMHANDLE}-javaplugin.so + if [[ -n "${variant}" ]]; then + variant="-${variant}" + fi + + local plugin_dir="/usr/share/java-config-2/nsplugin" + dodir "${plugin_dir}" + dosym "${plugin}" "${plugin_dir}/${VMHANDLE}${variant}-javaplugin.so" } java_mozilla_clean_() { |