[gentoo-commits] proj/mozilla:master commit in: eclass/

[Ian Stakenvicius]

commit:     38fc17519f1f21c55bee9c6720af9dec69dd47a8
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 15:33:02 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 15:33:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=38fc1751

Added wrapper conditionals so that these eclasses will only be sourced once 
during inherit

 eclass/mozcoreconf-v3.eclass | 4 ++++
 eclass/mozextension.eclass   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/eclass/mozcoreconf-v3.eclass b/eclass/mozcoreconf-v3.eclass
index c35dcf8..7d7d99a 100644
--- a/eclass/mozcoreconf-v3.eclass
+++ b/eclass/mozcoreconf-v3.eclass
@@ -10,6 +10,8 @@
 #
 # inherit mozconfig-v5.* or above for mozilla configuration support
 
+if [[ ! ${_MOZCORECONF_V3} ]]; then
+
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads,sqlite'
 
@@ -255,3 +257,5 @@ mozconfig_final() {
        echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
 }
 
+_MOZCORECONF_V3=1
+fi

diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass
index 42cee2f..ef410d3 100644
--- a/eclass/mozextension.eclass
+++ b/eclass/mozextension.eclass
@@ -7,6 +7,7 @@
 # Mozilla team <mozi...@gentoo.org>
 # @BLURB: Install extensions for use in mozilla products.
 
+if [[ ! ${_MOZEXTENSION} ]]; then
 
 inherit eutils
 
@@ -72,3 +73,6 @@ xpi_install() {
        fi
        doins -r "${x}"/* || die "failed to copy extension"
 }
+
+_MOZEXTENSION=1
+fi