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

diff --cc bin/ebuild-helpers/prepstrip
Simple merge

diff --cc bin/emaint
Simple merge

diff --cc bin/etc-update
Simple merge

diff --cc bin/portageq
Simple merge

diff --cc bin/quickpkg
Simple merge

diff --cc cnf/make.globals
index 7e61325751d1370ae275d9782ad2a8751adffd59,ada91f8f0181510b6d2a698a60d376bfc2d5bf63..dc3eac96611d26490eef41e8a8f6ce9558fec70a
--- 1/cnf/make.globals
--- 2/cnf/make.globals
+++ b/cnf/make.globals
@@@ -146,12 -123,12 +146,12 @@@ PORTAGE_WORKDIR_MODE="0700
  PORTAGE_ELOG_CLASSES="log warn error"
  PORTAGE_ELOG_SYSTEM="save_summary echo"
  
 -PORTAGE_ELOG_MAILURI="root"
 +PORTAGE_ELOG_MAILURI="@rootuser@"
  PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
 -PORTAGE_ELOG_MAILFROM="portage@localhost"
 +PORTAGE_ELOG_MAILFROM="@portageuser@@localhost"
  
  # Signing command used by repoman
- PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA512 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
+ PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA256 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
  
  #            *****************************
  #            **  DO NOT EDIT THIS FILE  **

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/dbapi/bintree.py
Simple merge

diff --cc pym/portage/dbapi/vartree.py
Simple merge

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

diff --cc pym/portage/package/ebuild/fetch.py
index 7ac25c496c8daa0987e6513fd5ea29ee0bf63633,60ed04da28c119b728ff4e92025f7a945695bf65..63c792ab2dbecc308ae5409d11cf9b76083f00df
--- 1/pym/portage/package/ebuild/fetch.py
--- 2/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@@ -25,10 -25,10 +25,11 @@@ portage.proxy.lazyimport.lazyimport(glo
  
  from portage import OrderedDict, os, selinux, shutil, _encodings, \
        _shell_quote, _unicode_encode
- from portage.checksum import hashfunc_map, perform_md5, verify_all
+ from portage.checksum import (hashfunc_map, perform_md5, verify_all,
+       _filter_unaccelarated_hashes)
  from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, \
        GLOBAL_CONFIG_PATH
 +from portage.const import rootgid
  from portage.data import portage_gid, portage_uid, secpass, userpriv_groups
  from portage.exception import FileNotFound, OperationNotPermitted, \
        PortageException, TryAgain

diff --cc pym/portage/tests/runTests
Simple merge

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