From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 16 Apr 2010 18:42:45 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5ec7ffdfd1dd9a74592c400d7bf3efbae165393c;p=portage.git

Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/misc-functions.sh
---

5ec7ffdfd1dd9a74592c400d7bf3efbae165393c
diff --cc bin/misc-functions.sh
index ba2df1b4d,2fd049198..da3c3f72b
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -317,7 -279,7 +317,7 @@@ install_qa_check_elf() 
  		# Check for shared libraries lacking NEEDED entries
  		qa_var="QA_DT_NEEDED_${ARCH/-/_}"
  		eval "[[ -n \${!qa_var} ]] && QA_DT_NEEDED=(\"\${${qa_var}[@]}\")"
- 		f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:")
 -		f=$(scanelf -ByF '%n %p' "${D}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:")
++		f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${D}:/:")
  		if [[ -n ${f} ]] ; then
  			echo "${f}" > "${T}"/scanelf-missing-NEEDED.log
  			if [[ "${QA_STRICT_DT_NEEDED-unset}" == unset ]] ; then