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

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

commit:     9aff2af7bd5b5d2a851e7619b9bf8f5ee35a7b93
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 10:42:54 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 10:42:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9aff2af7

Merge tag 'portage-2.3.18' into multilib

portage-2.3.18

 RELEASE-NOTES                             |  9 +++++++++
 bin/doins.py                              |  6 +++++-
 bin/phase-functions.sh                    |  2 +-
 cnf/make.globals                          |  5 ++++-
 pym/_emerge/BinpkgExtractorAsync.py       |  4 ++--
 pym/_emerge/Package.py                    | 32 +++++++++++++++++++++++++++++++
 pym/portage/dbapi/__init__.py             |  5 +++++
 pym/portage/package/ebuild/config.py      |  6 ++++++
 pym/portage/tests/dbapi/test_fakedbapi.py | 20 +++++++++++++++++++
 setup.py                                  |  2 +-
 10 files changed, 85 insertions(+), 6 deletions(-)

diff --cc pym/_emerge/Package.py
index 23abb4fe8,cebfd8281..5f3de3175
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@@ -82,17 -83,14 +83,21 @@@ class Package(Task)
  
  		if eapi_attrs.iuse_effective:
  			implicit_match = self.root_config.settings._iuse_effective_match
+ 			if self.built:
+ 				implicit_match = functools.partial(
+ 					self._built_iuse_effective_match,
+ 					implicit_match, frozenset(self._metadata['USE'].split()))
  		else:
  			implicit_match = self.root_config.settings._iuse_implicit_match
 +		iuse = self._metadata["IUSE"]
 +		if 'force-multilib' in self.root_config.settings.features:
 +			if self.built is False:
 +				for multilib_abis in self.root_config.settings.get("MULTILIB_ABIS", '').split():
 +					iuse += " multilib_abi_" + multilib_abis
 +				iuse += " abiwrapper"
 +				self._metadata["IUSE"] = iuse
  		usealiases = self.root_config.settings._use_manager.getUseAliases(self)
 -		self.iuse = self._iuse(self, self._metadata["IUSE"].split(), implicit_match,
 +		self.iuse = self._iuse(self, iuse.split(), implicit_match,
  			usealiases, self.eapi)
  
  		if (self.iuse.enabled or self.iuse.disabled) and \