summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Horelick <jdhore@gentoo.org>2013-05-17 04:01:54 +0000
committerJeff Horelick <jdhore@gentoo.org>2013-05-17 04:01:54 +0000
commitb4e03d24856d0e66ce53df36c9833b47f93de40a (patch)
treef96bec1e99c4c7df724ef0c5e91b42b23a70ef5e /eclass/nsplugins.eclass
parentBump for #470120 (diff)
downloadhistorical-b4e03d24856d0e66ce53df36c9833b47f93de40a.tar.gz
historical-b4e03d24856d0e66ce53df36c9833b47f93de40a.tar.bz2
historical-b4e03d24856d0e66ce53df36c9833b47f93de40a.zip
Support new plugins directory on Firefox >= 21.0 (bug #469932)
Diffstat (limited to 'eclass/nsplugins.eclass')
-rw-r--r--eclass/nsplugins.eclass12
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass
index ab30143e97f7..acbe070e2e88 100644
--- a/eclass/nsplugins.eclass
+++ b/eclass/nsplugins.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.31 2012/09/15 16:16:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.32 2013/05/17 04:01:54 jdhore Exp $
#
# @ECLASS: nsplugins.eclass
# @MAINTAINER:
@@ -12,7 +12,7 @@
# Reusable functions that promote sharing of netscape/moz plugins, also provides
# share_plugins_dir function for mozilla applications.
-inherit eutils multilib
+inherit eutils multilib versionator
PLUGINS_DIR="nsbrowser/plugins"
@@ -72,5 +72,9 @@ share_plugins_dir() {
PLUGIN_BASE_PATH=".."
fi
- dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins"
+ if version_is_at_least "21.0"; then
+ dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/browser/plugins"
+ else
+ dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins"
+ fi
}