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-383926-garchives=archives.gentoo.org@lists.gentoo.org>) id 1R650e-00066H-OZ for garchives@archives.gentoo.org; Tue, 20 Sep 2011 18:25:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 081F521C02C; Tue, 20 Sep 2011 18:25:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C7A9821C02C for <gentoo-commits@lists.gentoo.org>; Tue, 20 Sep 2011 18:25:23 +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 3D7C01B4026 for <gentoo-commits@lists.gentoo.org>; Tue, 20 Sep 2011 18:25:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8475080042 for <gentoo-commits@lists.gentoo.org>; Tue, 20 Sep 2011 18:25:22 +0000 (UTC) From: "Fabian Groffen" <grobian@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org> Message-ID: <e1854a9b5115f443e45a8de1d5b48a84d249c6a0.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: e1854a9b5115f443e45a8de1d5b48a84d249c6a0 Date: Tue, 20 Sep 2011 18:25:22 +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: 058fc8a440f843f8d99b7bcc27046927 commit: e1854a9b5115f443e45a8de1d5b48a84d249c6a0 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Sep 20 17:19:55 2011 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Sep 20 17:19:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De1854a9b Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix bin/ebuild | 6 +- bin/emerge-webrsync | 1 + bin/misc-functions.sh | 20 ++-- bin/repoman | 10 +- man/emerge.1 | 14 +++ pym/_emerge/actions.py | 3 +- pym/_emerge/depgraph.py | 123 +++++++++++++++-= ----- pym/_emerge/help.py | 22 ++++- pym/_emerge/main.py | 20 ++++ pym/_emerge/resolver/backtracking.py | 25 +++++ pym/_emerge/resolver/output_helpers.py | 4 +- pym/_emerge/search.py | 1 - pym/portage/dbapi/porttree.py | 1 - pym/portage/dbapi/vartree.py | 30 ++---- pym/portage/manifest.py | 17 +++- pym/portage/package/ebuild/config.py | 4 +- pym/portage/package/ebuild/digestcheck.py | 44 ++------ pym/portage/package/ebuild/doebuild.py | 2 +- pym/portage/package/ebuild/fetch.py | 1 - pym/portage/repository/config.py | 9 ++- pym/portage/tests/ebuild/test_config.py | 21 ++++- pym/portage/tests/repoman/test_simple.py | 2 +- pym/portage/tests/resolver/ResolverPlayground.py | 34 +++++- pym/portage/tests/resolver/test_autounmask.py | 103 ++++++++++++++++= ++ pym/portage/tests/resolver/test_backtracking.py | 43 ++++++++ pym/portage/tests/resolver/test_multislot.py | 16 +++- pym/portage/tests/resolver/test_virtual_slot.py | 49 +++++++++ pym/portage/util/__init__.py | 4 +- pym/portage/util/env_update.py | 31 +++++- 29 files changed, 526 insertions(+), 134 deletions(-) diff --cc bin/misc-functions.sh index 750f500,30244a7..e9d6e5a mode 100644,100755..100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh