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

["Thomas Sachau" <tommy@gentoo.org>]

commit:     06259074cf1c75044715bad9229e2aa2a090fc82
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 14:15:40 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 14:15:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=06259074

Merge commit 'v2.2.0_alpha82' into multilib


 RELEASE-NOTES                                      |    5 -
 bin/ebuild-helpers/newbin                          |    5 +-
 bin/ebuild-helpers/newconfd                        |    5 +-
 bin/ebuild-helpers/newdoc                          |    5 +-
 bin/ebuild-helpers/newenvd                         |    5 +-
 bin/ebuild-helpers/newexe                          |    5 +-
 bin/ebuild-helpers/newinitd                        |    5 +-
 bin/ebuild-helpers/newins                          |    3 +
 bin/ebuild-helpers/newlib.a                        |    5 +-
 bin/ebuild-helpers/newlib.so                       |    5 +-
 bin/ebuild-helpers/newman                          |    5 +-
 bin/ebuild-helpers/newsbin                         |    5 +-
 bin/ebuild-helpers/prepstrip                       |   37 ++++--
 bin/ebuild.sh                                      |   20 ++-
 bin/isolated-functions.sh                          |    6 +-
 bin/misc-functions.sh                              |   92 ++++++++++---
 bin/phase-functions.sh                             |   19 ++-
 cnf/make.conf                                      |    6 +
 cnf/make.conf.ia64.diff                            |   23 +---
 cnf/make.conf.s390.diff                            |   23 +---
 cnf/make.globals                                   |    4 +-
 doc/package/ebuild.docbook                         |    1 +
 doc/package/ebuild/eapi/4-python.docbook           |   49 +++++++
 doc/portage.docbook                                |    1 +
 man/ebuild.5                                       |   12 ++-
 man/emerge.1                                       |   20 ++--
 man/make.conf.5                                    |    9 +-
 pym/_emerge/AbstractPollTask.py                    |   67 ++++++++-
 pym/_emerge/AsynchronousLock.py                    |    4 +-
 pym/_emerge/BinpkgExtractorAsync.py                |    3 +-
 pym/_emerge/BlockerCache.py                        |    2 +-
 pym/_emerge/EbuildExecuter.py                      |    2 -
 pym/_emerge/FakeVartree.py                         |    2 -
 pym/_emerge/MergeListItem.py                       |    2 +-
 pym/_emerge/PackageMerge.py                        |    2 +-
 pym/_emerge/PipeReader.py                          |   60 +++++---
 pym/_emerge/Scheduler.py                           |   22 +++-
 pym/_emerge/SpawnProcess.py                        |   50 +++----
 pym/_emerge/actions.py                             |   19 +--
 pym/_emerge/depgraph.py                            |   73 ++++------
 pym/_emerge/main.py                                |   12 +-
 pym/_emerge/resolver/backtracking.py               |    2 +-
 pym/_emerge/resolver/output.py                     |    2 +-
 pym/_emerge/resolver/slot_collision.py             |    2 +-
 pym/_emerge/search.py                              |    2 +-
 pym/portage/data.py                                |   55 ++++++--
 pym/portage/dbapi/vartree.py                       |  128 ++++++++++++++---
 pym/portage/eclass_cache.py                        |    2 +
 .../package/ebuild/_config/special_env_vars.py     |    2 +-
 pym/portage/package/ebuild/config.py               |    5 +-
 pym/portage/package/ebuild/doebuild.py             |    4 +
 pym/portage/package/ebuild/fetch.py                |   25 ++--
 pym/portage/repository/config.py                   |   82 +++++------
 pym/portage/tests/ebuild/test_pty_eof.py           |   45 ------
 pym/portage/tests/emerge/test_simple.py            |    4 +-
 pym/portage/tests/process/test_poll.py             |   58 +++++++--
 pym/portage/util/_pty.py                           |  153 +-------------------
 57 files changed, 740 insertions(+), 531 deletions(-)

diff --cc bin/phase-functions.sh
index 1ac66e3,2167853..db41f35
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -123,15 -127,15 +127,18 @@@ filter_readonly_variables() 
  			LC_NUMERIC LC_PAPER LC_TIME"
  	fi
  	if ! has --allow-extra-vars $* ; then
- 		filtered_vars="
- 			${filtered_vars}
- 			${PORTAGE_SAVED_READONLY_VARS}
- 			${PORTAGE_MUTABLE_FILTERED_VARS}
- 		"
+ 		if [ "${EMERGE_FROM}" = binary ] ; then
+ 			# preserve additional variables from build time,
+ 			# while excluding untrusted variables
+ 			filtered_vars+=" ${binpkg_untrusted_vars}"
+ 		else
+ 			filtered_vars+=" ${PORTAGE_SAVED_READONLY_VARS}"
+ 			filtered_vars+=" ${PORTAGE_MUTABLE_FILTERED_VARS}"
+ 		fi
  	fi
 +	if has --filter-metadata $* ; then
 +		filtered_vars+=" ${PORTAGE_READONLY_METADATA} filter_opts"
 +	fi
  
  	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
  }