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-336377-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QAnkM-00029a-R0
for garchives@archives.gentoo.org; Fri, 15 Apr 2011 18:28:00 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 680531C015;
Fri, 15 Apr 2011 18:27:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 27EEC1C015
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Apr 2011 18:27:51 +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 923D81B408C
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Apr 2011 18:27:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id F03198006D
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Apr 2011 18:27:49 +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: <d3ccb4434f987833b705b3a3bceef68e8032e673.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: d3ccb4434f987833b705b3a3bceef68e8032e673
Date: Fri, 15 Apr 2011 18:27:49 +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: 0b2012ea5e93e9de6abe570b692a0cf2
commit: d3ccb4434f987833b705b3a3bceef68e8032e673
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 18:25:31 2011 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:25:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dd3ccb443
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
bin/ebuild-helpers/doins | 9 +++-
bin/repoman | 53 +++++++++++---=
------
cnf/make.globals | 5 ++-
man/make.conf.5 | 10 +++-
pym/_emerge/Scheduler.py | 10 +++-
pym/_emerge/main.py | 8 ++-
pym/_emerge/resolver/output.py | 4 +-
pym/portage/const.py | 6 +-
pym/portage/dbapi/porttree.py | 3 +
pym/portage/dep/__init__.py | 8 ++-
.../package/ebuild/_config/special_env_vars.py | 3 +-
pym/portage/package/ebuild/doebuild.py | 2 +-
pym/portage/package/ebuild/fetch.py | 12 ++--
pym/portage/tests/dep/testExtractAffectingUSE.py | 5 ++-
14 files changed, 90 insertions(+), 48 deletions(-)
diff --cc cnf/make.globals
index c6ba9f5,bcad5de..930b3d5
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@@ -131,10 -119,13 +131,13 @@@ PORTAGE_WORKDIR_MODE=3D"0700
PORTAGE_ELOG_CLASSES=3D"log warn error"
PORTAGE_ELOG_SYSTEM=3D"save_summary echo"
=20
-PORTAGE_ELOG_MAILURI=3D"root"
+PORTAGE_ELOG_MAILURI=3D"@rootuser@"
PORTAGE_ELOG_MAILSUBJECT=3D"[portage] ebuild log for \${PACKAGE} on \${=
HOST}"
-PORTAGE_ELOG_MAILFROM=3D"portage@localhost"
+PORTAGE_ELOG_MAILFROM=3D"@portageuser@@localhost"
=20
+ # Signing command used by repoman
+ PORTAGE_GPG_SIGNING_COMMAND=3D"gpg --sign --clearsign --yes --default-k=
ey \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\"=
"
+=20
# *****************************
# ** DO NOT EDIT THIS FILE **
# ***************************************************
diff --cc pym/portage/const.py
index 7929c28,db3f841..7df2ecb
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -1,23 -1,9 +1,23 @@@
# portage: Constants
- # Copyright 1998-2010 Gentoo Foundation
+ # Copyright 1998-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
+# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
+# autotool supplied constants.
+# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
+from portage.const_autotool import *
+
import os
=20
+# save the original prefix
+BPREFIX =3D EPREFIX
+# pick up EPREFIX from the environment if set
+if "EPREFIX" in os.environ:
+ if os.environ["EPREFIX"] !=3D "":
+ EPREFIX =3D os.path.normpath(os.environ["EPREFIX"])
+ else:
+ EPREFIX =3D os.environ["EPREFIX"]
+
# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
# START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- STA=
RT OF
# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
@@@ -132,10 -88,9 +132,10 @@@ EBUILD_PHASES =3D ("pretend",=20
SUPPORTED_FEATURES =3D frozenset([
"assume-digests", "binpkg-logs", "buildpkg",=
"buildsyspkg", "candy",
"ccache", "chflags", "collision-protect", "c=
ompress-build-logs",
- "digest", "distcc", "distlocks",
- "fakeroot", "fail-clean", "fixpackages", "ge=
tbinpkg",
+ "digest", "distcc", "distlocks", "fakeroot",
+ "fail-clean", "fixpackages", "force-mirror",=
"getbinpkg",
"installsources", "keeptemp", "keepwork", "f=
ixlafiles", "lmirror",
+ "macossandbox", "macosprefixsandbox", "maco=
susersandbox",
"metadata-transfer", "mirror", "multilib-str=
ict", "news",
"noauto", "noclean", "nodoc", "noinfo", "nom=
an", "nostrip",
"notitles", "parallel-fetch", "parse-eapi-eb=
uild-head",