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 3c31c87db302342315273294275e25192c5e2b74..e2a79676506fa8dffdb2961b133fd7d26908d3df 100755 (executable)
--- 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" ] && \