From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 19 Jul 2012 16:25:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7b78626de394386472d9945afcbd236e2769929;p=portage.git

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

d7b78626de394386472d9945afcbd236e2769929
diff --cc cnf/make.globals
index 7e6132575,ada91f8f0..dc3eac966
--- a/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 pym/portage/package/ebuild/fetch.py
index 7ac25c496,60ed04da2..63c792ab2
--- a/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