Delete older ebuilds.

14 files changed, 0 insertions, 706 deletions

diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 57f1f73f3c9e..8b4ea992ac87 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,20 +1,6 @@
-AUX pycrypto-2.0.1-2.6_hashlib.patch 2814 RMD160 e7279be6ed13476eb3a124c765557ccae11c54b7 SHA1 b1f1307d4b428eb8da0283cc8c87096cef08e746 SHA256 cfbebb94fcc932e9dd6246f3285f6f6654f60a0b88594fd9c7c598a62c02946e
-AUX pycrypto-2.0.1-CVE-2009-0544.patch 571 RMD160 c5d62d442b24416a9bee9d9eb11820446fc3e792 SHA1 949fe75044260673b481bc9f8ac099599b024ece SHA256 0e3586c984c3e36969a02cc47ed41dc26a734f8814ceb1d60fed6922647793c2
-AUX pycrypto-2.0.1-bindist.patch 1561 RMD160 b0064385698a1cb9ed741b2e68ed682b4d395a61 SHA1 e3169e49281a1fca0ef5154bdb3b48ccc50e809d SHA256 c95a6b3628d5472f749004c5d9a95a812d1b9c1fc7bfa5a538fa64210a021d9a
-AUX pycrypto-2.0.1-caseimport.patch 2102 RMD160 6e21928088f0a5a48d6cf94641224a7311e9a76f SHA1 e188d392713158716265c525077a241fadda2d8f SHA256 4bd0eb6853dc62ea89f5e9c5921a12c0224286bc79b4976d2525568a78848174
-AUX pycrypto-2.0.1-gmp.patch 644 RMD160 33c7f7e435a1b9e76729d2083fa203a2ec040d83 SHA1 f434fea5dfacf9d95e96ba8adea2a5ce4491594f SHA256 c20f8d91ee74c4c0347957386c60b38a510c368e3778ae80f015af68c963d29d
-AUX pycrypto-2.0.1-sancho-package-rename.patch 2688 RMD160 6a827488245c2627801908b009e2a08adb86781f SHA1 4540d0a7fe654653a0cb42d333c644b4c339b61c SHA256 5b8827719f411ff48d8107ef6f0893cbdfa038875b2e16391e4a75b88eea6bad
-AUX pycrypto-2.0.1-sha256-2.patch 2689 RMD160 a1bee09ec9595cd9631ef8b3a6f323258374ea9b SHA1 2abda23ed2584db3307235749a5d1286610ced40 SHA256 0c270f90abb0d4ae32e7fe3b4b6d100596ef9ab14b43ace75cac4334bea149eb
-AUX pycrypto-2.0.1-sha256.patch 912 RMD160 9a2557cdaf4f9922b3ace23d7eced46f5785f0de SHA1 eafcd5a6e25c4f4d8411612a9f18f8e90e1aca18 SHA256 3fef960453dc28b2d17623c85338d49bc74f9a5e73bd31bceb77880b30c4779f
-AUX pycrypto-2.0.1-uint32.patch 1078 RMD160 40f20f4d3a89b8927eaee415418e1d9f2b2be33b SHA1 0214ba9f2a592e6ce78cf6dd8e5d72f9dd44ac0d SHA256 b8cb928cbf1713eff06c6899cb773c9a02f28e85de02e7d6f45ed1be413b47dd
 AUX pycrypto-2.1.0-gmp.patch 1560 RMD160 699354d2d75b5f026066ca014a9acc820db7be59 SHA1 62b7ed930f4e6f508a9a063786dceff8195c4ca3 SHA256 28b77c4c99510dbcb719a7f22e9c5a36928ff11a0ee1df248947663c9232d40d
-DIST pycrypto-2.0.1.tar.gz 154292 RMD160 5ce938a24f77f414e42680c17ef9b6dc8de94a2e SHA1 c77cdefdfb06e4749690013a9a9e1600ab14e26f SHA256 b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea
 DIST pycrypto-2.1.0.tar.gz 265388 RMD160 57589935b0aad4bee9008a840fda9b12c8e8c0f5 SHA1 b4baa1b5f349a7e5c497f4c7b4070c3f630519f8 SHA256 253e1c22ea0249f0429df4f7e2eb973b119c83b146c0f421298f5e8e6822d8a2
 DIST pycrypto-2.1.0b1.tar.gz 265344 RMD160 3312d4c667986b51d0936f2223b0cf31f300ef77 SHA1 099aa87f99b13577bf6f49b226c3e3e23c61bcdf SHA256 7be4be8262ed8443700eed71e498e9b8d8a5ac17f3a00abc112c81753ffec9ba
