From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Mar 2009 10:32:13 +0000 (-0000)
Subject: When generating variable names to hold EXPORT_FUNCTIONS argument in, use
X-Git-Tag: v2.2_rc24~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39a97c03ea7b9116334384760502a06f5ba87ae6;p=portage.git

When generating variable names to hold EXPORT_FUNCTIONS argument in, use
$ECLASS_DEPTH as a unique id since it's a lot simpler then encoding the
eclass name in the variable name.

svn path=/main/trunk/; revision=12806
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3c31c87db..e2a796765 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1172,12 +1172,7 @@ inherit() {
 		olocation=""
 
 		export ECLASS="$1"
-		__export_funcs_var=__export_functions_$ECLASS
-		while [[ $__export_funcs_var =~ [-.+] ]] ; do
-			__export_funcs_var=${__export_funcs_var/-/__dash__}
-			__export_funcs_var=${__export_funcs_var/./__dot__}
-			__export_funcs_var=${__export_funcs_var/+/__plus__}
-		done
+		__export_funcs_var=__export_functions_$ECLASS_DEPTH
 		unset $__export_funcs_var
 
 		if [ "${EBUILD_PHASE}" != "depend" ] && \