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

diff --cc bin/misc-functions.sh
index c51652042ac6a807044fe9b26794db6c4b258568,a54ce2b793e50fc3dc9f63d0037d5a1960b97a4d..cf72deef9b09a1009c83fd9dae8339ed12211891
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh

diff --cc bin/portageq
Simple merge

diff --cc bin/repoman
Simple merge

diff --cc man/emerge.1
Simple merge

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

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

diff --cc pym/portage/package/ebuild/doebuild.py
index 11330272755a79dc238d5adb2807e785a93c24ae,9939e9cc2db7b9a1361835fd8d49597e726213c4..62750e6aa607f07ec440882153ede3fece4c1e28
--- 1/pym/portage/package/ebuild/doebuild.py
--- 2/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@@ -1433,10 -1393,10 +1433,11 @@@ _post_phase_cmds = 
  
        "install" : [
                "install_qa_check",
-               "install_symlink_html_docs"],
+               "install_symlink_html_docs",
+               "install_hooks"],
  
        "preinst" : [
 +              "preinst_aix",
                "preinst_sfperms",
                "preinst_selinux_labels",
                "preinst_suid_scan",

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