[gentoo-commits] proj/portage:prefix commit in: /

["Fabian Groffen" <grobian@gentoo.org>]

commit:     3fcce02f31976dcc8f40b350288f81b648955597
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 07:40:12 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 07:40:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3fcce02f

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

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


 DEVELOPING                                         |   36 +--
 bin/ebuild-helpers/ecompressdir                    |    4 +
 bin/ebuild-helpers/prepstrip                       |    8 +-
 bin/egencache                                      |   20 +-
 bin/misc-functions.sh                              |   27 ++-
 bin/phase-helpers.sh                               |   14 +-
 bin/portageq                                       |   17 +-
 bin/repoman                                        |   13 +-
 cnf/make.globals                                   |    2 +-
 doc/package/ebuild/eapi/4-python.docbook           |   38 ++-
 man/emerge.1                                       |   10 +-
 man/make.conf.5                                    |   14 +-
 man/portage.5                                      |    3 +
 pym/_emerge/AbstractEbuildProcess.py               |   37 ++-
 pym/_emerge/AbstractPollTask.py                    |   20 +-
 pym/_emerge/AsynchronousLock.py                    |   19 +-
 pym/_emerge/AsynchronousTask.py                    |   10 +-
 pym/_emerge/CompositeTask.py                       |    5 +-
 pym/_emerge/EbuildIpcDaemon.py                     |    2 +
 pym/_emerge/EbuildMetadataPhase.py                 |    2 +
 pym/_emerge/EbuildPhase.py                         |    6 +-
 pym/_emerge/FifoIpcDaemon.py                       |    9 +-
 pym/_emerge/JobStatusDisplay.py                    |   10 +-
 pym/_emerge/MetadataRegen.py                       |    9 +-
 pym/_emerge/MiscFunctionsProcess.py                |   10 +-
 pym/_emerge/PipeReader.py                          |   12 +-
 pym/_emerge/PollScheduler.py                       |  255 +-------------
 pym/_emerge/QueueScheduler.py                      |   60 ++--
 pym/_emerge/Scheduler.py                           |  107 ++----
 pym/_emerge/SequentialTaskQueue.py                 |   51 +--
 pym/_emerge/SpawnProcess.py                        |    4 +
 pym/_emerge/SubProcess.py                          |   13 +-
 pym/_emerge/actions.py                             |    1 +
 pym/_emerge/create_world_atom.py                   |   35 ++-
 pym/_emerge/depgraph.py                            |   33 ++-
 pym/_emerge/main.py                                |    2 +
 pym/_emerge/resolver/output.py                     |  156 +++++----
 pym/_emerge/resolver/output_helpers.py             |   11 +-
 pym/portage/const.py                               |    8 +-
 pym/portage/dbapi/_MergeProcess.py                 |    9 +
 pym/portage/dbapi/vartree.py                       |   27 +-
 pym/portage/debug.py                               |    4 +-
 pym/portage/dep/__init__.py                        |   19 +-
 pym/portage/eapi.py                                |    3 +
 pym/portage/package/ebuild/_ipc/QueryCommand.py    |    9 +-
 pym/portage/package/ebuild/doebuild.py             |    2 +-
 pym/portage/process.py                             |    5 +-
 pym/portage/repository/config.py                   |   14 +-
 pym/portage/tests/ebuild/test_config.py            |    3 +-
 pym/portage/tests/ebuild/test_ipc_daemon.py        |    4 +-
 pym/portage/tests/process/test_poll.py             |   14 +-
 pym/portage/util/__init__.py                       |    4 +-
 pym/portage/util/_dyn_libs/LinkageMapELF.py        |    7 +
 pym/portage/util/_eventloop/EventLoop.py           |  372 ++++++++++++++++++++
 .../util/_eventloop}/__init__.py                   |    2 +-
 pym/portage/util/movefile.py                       |    4 +-
 pym/portage/xml/metadata.py                        |    9 +-
 57 files changed, 972 insertions(+), 632 deletions(-)

diff --cc bin/misc-functions.sh
index c6e66c2,2614151..406cd8f
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 35e0ac7,5ecbb21..d697a32
--- 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 8f8bf39,c52ab31..dd804f4
--- 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):