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 1QQDeU-00075N-Or for garchives@archives.gentoo.org; Sat, 28 May 2011 07:09:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A8661C02A; Sat, 28 May 2011 07:09:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B79A21C02A for ; Sat, 28 May 2011 07:09:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECFED1B400D for ; Sat, 28 May 2011 07:09:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 53A3880505 for ; Sat, 28 May 2011 07:09:29 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <0e1d5acde91ad165431333b0ccbc56b62cae0c04.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:public_api commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 0e1d5acde91ad165431333b0ccbc56b62cae0c04 Date: Sat, 28 May 2011 07:09:29 +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: X-Archives-Hash: 562826148c19e213ac6b6b864744c361 commit: 0e1d5acde91ad165431333b0ccbc56b62cae0c04 Author: dol-sen gmail com> AuthorDate: Sat May 28 07:05:32 2011 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat May 28 07:05:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0e1d5acd Merge branch 'master' into public_api bin/ebuild.sh | 7 + bin/etc-update | 8 +- bin/glsa-check | 4 +- bin/regenworld | 6 +- bin/repoman | 2 +- cnf/make.conf.sparc.diff | 2 +- doc/package/ebuild/eapi/4.docbook | 4 +- make.conf.txt | 719 --------------= ------ man/ebuild.5 | 4 +- man/emerge.1 | 20 +- man/make.conf.5 | 5 +- pym/_emerge/AsynchronousLock.py | 49 ++- pym/_emerge/AsynchronousTask.py | 5 +- pym/_emerge/Binpkg.py | 3 +- pym/_emerge/BinpkgFetcher.py | 7 +- pym/_emerge/Blocker.py | 12 +- pym/_emerge/BlockerDB.py | 9 +- pym/_emerge/DepPriority.py | 2 +- pym/_emerge/DepPrioritySatisfiedRange.py | 31 +- pym/_emerge/EbuildBuild.py | 3 +- pym/_emerge/EbuildBuildDir.py | 29 +- pym/_emerge/EbuildMerge.py | 23 +- pym/_emerge/EbuildPhase.py | 34 +- pym/_emerge/FakeVartree.py | 21 +- pym/_emerge/Package.py | 59 ++- pym/_emerge/PackageUninstall.py | 102 +++- pym/_emerge/Scheduler.py | 24 +- pym/_emerge/Task.py | 31 +- pym/_emerge/actions.py | 38 +- pym/_emerge/depgraph.py | 630 ++++++++++++++= ---- pym/_emerge/help.py | 21 +- pym/_emerge/main.py | 17 +- pym/_emerge/resolver/backtracking.py | 7 +- pym/_emerge/resolver/output_helpers.py | 4 +- pym/_emerge/unmerge.py | 74 ++- pym/portage/const.py | 2 +- pym/portage/cvstree.py | 6 +- pym/portage/dbapi/_MergeProcess.py | 43 +- pym/portage/dbapi/vartree.py | 378 +++++++--- pym/portage/mail.py | 11 +- pym/portage/output.py | 4 +- pym/portage/package/ebuild/doebuild.py | 121 ++-- pym/portage/package/ebuild/getmaskingstatus.py | 7 +- pym/portage/tests/ebuild/test_config.py | 4 +- pym/portage/tests/locks/test_asynchronous_lock.py | 95 +++- pym/portage/tests/resolver/ResolverPlayground.py | 99 +++- pym/portage/tests/resolver/test_autounmask.py | 51 ++- .../tests/resolver/test_circular_dependencies.py | 3 +- pym/portage/tests/resolver/test_depth.py | 8 +- pym/portage/tests/resolver/test_merge_order.py | 386 +++++++++++ pym/portage/tests/resolver/test_multirepo.py | 3 + .../tests/resolver/test_old_dep_chain_display.py | 2 + pym/portage/tests/resolver/test_simple.py | 2 +- pym/portage/tests/resolver/test_slot_collisions.py | 3 +- pym/portage/update.py | 4 +- pym/portage/util/__init__.py | 29 +- pym/portage/util/_dyn_libs/LinkageMapELF.py | 13 +- pym/portage/util/digraph.py | 10 +- pym/portage/util/movefile.py | 5 +- pym/portage/xml/metadata.py | 4 +- 60 files changed, 2004 insertions(+), 1305 deletions(-)