From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RKxvE-0002MP-C4 for garchives@archives.gentoo.org; Mon, 31 Oct 2011 19:53:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5365921C02A; Mon, 31 Oct 2011 19:53:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 13DC021C02A for ; Mon, 31 Oct 2011 19:53:21 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72D3F1B4016 for ; Mon, 31 Oct 2011 19:53:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DD58C80042 for ; Mon, 31 Oct 2011 19:53:19 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <0fe2340f8bb892447768b64dfe2970a7be760107.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: 0fe2340f8bb892447768b64dfe2970a7be760107 Date: Mon, 31 Oct 2011 19:53:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6e4cf349-4954-4439-885f-c6bd30db139d X-Archives-Hash: 4e14ba2fcbeb2f528a62c9e7a55cf476 commit: 0fe2340f8bb892447768b64dfe2970a7be760107 Author: Thomas Sachau gentoo org> AuthorDate: Mon Oct 31 19:52:01 2011 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Mon Oct 31 19:52:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0fe2340f Merge commit 'v2.2.0_alpha72' into multilib bin/ebuild | 4 +- bin/egencache | 87 ++++-- bin/emaint | 22 +- bin/glsa-check | 5 +- bin/lock-helper.py | 4 +- bin/portageq | 81 +++-- bin/quickpkg | 24 +- bin/regenworld | 5 +- bin/repoman | 11 +- bin/xpak-helper.py | 4 +- man/emerge.1 | 4 + man/make.conf.5 | 9 +- man/portage.5 | 12 +- pym/_emerge/BlockerDB.py | 5 +- pym/_emerge/EbuildFetchonly.py | 4 +- pym/_emerge/EbuildMetadataPhase.py | 6 +- pym/_emerge/FakeVartree.py | 11 +- pym/_emerge/Package.py | 8 +- pym/_emerge/RootConfig.py | 2 +- pym/_emerge/Scheduler.py | 17 +- pym/_emerge/actions.py | 304 +++++++-------= --- pym/_emerge/depgraph.py | 33 +- pym/_emerge/main.py | 46 ++- pym/_emerge/unmerge.py | 4 +- pym/portage/__init__.py | 42 ++- pym/portage/_global_updates.py | 2 +- pym/portage/_legacy_globals.py | 12 +- pym/portage/_sets/__init__.py | 38 ++- pym/portage/cache/metadata.py | 1 - pym/portage/cache/template.py | 5 + pym/portage/checksum.py | 41 ++- pym/portage/dbapi/_expand_new_virt.py | 3 +- pym/portage/dbapi/bintree.py | 35 ++- pym/portage/dbapi/porttree.py | 43 ++- pym/portage/dbapi/vartree.py | 110 +++++-- pym/portage/dep/dep_check.py | 8 +- pym/portage/elog/mod_syslog.py | 2 +- pym/portage/news.py | 74 ++++- .../package/ebuild/_config/KeywordsManager.py | 6 +- .../package/ebuild/_config/LocationsManager.py | 83 ++++- pym/portage/package/ebuild/_config/MaskManager.py | 37 ++- pym/portage/package/ebuild/_config/UseManager.py | 18 +- pym/portage/package/ebuild/config.py | 96 +++--- pym/portage/package/ebuild/digestcheck.py | 2 +- pym/portage/package/ebuild/doebuild.py | 25 +- pym/portage/repository/config.py | 358 +++++++++++++-= ------ pym/portage/tests/ebuild/test_config.py | 8 +- pym/portage/tests/ebuild/test_doebuild_spawn.py | 2 +- pym/portage/tests/emerge/test_simple.py | 39 ++- pym/portage/tests/repoman/test_simple.py | 2 +- pym/portage/tests/resolver/ResolverPlayground.py | 27 +- pym/portage/util/__init__.py | 11 +- pym/portage/util/env_update.py | 13 +- pym/repoman/utilities.py | 4 + runtests.sh | 20 ++ 55 files changed, 1203 insertions(+), 676 deletions(-) diff --cc pym/_emerge/actions.py index d8f9032,af3780e..66204b6 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@@ -1464,11 -1468,7 +1468,8 @@@ def action_info(settings, trees, myopts =20 myvars =3D portage.util.unique_array(myvars) use_expand =3D settings.get('USE_EXPAND', '').split() + use_expand.append("MULTILIB_ABIS") use_expand.sort() - use_expand_hidden =3D set( - settings.get('USE_EXPAND_HIDDEN', '').upper().split()) - alphabetical_use =3D '--alphabetical' in myopts unset_vars =3D [] myvars.sort() for k in myvars: diff --cc pym/_emerge/main.py index e5ba5e1,52e4c42..534d0ea --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@@ -1639,16 -1642,11 +1642,16 @@@ def emerge_main(args=3DNone) adjust_configs(myopts, trees) apply_priorities(settings) =20 + if settings.get("NO_AUTO_FLAG", "") is "": + writemsg_level(bad("!!! Failed to find vars from extra profile") + "\= n",level=3Dlogging.ERROR, noiselevel=3D-1) + writemsg_level(bad("!!! Please make sure that you did follow the inst= ructions and included the extra profile\n"),level=3Dlogging.ERROR, noisel= evel=3D-1) + return 1 + if myaction =3D=3D 'version': writemsg_stdout(getportageversion( - settings["PORTDIR"], settings["ROOT"], + settings["PORTDIR"], None, settings.profile_path, settings["CHOST"], - trees[settings["ROOT"]]["vartree"].dbapi) + '\n', noiselevel=3D-1) + trees[settings['EROOT']]['vartree'].dbapi) + '\n', noiselevel=3D-1) return 0 elif myaction =3D=3D 'help': _emerge.help.help() diff --cc pym/portage/package/ebuild/config.py index ceb5154,765a4f7..ee6253f --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@@ -424,16 -430,14 +430,16 @@@ class config(object) mygcfg_dlists =3D [getconfig(os.path.join(x, "make.defaults"), expand=3Dexpand_map) for x in self.profiles] self._make_defaults =3D mygcfg_dlists - self.mygcfg =3D stack_dicts(mygcfg_dlists, + mygcfg =3D stack_dicts(mygcfg_dlists, incrementals=3Dself.incrementals) - if self.mygcfg is None: - self.mygcfg =3D {} - self.configlist.append(self.mygcfg) + if mygcfg is None: + mygcfg =3D {} + self.configlist.append(mygcfg) self.configdict["defaults"]=3Dself.configlist[-1] + if self.configdict["defaults"].get("MULTILIB_ABIS", "").count(' ') != =3D 0: + self.configdict["defaults"]["USE"] =3D self.configdict["defaults"].= get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFA= ULT_ABI", "") =20 - self.mygcfg =3D getconfig( + mygcfg =3D getconfig( os.path.join(config_root, MAKE_CONF_FILE), tolerant=3Dtolerant, allow_sourcing=3DTrue, expand=3Dexpand_map) or {}