| 1 |
commit: 56e08beb42f99cdeddaa11bf1fe012a5b1c475b1 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 30 16:44:06 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 30 16:44:06 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=56e08beb |
| 7 |
|
| 8 |
Merge 2.2.0_alpha143 |
| 9 |
|
| 10 |
|
| 11 |
bin/archive-conf | 2 +- |
| 12 |
bin/eapi.sh | 8 + |
| 13 |
bin/ebuild-helpers/dodoc | 2 +- |
| 14 |
bin/ebuild-helpers/doinfo | 2 +- |
| 15 |
bin/ebuild-helpers/prepman | 2 +- |
| 16 |
bin/ebuild-helpers/prepstrip | 75 +++++--- |
| 17 |
bin/ebuild.sh | 3 +- |
| 18 |
bin/egencache | 2 +- |
| 19 |
bin/emerge-webrsync | 9 +- |
| 20 |
bin/glsa-check | 14 +- |
| 21 |
bin/isolated-functions.sh | 2 + |
| 22 |
bin/misc-functions.sh | 21 +- |
| 23 |
bin/phase-functions.sh | 3 +- |
| 24 |
bin/phase-helpers.sh | 28 ++- |
| 25 |
bin/repoman | 61 +++++-- |
| 26 |
bin/save-ebuild-env.sh | 2 + |
| 27 |
cnf/make.globals | 2 +- |
| 28 |
doc/package/ebuild/eapi/4-python.docbook | 36 ++++ |
| 29 |
doc/package/ebuild/eapi/5-progress.docbook | 78 ++++++++ |
| 30 |
man/egencache.1 | 28 ++- |
| 31 |
man/emerge.1 | 11 +- |
| 32 |
man/portage.5 | 8 +- |
| 33 |
man/repoman.1 | 5 +- |
| 34 |
misc/emerge-delta-webrsync | 9 +- |
| 35 |
pym/_emerge/AbstractEbuildProcess.py | 4 +- |
| 36 |
pym/_emerge/BlockerDB.py | 7 +- |
| 37 |
pym/_emerge/EbuildBuild.py | 4 +- |
| 38 |
pym/_emerge/EbuildBuildDir.py | 4 +- |
| 39 |
pym/_emerge/EbuildExecuter.py | 2 +- |
| 40 |
pym/_emerge/EbuildMetadataPhase.py | 9 + |
| 41 |
pym/_emerge/FakeVartree.py | 32 ++-- |
| 42 |
pym/_emerge/Package.py | 151 ++++++++++----- |
| 43 |
pym/_emerge/PackageVirtualDbapi.py | 4 +- |
| 44 |
pym/_emerge/Scheduler.py | 32 ++-- |
| 45 |
pym/_emerge/actions.py | 120 ++++++++---- |
| 46 |
pym/_emerge/depgraph.py | 205 ++++++++------------ |
| 47 |
pym/_emerge/main.py | 10 + |
| 48 |
pym/_emerge/resolver/circular_dependency.py | 14 +- |
| 49 |
pym/_emerge/resolver/output.py | 14 +- |
| 50 |
pym/_emerge/resolver/slot_collision.py | 7 +- |
| 51 |
pym/portage/__init__.py | 1 + |
| 52 |
pym/portage/_sets/base.py | 4 +- |
| 53 |
pym/portage/cache/flat_hash.py | 10 +- |
| 54 |
pym/portage/dbapi/__init__.py | 19 ++- |
| 55 |
pym/portage/dbapi/_similar_name_search.py | 57 ++++++ |
| 56 |
pym/portage/dbapi/bintree.py | 2 +- |
| 57 |
pym/portage/dbapi/porttree.py | 7 + |
| 58 |
pym/portage/dbapi/vartree.py | 29 ++-- |
| 59 |
pym/portage/dep/__init__.py | 67 ++++++- |
| 60 |
pym/portage/dep/_slot_operator.py | 4 +- |
| 61 |
pym/portage/dep/dep_check.py | 4 +- |
| 62 |
pym/portage/eapi.py | 6 + |
| 63 |
pym/portage/elog/mod_save.py | 24 ++- |
| 64 |
pym/portage/elog/mod_save_summary.py | 21 ++- |
| 65 |
pym/portage/emaint/modules/move/move.py | 22 ++- |
| 66 |
pym/portage/package/ebuild/_config/UseManager.py | 119 +++++++++++- |
| 67 |
.../package/ebuild/_config/special_env_vars.py | 7 +- |
| 68 |
.../package/ebuild/_config/unpack_dependencies.py | 38 ++++ |
| 69 |
pym/portage/package/ebuild/_spawn_nofetch.py | 2 +- |
| 70 |
pym/portage/package/ebuild/config.py | 5 +- |
| 71 |
pym/portage/package/ebuild/doebuild.py | 38 +++-- |
| 72 |
pym/portage/package/ebuild/getmaskingstatus.py | 2 +- |
| 73 |
pym/portage/repository/config.py | 13 +- |
| 74 |
pym/portage/tests/dbapi/test_portdb_cache.py | 16 +- |
| 75 |
pym/portage/tests/emerge/test_simple.py | 2 +- |
| 76 |
pym/portage/tests/repoman/test_simple.py | 2 +- |
| 77 |
pym/portage/tests/resolver/ResolverPlayground.py | 17 +- |
| 78 |
.../tests/resolver/test_unpack_dependencies.py | 65 ++++++ |
| 79 |
pym/portage/tests/resolver/test_use_aliases.py | 131 +++++++++++++ |
| 80 |
pym/portage/tests/update/test_update_dbentry.py | 45 +++++ |
| 81 |
pym/portage/update.py | 32 +++- |
| 82 |
pym/portage/util/_desktop_entry.py | 5 +- |
| 83 |
pym/portage/util/_eventloop/EventLoop.py | 27 ++- |
| 84 |
pym/portage/util/movefile.py | 7 +- |
| 85 |
pym/repoman/checks.py | 40 ++--- |
| 86 |
75 files changed, 1411 insertions(+), 511 deletions(-) |
| 87 |
|
| 88 |
diff --cc pym/_emerge/Package.py |
| 89 |
index f1b865c,86ed5f7..aac309a |
| 90 |
--- a/pym/_emerge/Package.py |
| 91 |
+++ b/pym/_emerge/Package.py |
| 92 |
@@@ -72,14 -79,9 +79,17 @@@ class Package(Task) |
| 93 |
implicit_match = self.root_config.settings._iuse_effective_match |
| 94 |
else: |
| 95 |
implicit_match = self.root_config.settings._iuse_implicit_match |
| 96 |
+ iuse = self.metadata["IUSE"] |
| 97 |
+ if 'force-multilib' in self.root_config.settings.features: |
| 98 |
+ if self.built is False: |
| 99 |
+ for multilib_abis in self.root_config.settings.get("MULTILIB_ABIS", '').split(): |
| 100 |
+ iuse += " multilib_abi_" + multilib_abis |
| 101 |
+ iuse += " abiwrapper" |
| 102 |
+ self.metadata["IUSE"] = iuse |
| 103 |
- self.iuse = self._iuse(iuse.split(), implicit_match) |
| 104 |
+ usealiases = self.root_config.settings._use_manager.getUseAliases(self) |
| 105 |
- self.iuse = self._iuse(self, self._metadata["IUSE"].split(), implicit_match, |
| 106 |
++ self.iuse = self._iuse(self, iuse.split(), implicit_match, |
| 107 |
+ usealiases, self.eapi) |
| 108 |
++>>>>>>> v2.2.0_alpha143 |
| 109 |
|
| 110 |
if (self.iuse.enabled or self.iuse.disabled) and \ |
| 111 |
not eapi_attrs.iuse_defaults: |
Archives