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

Conflicts:
	bin/ebuild.sh
	pym/portage/dbapi/bintree.py

diff --cc bin/ebuild.sh
index 3c9c63e1631c2f8664ad68328683e4f6126b0112,8c301d8c9f7f14c9d38484c558f70c5924f7ca18..a0b7b154e0f1d6fdac786685ee274687b872b5f9
--- 1/bin/ebuild.sh
--- 2/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -2128,18 -2115,20 +2128,22 @@@ if ! hasq "$EBUILD_PHASE" clean cleanr
                                        ;;
                        esac
  
 -                      PATH=$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
 +                      #PATH=$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
 +                      # PREFIX: same notes apply as at the top of this file
 +                      PATH="$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}${DEFAULT_PATH}${ROOTPATH:+:}$ROOTPATH${EXTRA_PATH:+:}${EXTRA_PATH}"
                        unset _ebuild_helpers_path
  
+                       # Use default ABI libdir in accordance with bug #355283.
+                       x=LIBDIR_${DEFAULT_ABI}
+                       [[ -n $DEFAULT_ABI && -n ${!x} ]] && x=${!x} || x=lib
+ 
                        if hasq distcc $FEATURES ; then
-                               PATH="${EPREFIX}/usr/lib/distcc/bin:$PATH"
 -                              PATH="/usr/$x/distcc/bin:$PATH"
++                              PATH="${EPREFIX}/usr/$x/distcc/bin:$PATH"
                                [[ -n $DISTCC_LOG ]] && addwrite "${DISTCC_LOG%/*}"
                        fi
  
                        if hasq ccache $FEATURES ; then
-                               PATH="${EPREFIX}/usr/lib/ccache/bin:$PATH"
 -                              PATH="/usr/$x/ccache/bin:$PATH"
++                              PATH="${EPREFIX}/usr/$x/ccache/bin:$PATH"
  
                                if [[ -n $CCACHE_DIR ]] ; then
                                        addread "$CCACHE_DIR"

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/portage/__init__.py
Simple merge

diff --cc pym/portage/dbapi/bintree.py
index fb52544fcb7d41654b36510444f2724a3e6585a0,ebec11fdd4359e27684fd063d517d39f868945d5..c18dc17b180e73e03d5de2b826022cd498d7db16
--- 1/pym/portage/dbapi/bintree.py
--- 2/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@@ -250,8 -249,8 +250,8 @@@ class binarytree(object)
                        self._pkgindex_header_keys = set([
                                "ACCEPT_KEYWORDS", "ACCEPT_LICENSE",
                                "ACCEPT_PROPERTIES", "CBUILD",
-                               "CHOST", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES",
+                               "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES",
 -                              "GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE"])
 +                              "GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EPREFIX"])
                        self._pkgindex_default_pkg_data = {
                                "BUILD_TIME"         : "",
                                "DEPEND"  : "",
@@@ -270,10 -269,24 +270,24 @@@
                                "DEFINED_PHASES" : "",
                                "REQUIRED_USE" : ""
                        }
 -                      self._pkgindex_inherited_keys = ["CHOST", "repository"]
 +                      self._pkgindex_inherited_keys = ["CHOST", "repository", "EPREFIX"]
+ 
+                       # Populate the header with appropriate defaults.
                        self._pkgindex_default_header_data = {
-                               "repository":""
+                               "CHOST"        : self.settings.get("CHOST", ""),
+                               "repository"   : "",
                        }
+ 
+                       # It is especially important to populate keys like
+                       # "repository" that save space when entries can
+                       # inherit them from the header. If an existing
+                       # pkgindex header already defines these keys, then
+                       # they will appropriately override our defaults.
+                       main_repo = self.settings.repositories.mainRepo()
+                       if main_repo is not None and not main_repo.missing_repo_name:
+                               self._pkgindex_default_header_data["repository"] = \
+                                       main_repo.name
+ 
                        self._pkgindex_translated_keys = (
                                ("DESCRIPTION"   ,   "DESC"),
                                ("repository"    ,   "REPO"),

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

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