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

diff --cc man/emerge.1
Simple merge

diff --cc pym/_emerge/EbuildBuild.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/dbapi/vartree.py
Simple merge

diff --cc pym/portage/util/_dyn_libs/LinkageMapELF.py
index abd0db97eafdeeb8c478450f1048ef919795dd5e,52670d98dd9552cd6bb6161c07860fb970c1e62d..259f45b42142ca13dd8388449f8fda4a9395057c
--- 1/pym/portage/util/_dyn_libs/LinkageMapELF.py
--- 2/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@@ -220,9 -232,9 +233,9 @@@ class LinkageMapELF(object)
                                        # already represented via the preserve_paths
                                        # parameter.
                                        continue
-                               plibs.update(items)
+                               plibs.update((x, cpv) for x in items)
                if plibs:
 -                      args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
 +                      args = [EPREFIX + "/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
                        args.extend(os.path.join(root, x.lstrip("." + os.sep)) \
                                for x in plibs)
                        try: