From: James Le Cuirot <chewi@gentoo.org>
Date: Fri, 1 Jan 2016 13:37:10 +0000 (+0000)
Subject: java-vm-2.eclass: Only call nsplugin functions if necessary
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3aed1ee10a16450bb54c10607b904ad3fe7a8571;p=gentoo.git

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 eb94451c7c39..7a5ba834e518 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}"