summaryrefslogtreecommitdiff
path: root/eclass
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
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')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/nsplugins.eclass12
2 files changed, 12 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 1de0c4b0d7c4..8e97e404f488 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.828 2013/05/17 00:52:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.829 2013/05/17 04:01:54 jdhore Exp $
+
+ 17 May 2013; Jeff Horelick <jdhore@gentoo.org> nsplugins.eclass:
+ Support new plugins directory on Firefox >= 21.0 (bug #469932)
17 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Remove unused src_unpack function.
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
}