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-323967-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1PxPJA-0000QC-SS
for garchives@archives.gentoo.org; Wed, 09 Mar 2011 19:44:33 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7A1EC1C035;
Wed, 9 Mar 2011 19:44:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 464201C035
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Mar 2011 19:44:24 +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 A3EEB1B40B3
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Mar 2011 19:44:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id ED6B88006A
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Mar 2011 19:44: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: <5fe6f8c536460d74097aa1b10eeffe115382fa03.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: 5fe6f8c536460d74097aa1b10eeffe115382fa03
Date: Wed, 9 Mar 2011 19:44: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: b21eb2ce1b037ce958bb7889a2c2dbe8
commit: 5fe6f8c536460d74097aa1b10eeffe115382fa03
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 19:42:08 2011 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 19:42:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D5fe6f8c5
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts:
bin/ebuild-helpers/dodoc
bin/ebuild | 51 ++++++++++++++++++++++------=
-----
bin/ebuild-helpers/dodoc | 3 +-
pym/_emerge/actions.py | 36 ++++++++++++++++--------
pym/_emerge/depgraph.py | 22 ++++++++++++--
pym/_emerge/unmerge.py | 31 ++++++++++++--------
pym/portage/dbapi/porttree.py | 2 -
pym/portage/dbapi/vartree.py | 46 +++++++++++++++++++++++-----=
--
pym/portage/eclass_cache.py | 17 +----------
pym/portage/package/ebuild/config.py | 25 ++++++++--------
pym/portage/util/__init__.py | 21 ++++++++++++-
pym/repoman/checks.py | 6 ++-
11 files changed, 170 insertions(+), 90 deletions(-)
diff --cc bin/ebuild-helpers/dodoc
index 073fa20,65713db..41fc8f5
--- a/bin/ebuild-helpers/dodoc
+++ b/bin/ebuild-helpers/dodoc
@@@ -1,8 -1,8 +1,9 @@@
+#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ #!/bin/bash
+ # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
+source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
=20
if [ $# -lt 1 ] ; then
helpers_die "${0##*/}: at least one argument needed"