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

Conflicts:
	bin/ebuild-helpers/prepinfo
	pym/portage/const.py

diff --cc bin/ebuild-helpers/prepinfo
index 2200b89b2bb93bc231f70142f0388acfaab123bf,cbbba3ed0b4ac56deca56122581d5e726f226b64..1349e459e347dd1eba1f3cba770f56d2210208cc
--- 1/bin/ebuild-helpers/prepinfo
--- 2/bin/ebuild-helpers/prepinfo
+++ b/bin/ebuild-helpers/prepinfo
@@@ -23,7 -23,10 +23,10 @@@ if [[ ! -d ${ED}${infodir} ]] ; the
        fi
  fi
  
 -find "${D}${infodir}" -type d -print0 | while read -d $'\0' x ; do
 +find "${ED}${infodir}" -type d -print0 | while read -d $'\0' x ; do
+       for f in "${x}"/.keepinfodir*; do
+               [[ -e ${f} ]] && continue 2
+       done
        rm -f "${x}"/dir{,.info}{,.gz,.bz2}
  done
  

diff --cc man/emerge.1
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/const.py
index a74e8bbaff3bf547831cf57ccf8631dd8aac2f36,e56ebecbc0d3355d3e74bb0f496c40fcf09971b4..5d35b7b117dc3453bd7a88e974448f33d71807e6
--- 1/pym/portage/const.py
--- 2/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -63,10 -50,13 +63,13 @@@ WORLD_SETS_FILE          = PRIVATE_PAT
  CONFIG_MEMORY_FILE       = PRIVATE_PATH + "/config"
  NEWS_LIB_PATH            = "var/lib/gentoo"
  
- # these variables are not used with target_root or config_root
+ # these variables get EPREFIX prepended automagically when they are
+ # translated into their lowercase variants
  DEPCACHE_PATH            = "/var/cache/edb/dep"
  GLOBAL_CONFIG_PATH       = "/usr/share/portage/config"
 -PORTAGE_BASE_PATH        = os.path.join(os.sep, os.sep.join(__file__.split(os.sep)[:-3]))
+ 
+ # these variables are not used with target_root or config_root
 +PORTAGE_BASE_PATH        = PORTAGE_BASE
  PORTAGE_BIN_PATH         = PORTAGE_BASE_PATH + "/bin"
  PORTAGE_PYM_PATH         = PORTAGE_BASE_PATH + "/pym"
  LOCALE_DATA_PATH         = PORTAGE_BASE_PATH + "/locale"  # FIXME: not used

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