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

diff --cc bin/repoman
Simple merge

diff --cc cnf/make.globals
index ae98d168e2a8e953e4a1d6f85615d3e6365035c4,fcd0b41da034f921fd59b78f39c774d79e9c64e1..7aaec5eac7899b2afc043e486ccac12f53076e34
--- 1/cnf/make.globals
--- 2/cnf/make.globals
+++ b/cnf/make.globals
@@@ -101,9 -101,10 +101,12 @@@ PORTAGE_RSYNC_OPTS="--recursive --link
  # message should be produced.
  PORTAGE_SYNC_STALE="30"
  
+ # Executed before emerge exit if FEATURES=clean-logs is enabled.
+ PORT_LOGDIR_CLEAN="find \"\${PORT_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete"
+ 
  # Minimal CONFIG_PROTECT
 +# NOTE: in Prefix, these are NOT prefixed on purpose, because the
 +# profiles define them too
  CONFIG_PROTECT="/etc"
  CONFIG_PROTECT_MASK="/etc/env.d"
  

diff --cc man/make.conf.5
Simple merge

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

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

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

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

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

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

diff --cc pym/portage/util/env_update.py
Simple merge