Merged from trunk -r12785:12788

   | 12788   | Translate period characters in eclass names when generating  |
   | zmedico | variable names to store EXPORT_FUNCTIONS arguments. Thanks   |
   |         | to Arfrever for reporting.                                   |

svn path=/main/branches/prefix/; revision=12790

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9a3443fbb2dbe30c1d10299888b1e2322dc0f0b5..5014f6519482038ceea5e4f2046b1cf7b62c30da 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1183,9 +1183,10 @@ inherit() {
                olocation=""
 
                export ECLASS="$1"
-               __export_funcs_var=__export_functions_${ECLASS/-/___}
-               while [[ $__export_funcs_var != ${__export_funcs_var/-/___} ]] ; do
-                       __export_funcs_var=${__export_funcs_var/-/___}
+               __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__}
                done
                unset $__export_funcs_var