From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 9 Feb 2012 07:40:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3fcce02f31976dcc8f40b350288f81b648955597;p=portage.git

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

Conflicts:
	bin/portageq
	pym/portage/package/ebuild/doebuild.py
---

3fcce02f31976dcc8f40b350288f81b648955597
diff --cc bin/misc-functions.sh
index c6e66c2ef,261415150..406cd8f82
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -829,10 -778,10 +829,10 @@@ install_qa_check_misc() 
  	fi
  
  	# Portage regenerates this on the installed system.
- 	rm -f "${ED}"/usr/share/info/dir{,.gz,.bz2}
+ 	rm -f "${ED}"/usr/share/info/dir{,.gz,.bz2} || die "rm failed!"
  
  	if has multilib-strict ${FEATURES} && \
 -	   [[ -x /usr/bin/file && -x /usr/bin/find ]] && \
 +	   [[ -x ${EPREFIX}/usr/bin/file && -x ${EPREFIX}/usr/bin/find ]] && \
  	   [[ -n ${MULTILIB_STRICT_DIRS} && -n ${MULTILIB_STRICT_DENY} ]]
  	then
  		local abort=no dir file firstrun=yes
diff --cc bin/portageq
index 35e0ac781,5ecbb21ca..d697a323c
--- a/bin/portageq
+++ b/bin/portageq
@@@ -1,5 -1,5 +1,5 @@@
 -#!/usr/bin/python -O
 +#!@PREFIX_PORTAGE_PYTHON@ -O
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  from __future__ import print_function
diff --cc pym/portage/package/ebuild/doebuild.py
index 8f8bf399c,c52ab3120..dd804f441
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@@ -1507,10 -1487,7 +1507,10 @@@ _post_phase_cmds = 
  		"preinst_sfperms",
  		"preinst_selinux_labels",
  		"preinst_suid_scan",
- 		"preinst_mask"],
+ 		]
 +
 +	"postinst" : [
 +		"postinst_aix"]
  }
  
  def _post_phase_userpriv_perms(mysettings):