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

diff --cc bin/repoman
index 1f4175bd8b8e0f68aece502f7f1cd6844e76811d,ad1e68830465c892d73f4a97542540e76ec4f78a..56b2b7ae7f29936a4e84b2c4168c8435d7d3a885
--- 1/bin/repoman
--- 2/bin/repoman
+++ b/bin/repoman
@@@ -75,10 -73,9 +75,10 @@@ from portage.process import find_binary
  from portage.output import bold, create_color_func, \
        green, nocolor, red
  from portage.output import ConsoleStyleFile, StyleWriter
- from portage.util import cmp_sort_key, writemsg_level, writemsg_stdout
+ from portage.util import cmp_sort_key, writemsg_level
  from portage.package.ebuild.digestgen import digestgen
  from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
 +from portage.const import EPREFIX
  
  if sys.hexversion >= 0x3000000:
        basestring = str

diff --cc man/emerge.1
Simple merge

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

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