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-325177-garchives=archives.gentoo.org@lists.gentoo.org>) id 1PymXj-0000Ms-QI for garchives@archives.gentoo.org; Sun, 13 Mar 2011 14:45:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C78B9E0529; Sun, 13 Mar 2011 14:45:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8E07BE0529 for <gentoo-commits@lists.gentoo.org>; Sun, 13 Mar 2011 14:45:06 +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 230121B4092 for <gentoo-commits@lists.gentoo.org>; Sun, 13 Mar 2011 14:45:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8F9928006A for <gentoo-commits@lists.gentoo.org>; Sun, 13 Mar 2011 14:45:05 +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: <0e8dc4226bf5bad8ade819aa5282ec6aca01f220.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: 0e8dc4226bf5bad8ade819aa5282ec6aca01f220 Date: Sun, 13 Mar 2011 14:45:05 +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: 63fb90d3c506a382e2c1c04f58b61958 commit: 0e8dc4226bf5bad8ade819aa5282ec6aca01f220 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Mar 13 14:42:58 2011 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Mar 13 14:42:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0e8dc422 Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild-ipc.py bin/ebuild-ipc.py | 15 +++++------- pym/_emerge/AbstractEbuildProcess.py | 5 ++++ pym/_emerge/AbstractPollTask.py | 11 ++++++++- pym/_emerge/MetadataRegen.py | 15 ++++++----- pym/_emerge/PollScheduler.py | 39 ++++++++++++++++++++++++++= ----- pym/_emerge/QueueScheduler.py | 3 ++ pym/_emerge/Scheduler.py | 24 ++++++++++++++++--- pym/portage/dbapi/vartree.py | 18 +++++++------- pym/portage/package/ebuild/doebuild.py | 7 ++++- 9 files changed, 98 insertions(+), 39 deletions(-) diff --cc bin/ebuild-ipc.py index 786f4a7,d8e7e55..761b695 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python +#!@PREFIX_PORTAGE_PYTHON@ - # Copyright 2010 Gentoo Foundation + # Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # This is a helper which ebuild processes can use