-EBUILD pycrypto-2.0.1-r5.ebuild 1501 RMD160 23fcf75215bacac43de0e254d216768a14aca7aa SHA1 882cfa951483f6c304984c75f541ef8488906fda SHA256 e1cfce80ae28225522ba830ed9062123a71fe8279f31ce9096d994f34a55d3b8
-EBUILD pycrypto-2.0.1-r6.ebuild 1532 RMD160 b96b870eceb138401f61bba45ef8021366da2e1c SHA1 d63f0abf22a9d3f59332e73a33fa3e1b03e7e5dc SHA256 d9fe3eac30683401eae64384b52653926c57c57945ad12ca59aba516e8fc5187
-EBUILD pycrypto-2.0.1-r7.ebuild 1631 RMD160 6224a66bc0ee6c1360d42a969a95a04a9dfa11db SHA1 734a4e4a2ff3fe6580a119a25203e00f20ee25fb SHA256 653afdf8a02a2ab4bb3fd01fb2249740018883c3a4ea93472caf742450b28669
-EBUILD pycrypto-2.0.1-r8.ebuild 2034 RMD160 e2c7dae6f1349afb28e3b12b67a92f78007563c2 SHA1 1ad14ae47bd55d65e5288de535e8824a537c3edf SHA256 e4b5d52f051868a98cc4dbdb03e066c1baa2deeb781e3ce6c9570394e18a26fa
 EBUILD pycrypto-2.1.0.ebuild 1844 RMD160 4a5490cf6d2745ed6821d780d25eda0d7e5b0830 SHA1 15400b4ccdeb49fdf0bb920e9d334bad6a3ef132 SHA256 05e6ce697558fd790b9e5d95341ff3bcd0402630b9c8494f617fd711c2d5bd5f
 EBUILD pycrypto-2.1.0_beta1.ebuild 2130 RMD160 3bb7792c4ec12da924486439348cb70f4b0a48fb SHA1 7f9e2c8aff6b3a238302e2a61c4428ed10443e4b SHA256 52099d1757e044aa9e8cb67ff549aa842b0e86dd9e3b7ab6a29da005d9b2407b
 MISC ChangeLog 11745 RMD160 34dfc13e08aba9fb1f32686fe45a42877578e170 SHA1 a9595292e735b5fe7f43bd343d5fa50f183d0b73 SHA256 66bb5d194d92db4250f4000001f12c7c7f4f9c7193d0be59729c7eb7241ab306
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-2.6_hashlib.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-2.6_hashlib.patch
deleted file mode 100644
index 9ee7e17eb0f6..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-2.6_hashlib.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-#From: Dwayne C. Litzenberger <dlitz@dlitz.net>
-#Date: Sun, 14 Sep 2008 19:30:59 +0000 (-0400)
-#Subject: Python 2.6 compatibility: When possible, use hashlib instead of the deprecated 'md5... 
-#X-Git-Url: http://gitweb.pycrypto.org/?p=crypto%2Fpycrypto-2.x.git;a=commitdiff_plain;h=d2311689910240e425741a546576129f4c9735e2
-#
-#Python 2.6 compatibility: When possible, use hashlib instead of the deprecated 'md5' and 'sha' modules
-#---
-#
-#diff --git a/Hash/MD5.py b/Hash/MD5.py
-#index bdbc62a..e79a85f 100644
---- a/Hash/MD5.py
-+++ b/Hash/MD5.py
-@@ -3,11 +3,21 @@
- 
- __revision__ = "$Id: pycrypto-2.0.1-2.6_hashlib.patch,v 1.1 2009/03/01 08:24:02 neurogeek Exp $"
- 
--from md5 import *
-+__all__ = ['new', 'digest_size']
- 
--import md5
--if hasattr(md5, 'digestsize'):
--    digest_size = digestsize
--    del digestsize
--del md5
-+try:
-+    # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
-+    import hashlib
-+    def new(data=""):
-+        return hashlib.md5(data)
-+    digest_size = new().digest_size
-+
-+except ImportError:
-+    from md5 import *
-+
-+    import md5
-+    if hasattr(md5, 'digestsize'):
-+        digest_size = digestsize
-+        del digestsize
-+    del md5
- 
-diff --git a/Hash/SHA.py b/Hash/SHA.py
-index dc05502..f4128ec 100644
---- a/Hash/SHA.py
-+++ b/Hash/SHA.py
-@@ -3,9 +3,19 @@
- 
- __revision__ = "$Id: pycrypto-2.0.1-2.6_hashlib.patch,v 1.1 2009/03/01 08:24:02 neurogeek Exp $"
- 
--from sha import *
--import sha
--if hasattr(sha, 'digestsize'):
--    digest_size = digestsize
--    del digestsize
--del sha
-+__all__ = ['new', 'digest_size']
-+
-+try:
-+    # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
-+    import hashlib
-+    def new(data=""):
-+        return hashlib.sha1(data)
-+    digest_size = new().digest_size
-+
-+except ImportError:
-+    from sha import *
-+    import sha
-+    if hasattr(sha, 'digestsize'):
-+        digest_size = digestsize
-+        del digestsize
-+    del sha
-#From: Dwayne C. Litzenberger <dlitz@dlitz.net>
-#Date: Sun, 14 Sep 2008 21:38:52 +0000 (-0400)
-#Subject: Python 2.6 compatibility: Use Hash.MD5 instead of Python "md5" module in the HMAC... 
-#X-Git-Url: http://gitweb.pycrypto.org/?p=crypto%2Fpycrypto-2.0.x.git;a=commitdiff_plain;h=84b793416b52311643bfd456a4544444afbfb5da
-#
-#Python 2.6 compatibility: Use Hash.MD5 instead of Python "md5" module in the HMAC module.
-#---
-
-#diff --git a/Hash/HMAC.py b/Hash/HMAC.py
-#index b8a9229..6ed9556 100644
---- a/Hash/HMAC.py
-+++ b/Hash/HMAC.py
-@@ -33,8 +33,8 @@ class HMAC:
-         digestmod: A module supporting PEP 247. Defaults to the md5 module.
-         """
-         if digestmod == None:
--            import md5
--            digestmod = md5
-+            import MD5
-+            digestmod = MD5
- 
-         self.digestmod = digestmod
-         self.outer = digestmod.new()
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-CVE-2009-0544.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-CVE-2009-0544.patch
deleted file mode 100644
index 9a4734cf608d..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-CVE-2009-0544.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/ARC2.c.orig	2009-03-03 23:53:08.000000000 -0430
-+++ src/ARC2.c	2009-03-03 23:53:08.000000000 -0430
-@@ -11,6 +11,7 @@
-  */
- 
- #include <string.h>  
-+#include "Python.h"
- 
- #define MODULE_NAME ARC2
- #define BLOCK_SIZE 8
-@@ -146,6 +147,12 @@
- 	   We'll hardwire it to 1024. */
- #define bits 1024
- 
-+    if ((U32)keylength > sizeof(self->xkey)) {
-+       PyErr_SetString(PyExc_ValueError,
-+               "ARC2 key length must be less than 128 bytes");
-+       return;
-+    }
-+
- 	memcpy(self->xkey, key, keylength);
-   
- 	/* Phase 1: Expand input key to 128 bytes */
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-bindist.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-bindist.patch
deleted file mode 100644
index d3b40d464fff..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-bindist.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- pycrypto/setup.py
-+++ pycrypto/setup.py
-@@ -94,13 +94,6 @@
-             Extension("Crypto.Cipher.DES3",
-                       include_dirs=['src/'],
-                       sources=["src/DES3.c"]),
--            Extension("Crypto.Cipher.IDEA",
--                      include_dirs=['src/'],
--                      sources=["src/IDEA.c"],
--                      libraries=HTONS_LIBS),
--            Extension("Crypto.Cipher.RC5",
--                      include_dirs=['src/'],
--                      sources=["src/RC5.c"]),
- 
-             # Stream ciphers
-             Extension("Crypto.Cipher.ARC4",
-@@ -111,6 +104,17 @@
-                       sources=["src/XOR.c"]),
-             ]
- 
-+        if 0: #not os.environ.has_key("BINDIST") or os.environ["BINDIST"]!="1":
-+            self.extensions += [
-+                Extension("Crypto.Cipher.IDEA",
-+                          include_dirs=['src/'],
-+                          sources=["src/IDEA.c"],
-+                          libraries=HTONS_LIBS),
-+                Extension("Crypto.Cipher.RC5",
-+                          include_dirs=['src/'],
-+                          sources=["src/RC5.c"]),
-+                ]
-+
-         # Detect which modules should be compiled
-         self.detect_modules()
-         build_ext.build_extensions(self)
---- pycrypto/Cipher/__init__.py
-+++ pycrypto/Cipher/__init__.py
-@@ -24,7 +24,7 @@
- """
- 
- __all__ = ['AES', 'ARC2', 'ARC4',
--           'Blowfish', 'CAST', 'DES', 'DES3', 'IDEA', 'RC5',
-+           'Blowfish', 'CAST', 'DES', 'DES3',
-            'XOR'
-            ]
- 
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-caseimport.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-caseimport.patch
deleted file mode 100644
index ad4331ff05d2..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-caseimport.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-http://sourceforge.net/tracker/index.php?func=detail&aid=1849383&group_id=20937&atid=320937
-
---- pycrypto-2.0.1/Hash/MD5.py
-+++ pycrypto-2.0.1/Hash/MD5.py
-@@ -13,11 +13,14 @@
-     digest_size = new().digest_size
- 
- except ImportError:
--    from md5 import *
-+    # cannot import 'md5' from within 'MD5.py',
-+    # because on case insensitive filesystems it will find myself.
-+    # thus need to do the actual 'import md5' from somewhere else.
-+    from extmd5 import *
- 
--    import md5
--    if hasattr(md5, 'digestsize'):
-+    import extmd5
-+    if hasattr(extmd5, 'digestsize'):
-         digest_size = digestsize
-         del digestsize
--    del md5
-+    del extmd5
- 
---- pycrypto-2.0.1/Hash/SHA.py
-+++ pycrypto-2.0.1/Hash/SHA.py
-@@ -13,9 +13,12 @@
-     digest_size = new().digest_size
- 
- except ImportError:
--    from sha import *
--    import sha
--    if hasattr(sha, 'digestsize'):
-+    # cannot import 'sha' from within 'SHA.py',
-+    # because on case insensitive filesystems it will find myself.
-+    # thus need to do the actual 'import sha' from somewhere else.
-+    from extsha import *
-+    import extsha
-+    if hasattr(extsha, 'digestsize'):
-         digest_size = digestsize
-         del digestsize
--    del sha
-+    del extsha
---- pycrypto-2.0.1/Hash/extmd5/__init__.py
-+++ pycrypto-2.0.1/Hash/extmd5/__init__.py
-@@ -0,0 +1,2 @@
-+# see ../MD5.py for why this is done
-+from md5 import *
---- pycrypto-2.0.1/Hash/extsha/__init__.py
-+++ pycrypto-2.0.1/Hash/extsha/__init__.py
-@@ -0,0 +1,2 @@
-+# see ../SHA.py for why this is done
-+from sha import *
---- pycrypto-2.0.1/setup.py
-+++ pycrypto-2.0.1/setup.py
-@@ -132,7 +132,7 @@
-       'url':"http://www.amk.ca/python/code/crypto",
- 
-       'cmdclass' : {'build_ext':PCTBuildExt},
--      'packages' : ["Crypto", "Crypto.Hash", "Crypto.Cipher", "Crypto.Util",
-+      'packages' : ["Crypto", "Crypto.Hash", "Crypto.Hash.extmd5", "Crypto.Hash.extsha", "Crypto.Cipher", "Crypto.Util",
-                   "Crypto.Protocol", "Crypto.PublicKey"],
-       'package_dir' : { "Crypto":"." },
-       # One module is defined here, because build_ext won't be
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-gmp.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-gmp.patch
deleted file mode 100644
index 7580c951bfe8..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-gmp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Give control over gmp support
-
---- pycrypto/setup.py
-+++ pycrypto/setup.py
-@@ -116,10 +116,8 @@
-         build_ext.build_extensions(self)
- 
-     def detect_modules (self):
--        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
--        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-         exts = []
--        if (self.compiler.find_library_file(lib_dirs, 'gmp')):
-+        if os.environ.has_key("USE_GMP") and os.environ["USE_GMP"] == "1":
-             exts.append(Extension("Crypto.PublicKey._fastmath",
-                                   include_dirs=['src/'],
-                                   libraries=['gmp'],
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-sancho-package-rename.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-sancho-package-rename.patch
deleted file mode 100644
index fddf7c045adb..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-sancho-package-rename.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-=== modified file 'test/test_chaffing.py'
---- test/test_chaffing.py	
-+++ test/test_chaffing.py	
-@@ -4,7 +4,7 @@
- 
- __revision__ = "$Id: pycrypto-2.0.1-sancho-package-rename.patch,v 1.1 2006/02/13 21:26:38 marienz Exp $"
- 
--from sancho.unittest import TestScenario, parse_args, run_scenarios
-+from sancho0.unittest import TestScenario, parse_args, run_scenarios
- from Crypto.Protocol import Chaffing
- 
- tested_modules = [ "Crypto.Protocol.Chaffing" ]
-
-=== modified file 'test/test_hashes.py'
---- test/test_hashes.py	
-+++ test/test_hashes.py	
-@@ -5,7 +5,7 @@
- __revision__ = "$Id: pycrypto-2.0.1-sancho-package-rename.patch,v 1.1 2006/02/13 21:26:38 marienz Exp $"
- 
- import time, string, binascii
--from sancho.unittest import TestScenario, parse_args, run_scenarios
-+from sancho0.unittest import TestScenario, parse_args, run_scenarios
- 
- from Crypto.Hash import *
- import testdata
-
-=== modified file 'test/test_number.py'
---- test/test_number.py	
-+++ test/test_number.py	
-@@ -4,7 +4,7 @@
- 
- __revision__ = "$Id: pycrypto-2.0.1-sancho-package-rename.patch,v 1.1 2006/02/13 21:26:38 marienz Exp $"
- 
--from sancho.unittest import TestScenario, parse_args, run_scenarios
-+from sancho0.unittest import TestScenario, parse_args, run_scenarios
- from Crypto.Util import number
- 
- tested_modules = [ "Crypto.Util.number" ]
-
-=== modified file 'test/test_publickey.py'
---- test/test_publickey.py	
-+++ test/test_publickey.py	
-@@ -5,7 +5,7 @@
- __revision__ = "$Id: pycrypto-2.0.1-sancho-package-rename.patch,v 1.1 2006/02/13 21:26:38 marienz Exp $"
- 
- import sys, cPickle
--from sancho.unittest import TestScenario, parse_args, run_scenarios
-+from sancho0.unittest import TestScenario, parse_args, run_scenarios
- from Crypto.PublicKey import *
- from Crypto.Util.randpool import RandomPool
- from Crypto.Util import number
-
-=== modified file 'test/test_randpool.py'
---- test/test_randpool.py	
-+++ test/test_randpool.py	
-@@ -4,7 +4,7 @@
- 
- __revision__ = "$Id: pycrypto-2.0.1-sancho-package-rename.patch,v 1.1 2006/02/13 21:26:38 marienz Exp $"
- 
--from sancho.unittest import TestScenario, parse_args, run_scenarios
-+from sancho0.unittest import TestScenario, parse_args, run_scenarios
- from Crypto.Hash import SHA
- from Crypto.Util import randpool
- 
-
-=== modified file 'test/test_rfc1751.py'
---- test/test_rfc1751.py	
-+++ test/test_rfc1751.py	
-@@ -5,7 +5,7 @@
- __revision__ = "$Id: pycrypto-2.0.1-sancho-package-rename.patch,v 1.1 2006/02/13 21:26:38 marienz Exp $"
- 
- import binascii
--from sancho.unittest import TestScenario, parse_args, run_scenarios
-+from sancho0.unittest import TestScenario, parse_args, run_scenarios
- from Crypto.Util import RFC1751
- 
- tested_modules = [ "Crypto.Util.RFC1751" ]
-
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-sha256-2.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-sha256-2.patch
deleted file mode 100644
index 92dca822c55f..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-sha256-2.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-http://bugs.gentoo.org/164462
-
-===================================================================
-RCS file: /cvsroot/pycrypto/crypto/src/SHA256.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- pycrypto/src/SHA256.c	29 Nov 2005 16:31:36 -0000	1.4
-+++ pycrypto/src/SHA256.c	29 Nov 2005 18:16:22 -0000	1.5
-@@ -25,7 +25,8 @@
- #endif

- 

- typedef struct {

--    U32 state[8], length, curlen;

-+    U32 state[8], curlen;

-+    U32 length_upper, length_lower;

-     unsigned char buf[64];

- }

- hash_state;

-@@ -100,7 +101,7 @@
- /* init the SHA state */

- void sha_init(hash_state * md)

- {

--    md->curlen = md->length = 0;

-+    md->curlen = md->length_upper = md->length_lower = 0;

-     md->state[0] = 0x6A09E667UL;

-     md->state[1] = 0xBB67AE85UL;

-     md->state[2] = 0x3C6EF372UL;

-@@ -119,8 +120,13 @@
- 

-         /* is 64 bytes full? */

-         if (md->curlen == 64) {

-+	    U32 orig_length;

-             sha_compress(md);

--            md->length += 512;

-+	    orig_length = md->length_lower;

-+            md->length_lower += 512;

-+	    if (orig_length > md->length_lower) {

-+	      md->length_upper++;

-+	    }

-             md->curlen = 0;

-         }

-     }

-@@ -129,17 +135,22 @@
- void sha_done(hash_state * md, unsigned char *hash)

- {

-     int i;

-+    U32 orig_length;

- 

-     /* increase the length of the message */

--    md->length += md->curlen * 8;

-+    orig_length = md->length_lower;

-+    md->length_lower += md->curlen * 8;

-+    if (orig_length > md->length_lower) {

-+        md->length_upper++;

-+    }

- 

-     /* append the '1' bit */

-     md->buf[md->curlen++] = 0x80;

- 

-     /* if the length is currently above 56 bytes we append zeros

--                               * then compress.  Then we can fall back to padding zeros and length

--                               * encoding like normal.

--                             */

-+     * then compress.  Then we can fall back to padding zeros and length

-+     * encoding like normal.

-+     */

-     if (md->curlen > 56) {

-         for (; md->curlen < 64;)

-             md->buf[md->curlen++] = 0;

-@@ -151,13 +162,11 @@
-     for (; md->curlen < 56;)

-         md->buf[md->curlen++] = 0;

- 

--    /* since all messages are under 2^32 bits we mark the top bits zero */

--    for (i = 56; i < 60; i++)

--        md->buf[i] = 0;

--

-     /* append length */

-+    for (i = 56; i < 60; i++)

-+        md->buf[i] = (md->length_upper >> ((59 - i) * 8)) & 255;

-     for (i = 60; i < 64; i++)

--        md->buf[i] = (md->length >> ((63 - i) * 8)) & 255;

-+        md->buf[i] = (md->length_lower >> ((63 - i) * 8)) & 255;

-     sha_compress(md);

- 

-     /* copy output */

diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-sha256.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-sha256.patch
deleted file mode 100644
index 8d6b63489fcd..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-sha256.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/131293
-
-===================================================================
-RCS file: /cvsroot/pycrypto/crypto/src/SHA256.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- pycrypto/crypto/src/SHA256.c	2005/06/10 19:22:55	1.3
-+++ pycrypto/crypto/src/SHA256.c	2005/11/29 16:31:36	1.4
-@@ -136,11 +136,11 @@
-     /* append the '1' bit */

-     md->buf[md->curlen++] = 0x80;

- 

--    /* if the length is currenlly above 56 bytes we append zeros

-+    /* if the length is currently above 56 bytes we append zeros

-                                * then compress.  Then we can fall back to padding zeros and length

-                                * encoding like normal.

-                              */

--    if (md->curlen >= 56) {

-+    if (md->curlen > 56) {

-         for (; md->curlen < 64;)

-             md->buf[md->curlen++] = 0;

-         sha_compress(md);

diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-uint32.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-uint32.patch
deleted file mode 100644
index 8822737097fc..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.0.1-uint32.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/RIPEMD.c.agriffis	2005-06-13 20:14:57.000000000 -0400
-+++ src/RIPEMD.c	2006-02-02 08:59:43.000000000 -0500
-@@ -99,15 +99,9 @@
-       (c) = ROL((c), 10);\
-    }
- 
--typedef    unsigned char        byte;   /* unsigned 8-bit integer */
--#ifdef __alpha__
--typedef    unsigned int        word;   /* unsigned 32-bit integer */
--#elif defined(__amd64__)
--typedef    uint32_t            word;   /* unsigned 32-bit integer */
--#else
--typedef    unsigned long        word;   /* unsigned 32-bit integer */
--#endif
--typedef unsigned char   BYTE;
-+typedef    unsigned char        byte;
-+typedef    uint32_t             word;
-+
- #define RMD_DATASIZE    64
- #define RMD_DIGESTSIZE  20
- #define RMDsize 160
-@@ -137,7 +131,7 @@
- {
- 	word tmp;
- 	int dataCount, i;
--	BYTE *p;
-+	byte *p;
- 
- 	/* Update bitcount */
- 	tmp = shsInfo->countLo;
-@@ -151,7 +145,7 @@
- 	/* Handle any leading odd-sized chunks */
- 	if(dataCount)
-         {
--		p = ( BYTE * ) shsInfo->data + dataCount;
-+		p = ( byte * ) shsInfo->data + dataCount;
- 
- 		dataCount = RMD_DATASIZE - dataCount;
- 		if( count < dataCount )
diff --git a/dev-python/pycrypto/pycrypto-2.0.1-r5.ebuild b/dev-python/pycrypto/pycrypto-2.0.1-r5.ebuild
deleted file mode 100644
index 08079228dd44..000000000000
--- a/dev-python/pycrypto/pycrypto-2.0.1-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1-r5.ebuild,v 1.17 2008/08/21 06:20:27 ricmm Exp $
-
-inherit eutils distutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Python Cryptography Toolkit"
-HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
-SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bindist gmp test"
-
-RDEPEND="virtual/python
-	gmp? ( dev-libs/gmp )"
-DEPEND="${RDEPEND}
-	test? ( =dev-python/sancho-0.11-r1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use bindist && epatch "${FILESDIR}"/${P}-bindist.patch
-	epatch "${FILESDIR}"/${P}-sha256.patch
-	epatch "${FILESDIR}"/${P}-gmp.patch
-	epatch "${FILESDIR}"/pycrypto-2.0.1-uint32.patch
-	epatch "${FILESDIR}"/${P}-sancho-package-rename.patch
-}
-
-src_compile() {
-	use gmp \
-		&& export USE_GMP=1 \
-		|| export USE_GMP=0
-	# sha256 hashes occasionally trigger ssp when built with
-	# -finline-functions (implied by -O3).
-	gcc-specs-ssp && append-flags -fno-inline-functions
-	distutils_src_compile
-}
-
-src_test() {
-	export PYTHONPATH=$(ls -d "${S}"/build/lib.*/)
-	python ./test.py || die "test failed"
-	if use test ; then
-		local x
-		cd test
-		for x in test_*.py ; do
-			python ${x} || die "${x} failed"
-		done
-	fi
-}
-
-DOCS="ACKS ChangeLog PKG-INFO README TODO Doc/pycrypt.tex"
diff --git a/dev-python/pycrypto/pycrypto-2.0.1-r6.ebuild b/dev-python/pycrypto/pycrypto-2.0.1-r6.ebuild
deleted file mode 100644
index 65ce01feb172..000000000000
--- a/dev-python/pycrypto/pycrypto-2.0.1-r6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1-r6.ebuild,v 1.9 2008/08/21 06:20:27 ricmm Exp $
-
-inherit eutils distutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Python Cryptography Toolkit"
-HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
-SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bindist gmp test"
-
-RDEPEND="virtual/python
-	gmp? ( dev-libs/gmp )"
-DEPEND="${RDEPEND}
-	test? ( =dev-python/sancho-0.11-r1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use bindist && epatch "${FILESDIR}"/${P}-bindist.patch
-	epatch "${FILESDIR}"/${P}-sha256.patch
-	epatch "${FILESDIR}"/${P}-sha256-2.patch
-	epatch "${FILESDIR}"/${P}-gmp.patch
-	epatch "${FILESDIR}"/${P}-uint32.patch
-	epatch "${FILESDIR}"/${P}-sancho-package-rename.patch
-}
-
-src_compile() {
-	use gmp \
-		&& export USE_GMP=1 \
-		|| export USE_GMP=0
-	# sha256 hashes occasionally trigger ssp when built with
-	# -finline-functions (implied by -O3).
-	gcc-specs-ssp && append-flags -fno-inline-functions
-	distutils_src_compile
-}
-
-src_test() {
-	export PYTHONPATH=$(ls -d "${S}"/build/lib.*/)
-	python ./test.py || die "test failed"
-	if use test ; then
-		local x
-		cd test
-		for x in test_*.py ; do
-			python ${x} || die "${x} failed"
-		done
-	fi
-}
-
-DOCS="ACKS ChangeLog PKG-INFO README TODO Doc/pycrypt.tex"
diff --git a/dev-python/pycrypto/pycrypto-2.0.1-r7.ebuild b/dev-python/pycrypto/pycrypto-2.0.1-r7.ebuild
deleted file mode 100644
index 199c6e5934da..000000000000
--- a/dev-python/pycrypto/pycrypto-2.0.1-r7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1-r7.ebuild,v 1.3 2010/02/07 20:32:46 pva Exp $
-
-EAPI=1
-NEED_PYTHON=2.5
-inherit eutils distutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Python Cryptography Toolkit"
-HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
-SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bindist gmp test"
-
-RDEPEND="virtual/python
-	gmp? ( dev-libs/gmp )"
-DEPEND="${RDEPEND}
-	test? ( =dev-python/sancho-0.11-r1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use bindist && epatch "${FILESDIR}"/${P}-bindist.patch
-	epatch "${FILESDIR}"/${P}-sha256.patch
-	epatch "${FILESDIR}"/${P}-sha256-2.patch
-	epatch "${FILESDIR}"/${P}-gmp.patch
-	epatch "${FILESDIR}"/${P}-uint32.patch
-	epatch "${FILESDIR}"/${P}-sancho-package-rename.patch
-	epatch "${FILESDIR}"/${P}-2.6_hashlib.patch
-}
-
-src_compile() {
-	use gmp \
-		&& export USE_GMP=1 \
-		|| export USE_GMP=0
-	# sha256 hashes occasionally trigger ssp when built with
-	# -finline-functions (implied by -O3).
-	gcc-specs-ssp && append-flags -fno-inline-functions
-	distutils_src_compile
-	python_need_rebuild
-}
-
-src_test() {
-	export PYTHONPATH=$(ls -d "${S}"/build/lib.*/)
-	python ./test.py || die "test failed"
-	if use test ; then
-		local x
-		cd test
-		for x in test_*.py ; do
-			python ${x} || die "${x} failed"
-		done
-	fi
-}
-
-DOCS="ACKS ChangeLog PKG-INFO README TODO Doc/pycrypt.tex"
diff --git a/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild b/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild
deleted file mode 100644
index a67a68ca1129..000000000000
--- a/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild,v 1.12 2010/02/07 20:32:46 pva Exp $
-
-EAPI="2"
-NEED_PYTHON="2.5"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Python Cryptography Toolkit"
-HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
-SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bindist gmp test"
-
-RDEPEND="gmp? ( dev-libs/gmp )"
-DEPEND="${RDEPEND}
-	test? ( =dev-python/sancho-0.11-r1 )"
-RESTRICT_PYTHON_ABIS="3.*"
-
-DOCS="ACKS ChangeLog PKG-INFO README TODO Doc/pycrypt.tex"
-
-src_prepare() {
-	use bindist && epatch "${FILESDIR}"/${P}-bindist.patch
-	epatch "${FILESDIR}"/${P}-sha256.patch
-	epatch "${FILESDIR}"/${P}-sha256-2.patch
-	epatch "${FILESDIR}"/${P}-gmp.patch
-	epatch "${FILESDIR}"/${P}-uint32.patch
-	epatch "${FILESDIR}"/${P}-sancho-package-rename.patch
-	epatch "${FILESDIR}"/${P}-2.6_hashlib.patch
-	#ARC2 buffer overlow. Bug 258049
-	epatch "${FILESDIR}"/${P}-CVE-2009-0544.patch
-	epatch "${FILESDIR}"/${P}-caseimport.patch # for case insensitive filesystems
-}
-
-src_compile() {
-	use gmp \
-		&& export USE_GMP=1 \
-		|| export USE_GMP=0
-	# sha256 hashes occasionally trigger ssp when built with
-	# -finline-functions (implied by -O3).
-	gcc-specs-ssp && append-flags -fno-inline-functions
-	distutils_src_compile
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" test.py || die "test failed with Python ${PYTHON_ABI}"
-		cd test
-		local test
-		for test in test_*.py; do
-			PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}" || die "${test} failed with Python ${PYTHON_ABI}"
-		done
-	}
-	python_execute_function testing
-}