From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 761731381F3 for ; Fri, 30 Nov 2012 16:45:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FF3121C1B0; Fri, 30 Nov 2012 16:44:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C69B321C1AF for ; Fri, 30 Nov 2012 16:44:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C83F33E082 for ; Fri, 30 Nov 2012 16:44:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 10F2CE5436 for ; Fri, 30 Nov 2012 16:44:50 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1354293846.56e08beb42f99cdeddaa11bf1fe012a5b1c475b1.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 56e08beb42f99cdeddaa11bf1fe012a5b1c475b1 X-VCS-Branch: multilib Date: Fri, 30 Nov 2012 16:44:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cbcfd2d7-48a6-4a1d-93a0-a07e73e5062b X-Archives-Hash: e74b3fdb895aa158517d80522b29e36b commit: 56e08beb42f99cdeddaa11bf1fe012a5b1c475b1 Author: Thomas Sachau gentoo org> AuthorDate: Fri Nov 30 16:44:06 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Fri Nov 30 16:44:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=56e08beb Merge 2.2.0_alpha143 bin/archive-conf | 2 +- bin/eapi.sh | 8 + bin/ebuild-helpers/dodoc | 2 +- bin/ebuild-helpers/doinfo | 2 +- bin/ebuild-helpers/prepman | 2 +- bin/ebuild-helpers/prepstrip | 75 +++++--- bin/ebuild.sh | 3 +- bin/egencache | 2 +- bin/emerge-webrsync | 9 +- bin/glsa-check | 14 +- bin/isolated-functions.sh | 2 + bin/misc-functions.sh | 21 +- bin/phase-functions.sh | 3 +- bin/phase-helpers.sh | 28 ++- bin/repoman | 61 +++++-- bin/save-ebuild-env.sh | 2 + cnf/make.globals | 2 +- doc/package/ebuild/eapi/4-python.docbook | 36 ++++ doc/package/ebuild/eapi/5-progress.docbook | 78 ++++++++ man/egencache.1 | 28 ++- man/emerge.1 | 11 +- man/portage.5 | 8 +- man/repoman.1 | 5 +- misc/emerge-delta-webrsync | 9 +- pym/_emerge/AbstractEbuildProcess.py | 4 +- pym/_emerge/BlockerDB.py | 7 +- pym/_emerge/EbuildBuild.py | 4 +- pym/_emerge/EbuildBuildDir.py | 4 +- pym/_emerge/EbuildExecuter.py | 2 +- pym/_emerge/EbuildMetadataPhase.py | 9 + pym/_emerge/FakeVartree.py | 32 ++-- pym/_emerge/Package.py | 151 ++++++++++----- pym/_emerge/PackageVirtualDbapi.py | 4 +- pym/_emerge/Scheduler.py | 32 ++-- pym/_emerge/actions.py | 120 ++++++++---- pym/_emerge/depgraph.py | 205 ++++++++------------ pym/_emerge/main.py | 10 + pym/_emerge/resolver/circular_dependency.py | 14 +- pym/_emerge/resolver/output.py | 14 +- pym/_emerge/resolver/slot_collision.py | 7 +- pym/portage/__init__.py | 1 + pym/portage/_sets/base.py | 4 +- pym/portage/cache/flat_hash.py | 10 +- pym/portage/dbapi/__init__.py | 19 ++- pym/portage/dbapi/_similar_name_search.py | 57 ++++++ pym/portage/dbapi/bintree.py | 2 +- pym/portage/dbapi/porttree.py | 7 + pym/portage/dbapi/vartree.py | 29 ++-- pym/portage/dep/__init__.py | 67 ++++++- pym/portage/dep/_slot_operator.py | 4 +- pym/portage/dep/dep_check.py | 4 +- pym/portage/eapi.py | 6 + pym/portage/elog/mod_save.py | 24 ++- pym/portage/elog/mod_save_summary.py | 21 ++- pym/portage/emaint/modules/move/move.py | 22 ++- pym/portage/package/ebuild/_config/UseManager.py | 119 +++++++++++- .../package/ebuild/_config/special_env_vars.py | 7 +- .../package/ebuild/_config/unpack_dependencies.py | 38 ++++ pym/portage/package/ebuild/_spawn_nofetch.py | 2 +- pym/portage/package/ebuild/config.py | 5 +- pym/portage/package/ebuild/doebuild.py | 38 +++-- pym/portage/package/ebuild/getmaskingstatus.py | 2 +- pym/portage/repository/config.py | 13 +- pym/portage/tests/dbapi/test_portdb_cache.py | 16 +- pym/portage/tests/emerge/test_simple.py | 2 +- pym/portage/tests/repoman/test_simple.py | 2 +- pym/portage/tests/resolver/ResolverPlayground.py | 17 +- .../tests/resolver/test_unpack_dependencies.py | 65 ++++++ pym/portage/tests/resolver/test_use_aliases.py | 131 +++++++++++++ pym/portage/tests/update/test_update_dbentry.py | 45 +++++ pym/portage/update.py | 32 +++- pym/portage/util/_desktop_entry.py | 5 +- pym/portage/util/_eventloop/EventLoop.py | 27 ++- pym/portage/util/movefile.py | 7 +- pym/repoman/checks.py | 40 ++--- 75 files changed, 1411 insertions(+), 511 deletions(-) diff --cc pym/_emerge/Package.py index f1b865c,86ed5f7..aac309a --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@@ -72,14 -79,9 +79,17 @@@ class Package(Task) implicit_match = self.root_config.settings._iuse_effective_match 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 - self.iuse = self._iuse(iuse.split(), implicit_match) + 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) ++>>>>>>> v2.2.0_alpha143 if (self.iuse.enabled or self.iuse.disabled) and \ not eapi_attrs.iuse_defaults: