[gentoo-commits] gentoo-x86 commit in eclass: java-vm-2.eclass

[Vlastimil Babka (caster)]

caster      08/08/29 19:10:20

  Modified:             java-vm-2.eclass
  Log:
  Add a 'variant' parameter to install_mozilla_plugin() to allow installing multiple nsplugin variants of one JRE, bug #235869.

Revision  Changes    Path
1.23                 eclass/java-vm-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-vm-2.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-vm-2.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-vm-2.eclass?r1=1.22&r2=1.23

Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- java-vm-2.eclass	7 Jul 2008 16:54:56 -0000	1.22
+++ java-vm-2.eclass	29 Aug 2008 19:10:19 -0000	1.23
@@ -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 @@
 }
 
 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_() {