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

Conflicts:
	bin/ebuild.sh
	bin/misc-functions.sh
	bin/repoman
	pym/_emerge/main.py

diff --cc bin/ebuild-ipc.py
Simple merge

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/isolated-functions.sh
Simple merge

diff --cc bin/misc-functions.sh
index 0f03fa77df8028660fa8c7df10cd0fbba5eda792,d8242b7c18ba26a88576e1a5ae081d6c0319edee..0fd8288cc2dceabc2da4d5cd9a6f07db95ab6f8a
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -156,6 -154,17 +156,17 @@@ install_qa_check() 
        ecompressdir --dequeue
        ecompress --dequeue
  
 -              [[ -d $D/$x ]] && f+="  $x\n"
+       f=
+       for x in etc/app-defaults usr/man usr/info usr/X11R6 usr/doc usr/locale ; do
++              [[ -d $ED/$x ]] && f+="  $x\n"
+       done
+ 
+       if [[ -n $f ]] ; then
+               eqawarn "QA Notice: This ebuild installs into the following deprecated directories:"
+               eqawarn
+               eqawarn "$f"
+       fi
+ 
        # Now we look for all world writable files.
        local i
        for i in $(find "${D}/" -type f -perm -2); do
@@@ -307,12 -282,10 +318,12 @@@ install_qa_check_elf() 
                fi
  
                # Check for files built without respecting LDFLAGS
-               if [[ "${LDFLAGS}" == *--hash-style=gnu* ]] && [[ "${PN}" != *-bin ]] ; then
+               if [[ "${LDFLAGS}" == *,--hash-style=gnu* ]] && [[ "${PN}" != *-bin ]] ; then
                        qa_var="QA_DT_HASH_${ARCH/-/_}"
                        eval "[[ -n \${!qa_var} ]] && QA_DT_HASH=(\"\${${qa_var}[@]}\")"
 -                      f=$(scanelf -qyRF '%k %p' -k .hash "${D}" | sed -e "s:\.hash ::")
 +                      # use ED here, for the rest of the checks of scanelf's
 +                      # output, scanelf is silent on non-existing ED
 +                      f=$(scanelf -qyRF '%k %p' -k .hash "${ED}" | sed -e "s:\.hash ::")
                        if [[ -n ${f} ]] ; then
                                echo "${f}" > "${T}"/scanelf-ignored-LDFLAGS.log
                                if [ "${QA_STRICT_DT_HASH-unset}" == unset ] ; then
@@@ -561,8 -528,8 +572,8 @@@ install_qa_check_misc() 
        fi
  
        # Verify that the libtool files don't contain bogus $D entries.
-       local abort=no gentoo_bug=no
+       local abort=no gentoo_bug=no always_overflow=no
 -      for a in "${D}"usr/lib*/*.la ; do
 +      for a in "${ED}"usr/lib*/*.la ; do
                s=${a##*/}
                if grep -qs "${D}" "${a}" ; then
                        vecho -ne '\n'

diff --cc bin/repoman
index 361ea46fca785f45871e9aa89b5eb7f0441bd771,1f7b21bce165eb468a4cff50c4339b39d2e8dbaf..5212f5311a3b78ca6cf234f364de517688f214a9
--- 1/bin/repoman
--- 2/bin/repoman
+++ b/bin/repoman
@@@ -1823,8 -1821,8 +1826,9 @@@ for x in scanlist
                                                config_profile_path=prof.abs_path,
                                                config_incrementals=repoman_incrementals,
                                                local_config=False,
 -                                              env=env)
+                                               _unmatched_removal=options.unmatched_removal,
 +                                              env=env,
 +                                              _eprefix=EPREFIX)
                                        if options.without_mask:
                                                dep_settings._mask_manager = \
                                                        copy.deepcopy(dep_settings._mask_manager)

diff --cc pym/_emerge/Binpkg.py
index 5f190df593af8c5084eb7d9ca18c3b4416f8089a,06f0fd28c8ad05b3ccc4aceb5b78bf655f51a495..4e8450c60d532953e4fff25136b18d08ff545e52
--- 1/pym/_emerge/Binpkg.py
--- 2/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@@ -49,10 -41,7 +49,8 @@@ class Binpkg(CompositeTask)
  
                dir_path = os.path.join(settings["PORTAGE_TMPDIR"],
                        "portage", pkg.category, pkg.pf)
-               self._build_dir = EbuildBuildDir(dir_path=dir_path,
-                       pkg=pkg, settings=settings)
                self._image_dir = os.path.join(dir_path, "image")
 +              self._work_dir = os.path.join(dir_path, "work")
                self._infloc = os.path.join(dir_path, "build-info")
                self._ebuild_path = os.path.join(self._infloc, pkg.pf + ".ebuild")
                settings["EBUILD"] = self._ebuild_path

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

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

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

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

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

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

diff --cc pym/portage/_sets/profiles.py
Simple merge

diff --cc pym/portage/dbapi/vartree.py
Simple merge

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

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

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

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

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