Replace the evals used to export variables with plain export calls. Bash
expands variable references for exported variable name anyway, rendering
the eval completely unnecessary.

Replace the single eval used for indirect variable reference with the
${!...} substitution which serves that exact purpose in bash.
---
 eclass/flag-o-matic.eclass | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 5b8a054079d2..10e637d51d52 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -117,7 +117,7 @@ _filter-var() {
                done
                new+=( "${f}" )
        done
-       eval export ${var}=\""${new[*]}"\"
+       export ${var}="${new[*]}"
 }
 
 # @FUNCTION: filter-flags
@@ -271,7 +271,7 @@ replace-flags() {
                        [[ ${f} == ${1} ]] && f=${2}
                        new+=( "${f}" )
                done
-               eval export ${var}=\""${new[*]}"\"
+               export ${var}="${new[*]}"
        done
 
        return 0
@@ -296,9 +296,8 @@ replace-cpu-flags() {
 }
 
 _is_flagq() {
-       local x var
-       eval var=\""\${$1[*]}"\"
-       for x in ${var} ; do
+       local x var="$1[*]"
+       for x in ${!var} ; do
                [[ ${x} == $2 ]] && return 0
        done
        return 1
@@ -412,7 +411,7 @@ strip-flags() {
                if [[ ${!var} != "${new[*]}" ]] ; then
                        einfo "strip-flags: ${var}: changed '${!var}' to 
'${new[*]}'"
                fi
-               eval export ${var}=\""${new[*]}"\"
+               export ${var}="${new[*]}"
        done
 
        set +f  # re-enable pathname expansion
-- 
2.11.1


Reply via email to