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

Conflicts:
	bin/misc-functions.sh
	mkrelease.sh

diff --cc bin/ebuild.sh
Simple merge

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

diff --cc bin/misc-functions.sh
index 11c26bf64b272194e2a0d8690c2fccaf158551cd,d8754cd3aef15edf46df562a06b1db30906747ba..73da1696a90142e8f907904132964a53d71719cd
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -586,40 -542,11 +586,11 @@@ install_qa_check_misc() 
                fi
        fi
  
-       f=$(find "${ED}" -name '*.py[co]' | sed "s:${D}:/:")
-       if [[ -n ${f} ]] ; then
-               vecho -ne '\a\n'
-               eqawarn "QA Notice: Byte-compiled Python modules have been found. python_mod_optimize()"
-               eqawarn "           and python_mod_cleanup() functions from python.eclass should be used"
-               eqawarn "           to handle byte-compiled Python modules."
-               eqawarn "${f}"
-               vecho -ne '\a\n'
-       fi
- 
-       f=$(find "${D}"usr/lib*/python*/site-packages -name '*.a' 2>/dev/null | sed "s:${D}:/:")
-       if [[ -n ${f} ]] ; then
-               vecho -ne '\a\n'
-               eqawarn "QA Notice: Static libraries have been found in Python site-packages"
-               eqawarn "           directories. Build system should be modified to not generate"
-               eqawarn "           these files and object files generated only for these files."
-               eqawarn "${f}"
-               vecho -ne '\a\n'
-       fi
- 
-       f=$(find "${D}"usr/lib*/python*/site-packages -name '*.la' 2>/dev/null | sed "s:${D}:/:")
-       if [[ -n ${f} ]] ; then
-               vecho -ne '\a\n'
-               eqawarn "QA Notice: Libtool libraries have been found in Python site-packages"
-               eqawarn "           directories. These files should not be installed."
-               eqawarn "${f}"
-               vecho -ne '\a\n'
-       fi
- 
        # Portage regenerates this on the installed system.
 -      rm -f "${D}"/usr/share/info/dir{,.gz,.bz2}
 +      rm -f "${ED}"/usr/share/info/dir{,.gz,.bz2}
  
        if hasq multilib-strict ${FEATURES} && \
 -         [[ -x /usr/bin/file && -x /usr/bin/find ]] && \
 +         [[ -x ${EPREFIX}/usr/bin/file && -x ${EPREFIX}/usr/bin/find ]] && \
           [[ -n ${MULTILIB_STRICT_DIRS} && -n ${MULTILIB_STRICT_DENY} ]]
        then
                local abort=no dir file firstrun=yes

diff --cc bin/repoman
Simple merge

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

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

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

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

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

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

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

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

diff --cc pym/portage/output.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/util/__init__.py
Simple merge