Index: ebuild.sh
===================================================================
--- ebuild.sh	(revision 3407)
+++ ebuild.sh	(working copy)
@@ -1065,19 +1065,9 @@
 		qa_var="QA_TEXTRELS_${ARCH}"
 		[[ -n ${!qa_var} ]] && QA_TEXTRELS=${!qa_var}
 		[[ -n ${QA_STRICT_TEXTRELS} ]] && QA_TEXTRELS=""
-		QA_TEXTRELS=$(echo ${QA_TEXTRELS}) # strip newlines
-		f=""
-		s=$(scanelf -qyRF '"#t%p"' "${D}" | grep -v 'usr/lib/debug/')
-		s=$(echo ${s}) # strip newlines
-		# eval needed to get ${QA_TEXTRELS} expanded so bash splits
-		# words taking account of spaces in quoted words.
-		eval "for s in ${s}; do
-			for t in ${QA_TEXTRELS}; do
-				[[ \${s} =~ \"^\${t}$\" ]] && continue 2
-			done
-			f=\"\${f}\${s}\n\"
-		done"
-		if [[ -n ${f[@]} ]] ; then
+		export QA_TEXTRELS
+		f=$(scanelf -qyRF '"%t %p"' "${D}" | grep -v 'usr/lib/debug/')
+		if [[ -n ${f} ]] ; then
 			echo -ne '\a\n'
 			echo "QA Notice: the following files contain runtime text relocations"
 			echo " Text relocations require a lot of extra work to be preformed by the"
@@ -1085,7 +1075,7 @@
 			echo " and might not function properly on other architectures hppa for example."
 			echo " If you are a programmer please take a closer look at this package and"
 			echo " consider writing a patch which addresses this problem."
-			printf "${f}"
+			echo "${f}"
 			echo -ne '\a\n'
 			[[ ${FEATURES/stricter} != "${FEATURES}" ]] \
 				&& die "Aborting due to textrels"
@@ -1110,17 +1100,11 @@
 					qa_var="QA_EXECSTACK_${ARCH}"
 					[[ -n ${!qa_var} ]] && QA_EXECSTACK=${!qa_var}
 					[[ -n ${QA_STRICT_EXECSTACK} ]] && QA_EXECSTACK=""
-					QA_EXECSTACK=$(echo ${QA_EXECSTACK}) # strip newlines
-					s=$(scanelf -qyRF '"#e%p"' "${D}" | grep -v 'usr/lib/debug/')
-					s=$(echo ${s}) # strip newlines
-					# eval needed to get ${QA_TEXTRELS} expanded so bash splits
-					# words taking account of spaces in quoted words.
-					eval "for s in ${s}; do
-						for e in ${QA_EXECSTACK}; do
-							[[ \${s} =~ \"^\${e}$\" ]] && continue 2
-						done
-						f=\"\${f}\${s}\n\"
-					done"
+					qa_var="QA_WX_LOAD_${ARCH}"
+					[[ -n ${!qa_var} ]] && QA_WX_LOAD=${!qa_var}
+					[[ -n ${QA_STRICT_EXECSTACK} ]] && QA_WX_LOAD=""
+					export QA_EXECSTACK QA_WX_LOAD
+					f=$(scanelf -qyRF '"%e %p"' "${D}" | grep -v 'usr/lib/debug/')
 					;;
 			esac
 			;;