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 <gentoo-commits+bounces-388499-garchives=archives.gentoo.org@lists.gentoo.org>) id 1RA03S-0005r1-3x for garchives@archives.gentoo.org; Sat, 01 Oct 2011 13:56:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1273E21C038; Sat, 1 Oct 2011 13:56:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C7CFE21C038 for <gentoo-commits@lists.gentoo.org>; Sat, 1 Oct 2011 13:56:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 511361B401F for <gentoo-commits@lists.gentoo.org>; Sat, 1 Oct 2011 13:56:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A607280048 for <gentoo-commits@lists.gentoo.org>; Sat, 1 Oct 2011 13:56:28 +0000 (UTC) From: "Thomas Sachau" <tommy@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" <tommy@gentoo.org> Message-ID: <a173ae4f96adebc538b3acd1c9814ca7c126b667.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: a173ae4f96adebc538b3acd1c9814ca7c126b667 Date: Sat, 1 Oct 2011 13:56:28 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6a27439982234c59418523139c6c4e93 commit: a173ae4f96adebc538b3acd1c9814ca7c126b667 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> AuthorDate: Sat Oct 1 13:54:56 2011 +0000 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> CommitDate: Sat Oct 1 13:54:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da173ae4f Merge commit 'v2.2.0_alpha60' into multilib bin/archive-conf | 2 +- bin/dispatch-conf | 33 + bin/ebuild | 6 +- bin/emerge-webrsync | 1 + bin/etc-update | 11 +- bin/misc-functions.sh | 35 +- bin/portageq | 48 +- bin/repoman | 40 +- cnf/dispatch-conf.conf | 10 +- cnf/etc-update.conf | 12 +- man/emerge.1 | 21 +- man/make.conf.5 | 4 - man/portage.5 | 3 + pym/_emerge/EbuildFetcher.py | 21 +- pym/_emerge/actions.py | 3 +- pym/_emerge/create_depgraph_params.py | 16 + pym/_emerge/depgraph.py | 170 ++++- pym/_emerge/help.py | 794 +-------------= ------ pym/_emerge/main.py | 40 +- pym/_emerge/resolver/backtracking.py | 25 + pym/_emerge/resolver/output_helpers.py | 4 +- pym/portage/const.py | 1 - pym/portage/dbapi/__init__.py | 106 ++-- pym/portage/dbapi/porttree.py | 328 +++++---- pym/portage/dbapi/vartree.py | 37 +- pym/portage/dep/__init__.py | 9 + pym/portage/manifest.py | 15 +- pym/portage/package/ebuild/config.py | 4 +- pym/portage/package/ebuild/digestcheck.py | 3 +- pym/portage/package/ebuild/digestgen.py | 6 + pym/portage/package/ebuild/doebuild.py | 11 +- pym/portage/package/ebuild/fetch.py | 1 - pym/portage/package/ebuild/getmaskingstatus.py | 4 +- pym/portage/repository/config.py | 24 +- pym/portage/tests/emerge/test_simple.py | 9 + pym/portage/tests/resolver/ResolverPlayground.py | 22 +- pym/portage/tests/resolver/test_autounmask.py | 103 +++ pym/portage/tests/resolver/test_backtracking.py | 43 ++ .../tests/resolver/test_circular_choices.py | 61 ++ pym/portage/tests/resolver/test_complete_graph.py | 66 ++ pym/portage/tests/resolver/test_virtual_slot.py | 49 ++ pym/portage/util/env_update.py | 31 +- pym/repoman/herdbase.py | 4 - 43 files changed, 1053 insertions(+), 1183 deletions(-)