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-392813-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RFRG1-0006Nd-EO
for garchives@archives.gentoo.org; Sun, 16 Oct 2011 14:00:05 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8879121C111;
Sun, 16 Oct 2011 13:59:58 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 3DC4221C111
for <gentoo-commits@lists.gentoo.org>; Sun, 16 Oct 2011 13:59:58 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9B24C1B403D
for <gentoo-commits@lists.gentoo.org>; Sun, 16 Oct 2011 13:59:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id BBB0380042
for <gentoo-commits@lists.gentoo.org>; Sun, 16 Oct 2011 13:59:56 +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: <ebcf640da49dc319ec3b642a1363726336cc36b6.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: ebcf640da49dc319ec3b642a1363726336cc36b6
Date: Sun, 16 Oct 2011 13:59:56 +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: 95c26a15895aa20e22f0342924637d6d
commit: ebcf640da49dc319ec3b642a1363726336cc36b6
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 13:59:20 2011 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 13:59:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Debcf640d
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts:
bin/ebuild
bin/fixpackages
bin/repoman
bin/ebuild | 3 +--
bin/egencache | 4 +---
bin/fixpackages | 17 +++++++++++++-=
---
bin/repoman | 13 ++++++-------
pym/_emerge/EbuildMetadataPhase.py | 16 ++++++++++----=
--
pym/_emerge/MetadataRegen.py | 1 -
pym/portage/_global_updates.py | 8 ++++----
pym/portage/dbapi/porttree.py | 7 ++-----
pym/portage/eclass_cache.py | 2 +-
.../package/ebuild/_config/special_env_vars.py | 2 +-
pym/portage/package/ebuild/config.py | 6 ++++--
pym/portage/repository/config.py | 4 ++--
pym/portage/tests/emerge/test_simple.py | 8 +++++++-
13 files changed, 52 insertions(+), 39 deletions(-)
diff --cc bin/ebuild
index c64e885,771ccb5..a27b049
--- a/bin/ebuild
+++ b/bin/ebuild
@@@ -56,15 -56,12 +56,14 @@@ parser.add_option("--skip-manifest", he
=20
opts, pargs =3D parser.parse_args(args=3Dsys.argv[1:])
=20
- os.environ["PORTAGE_CALLER"]=3D"ebuild"
-try:
- import portage
-except ImportError:
- from os import path as osp
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__fil=
e__))), "pym"))
- import portage
+# for an explanation on this logic, see pym/_emerge/__init__.py
+from os import environ as ose
+from os import path as osp
+if ose.__contains__("PORTAGE_PYTHONPATH"):
+ sys.path.insert(0, ose["PORTAGE_PYTHONPATH"])
+else:
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp. =
realpath(__file__))), "pym"))
++ sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__=
file__))), "pym"))
+import portage
=20
portage.dep._internal_warnings =3D True
from portage import os
diff --cc bin/fixpackages
index a60852a,dc43ed2..57b6db3
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@@ -1,11 -1,18 +1,20 @@@
-#!/usr/bin/python
+#!@PREFIX_PORTAGE_PYTHON@
- # Copyright 1999-2006 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
=20
from __future__ import print_function
=20
- import os,sys
- os.environ["PORTAGE_CALLER"]=3D"fixpackages"
+ import os
+ import sys
+=20
-try:
- import portage
-except ImportError:
- from os import path as osp
++# for an explanation on this logic, see pym/_emerge/__init__.py =
=
=
=
=
=20
++from os import environ as ose =
=
=
=
=
=20
++from os import path as osp =
=
=
=
=
=20
++if ose.__contains__("PORTAGE_PYTHONPATH"): =
=
=
=
=
=20
++ sys.path.insert(0, ose["PORTAGE_PYTHONPATH"]) =
=
=
=
=
=20
++else: =
=
=
=
=
=20
+ sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__fil=
e__))), "pym"))
- import portage
++import portage
=20
from portage import os
from portage.output import EOutput
diff --cc bin/repoman
index 6d1164a,b1a2ac3..1f4175b
--- a/bin/repoman
+++ b/bin/repoman
@@@ -77,10 -75,7 +77,8 @@@ from portage.output import bold, create
from portage.output import ConsoleStyleFile, StyleWriter
from portage.util import cmp_sort_key, writemsg_level, writemsg_stdout
from portage.package.ebuild.digestgen import digestgen
- from portage.eapi import eapi_has_slot_deps, \
- eapi_has_use_deps, eapi_has_strong_blocks, eapi_has_iuse_defaults, \
- eapi_has_required_use, eapi_has_use_dep_defaults
+ from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+from portage.const import EPREFIX
=20
if sys.hexversion >=3D 0x3000000:
basestring =3D str