Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/
Date: Mon, 21 Nov 2011 15:49:26
Message-Id: 20e8c1eae007f22dc876cf17db1e71d0020d282e.anarchy@gentoo
1 commit: 20e8c1eae007f22dc876cf17db1e71d0020d282e
2 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 21 15:48:09 2011 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 21 15:48:09 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=20e8c1ea
7
8 Fix share_plugins_dir to work with -bin and seamonkey properly
9
10 ---
11 eclass/mozcoreconf-2.eclass | 13 ++++++++++++-
12 1 files changed, 12 insertions(+), 1 deletions(-)
13
14 diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
15 index 27bd045..4930532 100644
16 --- a/eclass/mozcoreconf-2.eclass
17 +++ b/eclass/mozcoreconf-2.eclass
18 @@ -282,5 +282,16 @@ mozconfig_final() {
19
20 # ${MOZILLA_FIVE_HOME} must be defined in src_install to support
21 share_plugins_dir() {
22 - dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
23 + if [[ ${PN} == seamonkey ]] ; then
24 + rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins \
25 + || die "failed to remove existing plugins dir"
26 + fi
27 +
28 + if [[ ${PN} == *-bin ]] ; then
29 + PLUGIN_BASE_PATH="/usr/$(get_libdir)"
30 + else
31 + PLUGIN_BASE_PATH=".."
32 + fi
33 +
34 + dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins"
35 }