java-vm-2.eclass: Only call nsplugin functions if necessary

…when install_mozilla_plugin has been called. All these functions will
be removed soon so this is a transitional measure.

diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index eb94451c7c39e0fca6f79b770490dbfae7ee8297..7a5ba834e51863d05f5eeadc0a4c924e9de7a2e3 100644 (file)
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -84,8 +84,11 @@ java-vm-2_pkg_postinst() {
                fi
        fi
 
-       java-vm_check-nsplugin
-       java_mozilla_clean_
+       if [[ "${_install_mozilla_plugin_called}" = 1 ]]; then
+               java-vm_check-nsplugin
+               java_mozilla_clean_
+       fi
+
        fdo-mime_desktop_database_update
 }
 
@@ -360,6 +363,8 @@ java_get_plugin_dir_() {
 # Register a netscape java-plugin.
 
 install_mozilla_plugin() {
+       _install_mozilla_plugin_called=1
+
        local plugin="${1}"
        local variant="${2}"