diff -Nuarp trunk.orig/pym/portage/const.py trunk/pym/portage/const.py
--- trunk.orig/pym/portage/const.py	2010-02-01 04:59:27.000000000 +0000
+++ trunk/pym/portage/const.py	2010-02-01 04:14:00.000000000 +0000
@@ -86,10 +86,10 @@ EAPI                     = 3
 
 HASHING_BLOCKSIZE        = 32768
 MANIFEST1_HASH_FUNCTIONS = ("MD5", "SHA256", "RMD160")
-MANIFEST2_HASH_FUNCTIONS = ("SHA1", "SHA256", "RMD160")
+MANIFEST2_HASH_FUNCTIONS = ("SHA256", "SHA512", "WHIRLPOOL")
 
 MANIFEST1_REQUIRED_HASH  = "MD5"
-MANIFEST2_REQUIRED_HASH  = "SHA1"
+MANIFEST2_REQUIRED_HASH  = "SHA256" # Change to WHIRLPOOL after 2010/09/01
 
 MANIFEST2_IDENTIFIERS    = ("AUX", "MISC", "DIST", "EBUILD")
 # ===========================================================================