[gentoo-commits] repo/gentoo:master commit in: eclass/

[James Le Cuirot]

commit:     3aed1ee10a16450bb54c10607b904ad3fe7a8571
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 13:37:10 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 22:49:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aed1ee1

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.

 eclass/java-vm-2.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index eb94451..7a5ba83 100644
--- 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}"