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

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

diff --cc bin/ebuild-helpers/ecompressdir
Simple merge

diff --cc bin/ebuild-helpers/prepstrip
Simple merge

diff --cc bin/egencache
Simple merge

diff --cc bin/misc-functions.sh
index c6e66c2efcaa5e5df393574618a9b1c8e6e752cf,26141515043a0683da0adae1bca6db7bb958aab3..406cd8f82fb586472f1756c04403c8b2a30e2d7d
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/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/phase-helpers.sh
Simple merge

diff --cc bin/portageq
index 35e0ac78115979c68d0de59adad396aee28d7686,5ecbb21ca1f18a0fa17f1a2919587d2189608a3f..d697a323c7a1110b5ed5e003e8f4066f586bfdc5
--- 1/bin/portageq
--- 2/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 bin/repoman
Simple merge

diff --cc cnf/make.globals
Simple merge

diff --cc man/emerge.1
Simple merge

diff --cc man/make.conf.5
Simple merge

diff --cc pym/_emerge/actions.py
Simple merge

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/_emerge/main.py
Simple merge

diff --cc pym/portage/const.py
Simple merge

diff --cc pym/portage/dbapi/vartree.py
Simple merge

diff --cc pym/portage/package/ebuild/doebuild.py
index 8f8bf399cce360511476c3dcd3bfd0c9ef84810e,c52ab3120fd90f0dc70d6806b4a8f4db1ef97720..dd804f441002835b6e1cc6f4e2d61167b9e127a9
--- 1/pym/portage/package/ebuild/doebuild.py
--- 2/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):

diff --cc pym/portage/process.py
Simple merge

diff --cc pym/portage/util/__init__.py
Simple merge

diff --cc pym/portage/util/_dyn_libs/LinkageMapELF.py
Simple merge