Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/ebuild.sh
	bin/phase-functions.sh
	pym/portage/util/__init__.py

diff --cc bin/ebuild.sh
index 30c34e81d626296a8be06c308d136ce1917a44b2,f8e71f5f230d192e39e7dbfaa4f1199d458c56fe..efd62853048744990fbe76bea4b6ace160ee1d81
--- 1/bin/ebuild.sh
--- 2/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -1,9 -1,9 +1,9 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
 -PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
 +PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"
 +PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}"
  
  # Prevent aliases from causing portage to act inappropriately.
  # Make sure it's before everything so we don't mess aliases that follow.

diff --cc bin/phase-functions.sh
index c002a34816cde10ebb3d6a40403baf4dfa4f0b1b,ce251ceb987a555387037d22f3edf1beb0278683..86df843d97ba356e9327256018478de324d03ae2
--- 1/bin/phase-functions.sh
--- 2/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PREFIX_PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  # Hardcoded bash lists are needed for backward compatibility with

diff --cc bin/repoman
Simple merge

diff --cc pym/portage/package/ebuild/_config/special_env_vars.py
Simple merge

diff --cc pym/portage/package/ebuild/doebuild.py
Simple merge

diff --cc pym/portage/util/__init__.py
index 257da6523c7b4ac77b2164017954ced726c8b259,58501dca6c2e3bb09c70ba8aacc7532190ed91b2..3fdc5cf6302d00b6dbec0f84761441ac30ec5c2e
--- 1/pym/portage/util/__init__.py
--- 2/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@@ -1600,22 -1614,10 +1615,22 @@@ def getlibpaths(root, env=None)
        """ Return a list of paths that are used for library lookups """
        if env is None:
                env = os.environ
 +
 +      # PREFIX HACK: LD_LIBRARY_PATH isn't portable, and considered
 +      # harmfull, so better not use it.  We don't need any host OS lib
 +      # paths either, so do Prefix case.
 +      if EPREFIX != '':
 +              rval = []
 +              rval.append(EPREFIX + "/usr/lib")
 +              rval.append(EPREFIX + "/lib")
 +              # we don't know the CHOST here, so it's a bit hard to guess
 +              # where GCC's and ld's libs are.  Though, GCC's libs should be
 +              # in lib and usr/lib, binutils' libs rarely used
 +      else:
        # the following is based on the information from ld.so(8)
 -      rval = env.get("LD_LIBRARY_PATH", "").split(":")
 -      rval.extend(read_ld_so_conf(os.path.join(root, "etc", "ld.so.conf")))
 -      rval.append("/usr/lib")
 -      rval.append("/lib")
 +              rval = env.get("LD_LIBRARY_PATH", "").split(":")
-               rval.extend(grabfile(os.path.join(root, "etc", "ld.so.conf")))
++              rval.extend(read_ld_so_conf(os.path.join(root, "etc", "ld.so.conf")))
 +              rval.append("/usr/lib")
 +              rval.append("/lib")
  
        return [normalize_path(x) for x in rval if x]

diff --cc pym/portage/util/env_update.py
Simple merge