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 1Q2Th3-0001Ew-T2 for garchives@archives.gentoo.org; Wed, 23 Mar 2011 19:26:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93BF71C0A5; Wed, 23 Mar 2011 19:26:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6415D1C0A5 for ; Wed, 23 Mar 2011 19:26:01 +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 A5CF81B4074 for ; Wed, 23 Mar 2011 19:26:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 115BB8006A for ; Wed, 23 Mar 2011 19:26:00 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <13cb50a71e7fcafe7858cc87420c6f93c652eba6.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: 13cb50a71e7fcafe7858cc87420c6f93c652eba6 Date: Wed, 23 Mar 2011 19:26:00 +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: 81ec465405c8febbf05b3d4fb4cdb8a8 commit: 13cb50a71e7fcafe7858cc87420c6f93c652eba6 Author: Fabian Groffen gentoo org> AuthorDate: Wed Mar 23 19:23:07 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Mar 23 19:23:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D13cb50a7 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix bin/ebuild-ipc.py | 55 ++++++++++++++++++++++++--= ----- bin/portageq | 26 ++++++++++++--- man/make.conf.5 | 2 +- pym/_emerge/AsynchronousLock.py | 8 +++++ pym/_emerge/CompositeTask.py | 22 +++++++++++-- pym/_emerge/EbuildIpcDaemon.py | 29 ++++++++++++++--- pym/_emerge/FakeVartree.py | 4 +- pym/_emerge/PackageVirtualDbapi.py | 6 ++-- pym/_emerge/TaskSequence.py | 3 +- pym/_emerge/actions.py | 3 +- pym/_emerge/main.py | 19 +++++++---- pym/_emerge/resolver/slot_collision.py | 2 +- 12 files changed, 137 insertions(+), 42 deletions(-)