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

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

commit:     7f5b665406eae057457f519ca8fc837f56aba8e2
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 18:46:50 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 18:46:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7f5b6654

Merge v2.2.0_alpha163


 bin/archive-conf                                   |    4 +-
 bin/ebuild                                         |    3 +-
 bin/isolated-functions.sh                          |    3 +-
 bin/misc-functions.sh                              |   30 +-
 bin/phase-functions.sh                             |    2 +-
 bin/phase-helpers.sh                               |   11 +-
 bin/repoman                                        |   35 +-
 man/ebuild.1                                       |    2 +-
 man/ebuild.5                                       |    2 +-
 man/emerge.1                                       |   15 +-
 man/env-update.1                                   |   14 +-
 man/etc-update.1                                   |   44 +--
 man/portage.5                                      |   18 +-
 man/ru/ebuild.1                                    |    3 +-
 man/ru/env-update.1                                |   35 ++
 man/ru/etc-update.1                                |   63 ++++
 man/ru/fixpackages.1                               |   22 ++
 misc/emerge-delta-webrsync                         |    2 +-
 pym/_emerge/SpawnProcess.py                        |    2 +-
 pym/_emerge/actions.py                             |   73 ++--
 pym/_emerge/depgraph.py                            |  392 +++++++++++++++++---
 pym/_emerge/getloadavg.py                          |    5 +-
 pym/_emerge/resolver/slot_collision.py             |    2 +-
 pym/portage/__init__.py                            |   58 ++-
 pym/portage/data.py                                |   36 ++-
 pym/portage/dbapi/__init__.py                      |    6 +-
 pym/portage/dbapi/vartree.py                       |    6 +-
 pym/portage/package/ebuild/_config/UseManager.py   |   12 +-
 .../package/ebuild/_config/special_env_vars.py     |    4 +-
 pym/portage/package/ebuild/config.py               |   50 ++-
 .../package/ebuild/deprecated_profile_check.py     |   46 ++-
 pym/portage/package/ebuild/doebuild.py             |   26 ++-
 pym/portage/process.py                             |    2 +-
 pym/portage/tests/emerge/test_simple.py            |    2 +-
 ...test_complete_if_new_subslot_without_revbump.py |   74 ++++
 .../test_regular_slot_change_without_revbump.py    |   59 +++
 .../resolver/test_slot_change_without_revbump.py   |   69 ++++
 .../tests/resolver/test_slot_operator_unsolved.py  |   88 +++++
 pym/portage/tests/runTests                         |   14 +-
 pym/portage/util/__init__.py                       |    4 +-
 pym/repoman/checks.py                              |   23 +-
 pym/repoman/utilities.py                           |    5 +-
 42 files changed, 1124 insertions(+), 242 deletions(-)

diff --cc bin/phase-helpers.sh
index c7c3963,ac1c076..68496c2
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@@ -210,10 -210,12 +210,13 @@@ use() 
  		#fi
  		true
  
- 	# Make sure we have this USE flag in IUSE
- 	elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE ]] ; then
+ 	# Make sure we have this USE flag in IUSE, but exempt binary
+ 	# packages for API consumers like Entropy which do not require
+ 	# a full profile with IUSE_IMPLICIT and stuff (see bug #456830).
+ 	elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE &&
+ 		-n $PORTAGE_INTERNAL_CALLER ]] ; then
 -		if [[ ! $u =~ $PORTAGE_IUSE ]] ; then
 +		if ( [[ ! " ${FEATURES} " == *" force-multilib "* && $u == multilib ]] && \
 +			[[ ! $u =~ $PORTAGE_IUSE ]] ) ; then
  			if [[ ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]] ; then
  				# This is only strict starting with EAPI 5, since implicit IUSE
  				# is not well defined for earlier EAPIs (see bug #449708).
diff --cc pym/portage/package/ebuild/config.py
index aee20b0,fb7b741..c5ff688
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@@ -843,20 -844,9 +844,16 @@@ class config(object)
  					self[var] = default_val
  				self.backup_changes(var)
  
- 			features = []
- 			for x in ("globals", "defaults", "conf", "env"):
- 				v = self.configdict[x].get("FEATURES")
- 				if v is not None:
- 					features.append(v.split())
- 			features = stack_lists(features)
- 
+ 			if portage._internal_caller:
+ 				self["PORTAGE_INTERNAL_CALLER"] = "1"
+ 				self.backup_changes("PORTAGE_INTERNAL_CALLER")
 +			if 'force-multilib' in features:
 +				#add multilib_abi internally to list of USE_EXPANDed vars
 +				self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "")
 +				self.backup_changes("USE_EXPAND")
 +				default_abi = self.configdict["defaults"].get('DEFAULT_ABI', '').strip()
 +				if default_abi:
 +					self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi
  
  			# initialize self.features
  			self.regenerate()
@@@ -1722,17 -1737,13 +1746,17 @@@
  		# FEATURES=test for all ebuilds, regardless of explicit IUSE.
  		iuse_implicit.add("test")
  
 +		if 'force-multilib' in self.features:
 +			for multilib_abis in self.get('MULTILIB_ABIS', '').split():
 +				iuse_implicit.add("multilib_abi_" + multilib_abis)
 +
  		return iuse_implicit
  
- 	def _getUseMask(self, pkg):
- 		return self._use_manager.getUseMask(pkg)
+ 	def _getUseMask(self, pkg, stable=None):
+ 		return self._use_manager.getUseMask(pkg, stable=stable)
  
- 	def _getUseForce(self, pkg):
- 		return self._use_manager.getUseForce(pkg)
+ 	def _getUseForce(self, pkg, stable=None):
+ 		return self._use_manager.getUseForce(pkg, stable=stable)
  
  	def _getMaskAtom(self, cpv, metadata):
  		"""