From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 20 Oct 2011 16:37:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65878954fc777d64380db2798d1b98744fdc2036;p=portage.git

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

65878954fc777d64380db2798d1b98744fdc2036
diff --cc bin/misc-functions.sh
index 34fe18f88,0d2d20689..f31c9e5bb
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -174,43 -172,9 +174,43 @@@ install_qa_check() 
  		vecho "- ${i:${#D}:${#i}} will be a world writable file."
  		vecho "- This may or may not be a security problem, most of the time it is one."
  		vecho "- Please double check that $PF really needs a world writeable bit and file bugs accordingly."
- 		sleep 1
  	done
+ 	[[ -n ${i} ]] && sleep 1
  
 +	# anything outside the prefix should be caught by the Prefix QA
 +	# check, so if there's nothing in ED, we skip searching for QA
 +	# checks there, the specific QA funcs can hence rely on ED existing
 +	if [[ -d ${ED} ]] ; then
 +		case ${CHOST} in
 +			*-darwin*)
 +				# Mach-O platforms (NeXT, Darwin, OSX)
 +				install_qa_check_macho
 +			;;
 +			*-interix*|*-winnt*)
 +				# PECOFF platforms (Windows/Interix)
 +				install_qa_check_pecoff
 +			;;
 +			*-aix*)
 +				# XCOFF platforms (AIX)
 +				install_qa_check_xcoff
 +			;;
 +			*)
 +				# because this is the majority: ELF platforms (Linux,
 +				# Solaris, *BSD, IRIX, etc.)
 +				install_qa_check_elf
 +			;;
 +		esac
 +	fi
 +
 +	# this is basically here such that the diff with trunk remains just
 +	# offsetted and not out of order
 +	install_qa_check_misc
 +
 +	# Prefix specific checks
 +	[[ -n ${EPREFIX} ]] && install_qa_check_prefix
 +}
 +
 +install_qa_check_elf() {
  	if type -P scanelf > /dev/null && ! has binchecks ${RESTRICT}; then
  		local qa_var insecure_rpath=0 tmp_quiet=${PORTAGE_QUIET}
  		local x