From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 15 Sep 2010 17:07:00 +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=6f649810de7923b70e715aa39f3bca08d51d2d59;p=portage.git

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

Conflicts:
	bin/ebuild.sh
	bin/misc-functions.sh
	bin/repoman
	pym/_emerge/main.py
---

6f649810de7923b70e715aa39f3bca08d51d2d59
diff --cc bin/misc-functions.sh
index 0f03fa77d,d8242b7c1..0fd8288cc
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -156,6 -154,17 +156,17 @@@ install_qa_check() 
  	ecompressdir --dequeue
  	ecompress --dequeue
  
+ 	f=
+ 	for x in etc/app-defaults usr/man usr/info usr/X11R6 usr/doc usr/locale ; do
 -		[[ -d $D/$x ]] && f+="  $x\n"
++		[[ -d $ED/$x ]] && f+="  $x\n"
+ 	done
+ 
+ 	if [[ -n $f ]] ; then
+ 		eqawarn "QA Notice: This ebuild installs into the following deprecated directories:"
+ 		eqawarn
+ 		eqawarn "$f"
+ 	fi
+ 
  	# Now we look for all world writable files.
  	local i
  	for i in $(find "${D}/" -type f -perm -2); do
@@@ -307,12 -282,10 +318,12 @@@ install_qa_check_elf() 
  		fi
  
  		# Check for files built without respecting LDFLAGS
- 		if [[ "${LDFLAGS}" == *--hash-style=gnu* ]] && [[ "${PN}" != *-bin ]] ; then
+ 		if [[ "${LDFLAGS}" == *,--hash-style=gnu* ]] && [[ "${PN}" != *-bin ]] ; then
  			qa_var="QA_DT_HASH_${ARCH/-/_}"
  			eval "[[ -n \${!qa_var} ]] && QA_DT_HASH=(\"\${${qa_var}[@]}\")"
 -			f=$(scanelf -qyRF '%k %p' -k .hash "${D}" | sed -e "s:\.hash ::")
 +			# use ED here, for the rest of the checks of scanelf's
 +			# output, scanelf is silent on non-existing ED
 +			f=$(scanelf -qyRF '%k %p' -k .hash "${ED}" | sed -e "s:\.hash ::")
  			if [[ -n ${f} ]] ; then
  				echo "${f}" > "${T}"/scanelf-ignored-LDFLAGS.log
  				if [ "${QA_STRICT_DT_HASH-unset}" == unset ] ; then
@@@ -561,8 -528,8 +572,8 @@@ install_qa_check_misc() 
  	fi
  
  	# Verify that the libtool files don't contain bogus $D entries.
- 	local abort=no gentoo_bug=no
+ 	local abort=no gentoo_bug=no always_overflow=no
 -	for a in "${D}"usr/lib*/*.la ; do
 +	for a in "${ED}"usr/lib*/*.la ; do
  		s=${a##*/}
  		if grep -qs "${D}" "${a}" ; then
  			vecho -ne '\n'
diff --cc bin/repoman
index 361ea46fc,1f7b21bce..5212f5311
--- a/bin/repoman
+++ b/bin/repoman
@@@ -1823,8 -1821,8 +1826,9 @@@ for x in scanlist
  						config_profile_path=prof.abs_path,
  						config_incrementals=repoman_incrementals,
  						local_config=False,
+ 						_unmatched_removal=options.unmatched_removal,
 -						env=env)
 +						env=env,
 +						_eprefix=EPREFIX)
  					if options.without_mask:
  						dep_settings._mask_manager = \
  							copy.deepcopy(dep_settings._mask_manager)
diff --cc pym/_emerge/Binpkg.py
index 5f190df59,06f0fd28c..4e8450c60
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@@ -49,10 -41,7 +49,8 @@@ class Binpkg(CompositeTask)
  
  		dir_path = os.path.join(settings["PORTAGE_TMPDIR"],
  			"portage", pkg.category, pkg.pf)
- 		self._build_dir = EbuildBuildDir(dir_path=dir_path,
- 			pkg=pkg, settings=settings)
  		self._image_dir = os.path.join(dir_path, "image")
 +		self._work_dir = os.path.join(dir_path, "work")
  		self._infloc = os.path.join(dir_path, "build-info")
  		self._ebuild_path = os.path.join(self._infloc, pkg.pf + ".ebuild")
  		settings["EBUILD"] = self._ebuild_path