| 1 |
commit: 9aff2af7bd5b5d2a851e7619b9bf8f5ee35a7b93 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 7 10:42:54 2018 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 7 10:42:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9aff2af7 |
| 7 |
|
| 8 |
Merge tag 'portage-2.3.18' into multilib |
| 9 |
|
| 10 |
portage-2.3.18 |
| 11 |
|
| 12 |
RELEASE-NOTES | 9 +++++++++ |
| 13 |
bin/doins.py | 6 +++++- |
| 14 |
bin/phase-functions.sh | 2 +- |
| 15 |
cnf/make.globals | 5 ++++- |
| 16 |
pym/_emerge/BinpkgExtractorAsync.py | 4 ++-- |
| 17 |
pym/_emerge/Package.py | 32 +++++++++++++++++++++++++++++++ |
| 18 |
pym/portage/dbapi/__init__.py | 5 +++++ |
| 19 |
pym/portage/package/ebuild/config.py | 6 ++++++ |
| 20 |
pym/portage/tests/dbapi/test_fakedbapi.py | 20 +++++++++++++++++++ |
| 21 |
setup.py | 2 +- |
| 22 |
10 files changed, 85 insertions(+), 6 deletions(-) |
| 23 |
|
| 24 |
diff --cc pym/_emerge/Package.py |
| 25 |
index 23abb4fe8,cebfd8281..5f3de3175 |
| 26 |
--- a/pym/_emerge/Package.py |
| 27 |
+++ b/pym/_emerge/Package.py |
| 28 |
@@@ -82,17 -83,14 +83,21 @@@ class Package(Task) |
| 29 |
|
| 30 |
if eapi_attrs.iuse_effective: |
| 31 |
implicit_match = self.root_config.settings._iuse_effective_match |
| 32 |
+ if self.built: |
| 33 |
+ implicit_match = functools.partial( |
| 34 |
+ self._built_iuse_effective_match, |
| 35 |
+ implicit_match, frozenset(self._metadata['USE'].split())) |
| 36 |
else: |
| 37 |
implicit_match = self.root_config.settings._iuse_implicit_match |
| 38 |
+ iuse = self._metadata["IUSE"] |
| 39 |
+ if 'force-multilib' in self.root_config.settings.features: |
| 40 |
+ if self.built is False: |
| 41 |
+ for multilib_abis in self.root_config.settings.get("MULTILIB_ABIS", '').split(): |
| 42 |
+ iuse += " multilib_abi_" + multilib_abis |
| 43 |
+ iuse += " abiwrapper" |
| 44 |
+ self._metadata["IUSE"] = iuse |
| 45 |
usealiases = self.root_config.settings._use_manager.getUseAliases(self) |
| 46 |
- self.iuse = self._iuse(self, self._metadata["IUSE"].split(), implicit_match, |
| 47 |
+ self.iuse = self._iuse(self, iuse.split(), implicit_match, |
| 48 |
usealiases, self.eapi) |
| 49 |
|
| 50 |
if (self.iuse.enabled or self.iuse.disabled) and \ |
Archives