avoid multiple inclusions when possible to speed caching up

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index cb4aa2a82f9dc0808b6973efc48e9e22e7c8e43e..f184277c8ef0120a625e293efba5a2044e52388e 100644 (file)
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.95 2011/10/27 05:50:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.96 2011/12/10 19:41:51 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -10,8 +10,10 @@
 # @DESCRIPTION:
 # This eclass is for all functions pertaining to handling multilib configurations.
 
-___ECLASS_RECUR_MULTILIB="yes"
-[[ -z ${___ECLASS_RECUR_TOOLCHAIN_FUNCS} ]] && inherit toolchain-funcs
+if [[ ${___ECLASS_ONCE_MULTILIB} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_MULTILIB="recur -_+^+_- spank"
+
+inherit toolchain-funcs
 
 # Defaults:
 export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
@@ -406,3 +408,5 @@ multilib_toolchain_setup() {
                export CBUILD=$(get_abi_CHOST $1)
        fi
 }
+
+fi

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 8815ceafe083808658f8d2464c29a17e27fe5677..cd4941435ab1e33ae7bfc6fb153dee2329c97229 100644 (file)
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.108 2011/10/17 19:11:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.109 2011/12/10 19:45:00 vapier Exp $
 
 # @ECLASS: toolchain-funcs.eclass
 # @MAINTAINER:
@@ -13,8 +13,10 @@
 # in such a way that you can rely on the function always returning
 # something sane.
 
-___ECLASS_RECUR_TOOLCHAIN_FUNCS="yes"
-[[ -z ${___ECLASS_RECUR_MULTILIB} ]] && inherit multilib
+if [[ ${___ECLASS_ONCE_TOOLCHAIN_FUNCS} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_TOOLCHAIN_FUNCS="recur -_+^+_- spank"
+
+inherit multilib
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
@@ -759,3 +761,5 @@ gen_usr_ldscript() {
                fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
        done
 }
+
+fi