Delete older ebuild.

(Portage version: 2.2.0_alpha28_p4/cvs/Linux x86_64)

3 files changed, 5 insertions, 774 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index 89fabcc3204b..3331683a42f0 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.68 2011/03/20 12:02:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.69 2011/03/22 10:25:01 arfrever Exp $
+
+  22 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -m2crypto-0.20.2.ebuild, -files/m2crypto-0.20.2-openssl-1.0.0.patch:
+  Delete.
 
   20 Mar 2011; Raúl Porcel <armin76@gentoo.org> m2crypto-0.21.1.ebuild:
   ia64/s390/sh/sparc stable wrt #355267
diff --git a/dev-python/m2crypto/files/m2crypto-0.20.2-openssl-1.0.0.patch b/dev-python/m2crypto/files/m2crypto-0.20.2-openssl-1.0.0.patch
deleted file mode 100644
index 3809e5b656b8..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.20.2-openssl-1.0.0.patch
+++ /dev/null
@@ -1,713 +0,0 @@
---- SWIG/_aes.i
-+++ SWIG/_aes.i
-@@ -76,7 +76,7 @@
-         AES_encrypt((const unsigned char *)in, out, key);
-     else
-         AES_decrypt((const unsigned char *)in, out, key);
--    return PyString_FromStringAndSize(out, outlen);
-+    return PyString_FromStringAndSize((char*)out, outlen);
- }
- 
- int AES_type_check(AES_KEY *key) {
---- SWIG/_evp.i
-+++ SWIG/_evp.i
-@@ -4,6 +4,9 @@
- 
- Portions Copyright (c) 2004-2007 Open Source Applications Foundation.
- Author: Heikki Toivonen
-+
-+Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
-+
- */
- 
- %include <openssl/opensslconf.h>
-@@ -180,7 +183,7 @@
- 
-     PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
-                            keylen, key);
--    ret = PyString_FromStringAndSize(key, keylen);
-+    ret = PyString_FromStringAndSize((char*)key, keylen);
-     OPENSSL_cleanse(key, keylen);
-     return ret;
- }
-@@ -339,7 +342,7 @@
-     klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
-         (unsigned char *)dbuf, dlen, iter, 
-         key, NULL); /* Since we are not returning IV no need to derive it */
--    ret = PyString_FromStringAndSize(key, klen);
-+    ret = PyString_FromStringAndSize((char*)key, klen);
-     return ret;
- }
- 
-@@ -435,7 +438,7 @@
-         PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
-         return NULL;
-     }
--    ret = PyString_FromStringAndSize(sigbuf, siglen);
-+    ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
-     OPENSSL_cleanse(sigbuf, siglen);
-     OPENSSL_free(sigbuf);
-     return ret;
-@@ -513,7 +516,7 @@
-         PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
-         return NULL; 
-     }
--    der = PyString_FromStringAndSize(pp, len);
-+    der = PyString_FromStringAndSize((char*)pp, len);
-     OPENSSL_free(pp);
-     return der;
- }
---- SWIG/_m2crypto.i
-+++ SWIG/_m2crypto.i
-@@ -3,6 +3,9 @@
-  *
-  * Portions created by Open Source Applications Foundation (OSAF) are
-  * Copyright (C) 2004-2006 OSAF. All Rights Reserved.
-+ *
-+ * Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
-+ *
-  */
- 
- %module(threads=1) _m2crypto
-@@ -38,6 +41,19 @@
- #define CONST098
- #endif
- 
-+/* Bring in STACK_OF macro definition */
-+%include <openssl/safestack.h>
-+
-+/* Bring in LHASH_OF macro definition */
-+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
-+   XXX stdio.h etc. which we fail to include. So we have to (re)define
-+   XXX LHASH_OF here instead.
-+%include <openssl/lhash.h>
-+*/
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define LHASH_OF(type) struct lhash_st_##type
-+#endif
-+
- %include constraints.i
- %include _threads.i
- %include _lib.i
---- SWIG/_pkcs7.i
-+++ SWIG/_pkcs7.i
-@@ -12,7 +12,7 @@
- %apply Pointer NONNULL { EVP_CIPHER * };
- %apply Pointer NONNULL { EVP_PKEY * };
- %apply Pointer NONNULL { PKCS7 * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { X509 * };
- 
- %rename(pkcs7_new) PKCS7_new;
-@@ -54,8 +54,8 @@
- 
- %threadallow pkcs7_encrypt;
- %inline %{
--PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
--    return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
-+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
-+    return PKCS7_encrypt(stack, bio, cipher, flags);
- }
- 
- PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
-@@ -96,14 +96,14 @@
- 
- %threadallow pkcs7_sign1;
- %inline %{
--PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
--    return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
-+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
-+    return PKCS7_sign(x509, pkey, stack, bio, flags);
- }
- %}
- 
- %threadallow pkcs7_verify1;
- %inline %{
--PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
-+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
-     int outlen;
-     char *outbuf;
-     BIO *bio;
-@@ -113,7 +113,7 @@
-         PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
-         return NULL;
-     }
--    if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
-+    if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
-         PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
-         BIO_free(bio);
-         return NULL;
-@@ -131,7 +131,7 @@
-     return ret;
- }
- 
--PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
-+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
-     return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
- }
- %}
-@@ -229,7 +229,7 @@
- }
- 
- /* return STACK_OF(X509)* */     
--STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {     
-+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {     
-     return PKCS7_get0_signers(p7, certs, flags);      
- }
- 
---- SWIG/_rand.i
-+++ SWIG/_rand.i
-@@ -87,7 +87,7 @@
-         Py_INCREF(Py_None);
-         return Py_None;
-     } else {
--        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
-+        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
-         PyMem_Free(blob);
-         PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
-         return tuple;
---- SWIG/_ssl.i
-+++ SWIG/_ssl.i
-@@ -3,6 +3,9 @@
- /*
- ** Portions created by Open Source Applications Foundation (OSAF) are
- ** Copyright (C) 2004-2005 OSAF. All Rights Reserved.
-+**
-+** Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
-+**
- */
- /* $Id: m2crypto-0.20.2-openssl-1.0.0.patch,v 1.1 2010/04/30 18:21:16 arfrever Exp $ */
- 
-@@ -17,13 +20,17 @@
- %apply Pointer NONNULL { SSL_CTX * };
- %apply Pointer NONNULL { SSL * };
- %apply Pointer NONNULL { SSL_CIPHER * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { BIO * };
- %apply Pointer NONNULL { DH * };
- %apply Pointer NONNULL { RSA * };
- %apply Pointer NONNULL { EVP_PKEY *};
- %apply Pointer NONNULL { PyObject *pyfunc };
- 
-+%rename(ssl_get_ciphers) SSL_get_ciphers;
-+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
-+
- %rename(ssl_get_version) SSL_get_version;
- extern const char *SSL_get_version(CONST SSL *);
- %rename(ssl_get_error) SSL_get_error;
-@@ -668,28 +675,24 @@
-     return SSL_CIPHER_get_bits(c, NULL);
- }
- 
--STACK *ssl_get_ciphers(SSL *ssl) {
--    return (STACK *)SSL_get_ciphers(ssl);
--}
--
--int sk_ssl_cipher_num(STACK *stack) {
--    return sk_num(stack);
-+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
-+    return sk_SSL_CIPHER_num(stack);
- }
- 
--SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
--    return (SSL_CIPHER *)sk_value(stack, idx);
-+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
-+    return sk_SSL_CIPHER_value(stack, idx);
- }
- 
--STACK *ssl_get_peer_cert_chain(SSL *ssl) {
--    return (STACK *)SSL_get_peer_cert_chain(ssl);
-+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
-+    return SSL_get_peer_cert_chain(ssl);
- }
- 
--int sk_x509_num(STACK *stack) {
--    return sk_num(stack);
-+int sk_x509_num(STACK_OF(X509) *stack) {
-+    return sk_X509_num(stack);
- }
- 
--X509 *sk_x509_value(STACK *stack, int idx) {
--    return (X509 *)sk_value(stack, idx);
-+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
-+    return sk_X509_value(stack, idx);
- }
- %}
- 
---- SWIG/_util.i
-+++ SWIG/_util.i
-@@ -48,7 +48,7 @@
-         PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
-         return NULL;
-     }
--    obj = PyString_FromStringAndSize(ret, len);
-+    obj = PyString_FromStringAndSize((char*)ret, len);
-     OPENSSL_free(ret);
-     return obj;
- }
---- SWIG/_x509.i
-+++ SWIG/_x509.i
-@@ -3,6 +3,9 @@
- /*
- ** Portions created by Open Source Applications Foundation (OSAF) are
- ** Copyright (C) 2004-2005 OSAF. All Rights Reserved.
-+**
-+** Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
-+**
- */
- /* $Id: m2crypto-0.20.2-openssl-1.0.0.patch,v 1.1 2010/04/30 18:21:16 arfrever Exp $   */
- 
-@@ -148,8 +151,15 @@
- extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
- %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
- extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+%rename(x509_name_hash) X509_NAME_hash_old;
-+extern unsigned long X509_NAME_hash_old(X509_NAME *);
-+#else
- %rename(x509_name_hash) X509_NAME_hash;
- extern unsigned long X509_NAME_hash(X509_NAME *);
-+#endif
-+
- %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
- extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
- 
-@@ -171,7 +181,7 @@
-     if (PyString_Check($input)) {
-         Py_ssize_t len;
- 
--        $1 = PyString_AsString($input); 
-+        $1 = (unsigned char *)PyString_AsString($input); 
-         len = PyString_Size($input);
-         if (len > INT_MAX) {
-             PyErr_SetString(PyExc_ValueError, "object too large");
-@@ -184,7 +194,7 @@
-     }
- }
- %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
--extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
-+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
- %typemap(in) (CONST unsigned char *, int);
- 
- %rename(x509_req_new) X509_REQ_new;
-@@ -230,7 +240,7 @@
- %rename(x509_store_ctx_free) X509_STORE_CTX_free;
- extern void X509_STORE_CTX_free(X509_STORE_CTX *);
- %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
--extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
-+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
- 
- %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
- extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
-@@ -348,7 +358,7 @@
-         PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-     }
-     else {     
--        ret = PyString_FromStringAndSize(buf, len);
-+        ret = PyString_FromStringAndSize((char*)buf, len);
-         OPENSSL_free(buf);
-     }
-     return ret;
-@@ -435,12 +445,12 @@
- }
- 
- int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
--    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
-+    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
- }
- 
- /* x509_name_add_entry_by_txt */
- int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
--    return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
-+    return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
- }
- 
- PyObject *x509_name_get_der(X509_NAME *name)
-@@ -450,23 +460,23 @@
- }
- 
- /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
--STACK *sk_x509_new_null(void) {
--    return (STACK *)sk_X509_new_null();
-+STACK_OF(X509) *sk_x509_new_null(void) {
-+    return sk_X509_new_null();
- }
- 
- /* sk_X509_free() is a macro. */
--void sk_x509_free(STACK *stack) {
--    sk_X509_free((STACK_OF(X509) *)stack);
-+void sk_x509_free(STACK_OF(X509) *stack) {
-+    sk_X509_free(stack);
- }
- 
- /* sk_X509_push() is a macro. */
--int sk_x509_push(STACK *stack, X509 *x509) {
--    return sk_X509_push((STACK_OF(X509) *)stack, x509);
-+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
-+    return sk_X509_push(stack, x509);
- }
- 
- /* sk_X509_pop() is a macro. */
--X509 *sk_x509_pop(STACK *stack) {
--    return sk_X509_pop((STACK_OF(X509) *)stack);
-+X509 *sk_x509_pop(STACK_OF(X509) *stack) {
-+    return sk_X509_pop(stack);
- }
- 
- int x509_store_load_locations(X509_STORE *store, const char *file) {
-@@ -493,21 +503,29 @@
-     return X509_REQ_set_version(x, version);
- }
- 
--int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
--    return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
-+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
-+    return X509_REQ_add_extensions(req, exts);
- }
- 
--X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
--    return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
-+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
-+    return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
- }
- 
--LHASH * 
--x509v3_lhash(){ 
--       return lh_new(NULL,NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+LHASH_OF(CONF_VALUE) 
-+#else
-+LHASH
-+#endif
-+*x509v3_lhash() { 
-+    return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
- }
- 
- X509V3_CTX *
--x509v3_set_conf_lhash(LHASH * lhash){
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
-+#else
-+x509v3_set_conf_lhash(LHASH                * lhash) {
-+#endif
-       X509V3_CTX * ctx;
-       if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
-           PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
-@@ -517,11 +535,20 @@
-       return ctx;
- }
- 
--X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
-+X509_EXTENSION *
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#else
-+x509v3_ext_conf(LHASH                *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#endif
-       X509_EXTENSION * ext = NULL;
-       ext = X509V3_EXT_conf(conf, ctx, name, value); 
-       PyMem_Free(ctx); 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      lh_CONF_VALUE_free(conf);
-+#else
-       lh_free(conf);
-+#endif
-       return ext;
- }
- 
-@@ -543,33 +570,33 @@
- }
- 
- /* sk_X509_EXTENSION_new_null is a macro. */
--STACK *sk_x509_extension_new_null(void) {
--    return (STACK *)sk_X509_EXTENSION_new_null();
-+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
-+    return sk_X509_EXTENSION_new_null();
- }
- 
- /* sk_X509_EXTENSION_free() is a macro. */
--void sk_x509_extension_free(STACK *stack) {
--    sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
-+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
-+    sk_X509_EXTENSION_free(stack);
- }
- 
- /* sk_X509_EXTENSION_push() is a macro. */
--int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
--    return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
-+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
-+    return sk_X509_EXTENSION_push(stack, x509_ext);
- }
- 
- /* sk_X509_EXTENSION_pop() is a macro. */
--X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
--    return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
-+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
-+    return sk_X509_EXTENSION_pop(stack);
- }
- 
- /* sk_X509_EXTENSION_num() is a macro. */
--int sk_x509_extension_num(STACK *stack) {
--    return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
-+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
-+    return sk_X509_EXTENSION_num(stack);
- }
- 
- /* sk_X509_EXTENSION_value() is a macro. */
--X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
--    return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
-+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
-+    return sk_X509_EXTENSION_value(stack, i);
- }
- 
- /* X509_STORE_CTX_get_app_data is a macro. */
-@@ -590,7 +617,7 @@
- #define I2DTYPE int (*)()
- #endif   
- 
--STACK *
-+STACK_OF(X509) *
- make_stack_from_der_sequence(PyObject * pyEncodedString){
-     STACK_OF(X509) *certs;
-     Py_ssize_t encoded_string_len;
-@@ -606,7 +633,7 @@
-         return NULL;
-     }
- 
--    certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); 
-+    certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); 
-     if (!certs) {
-        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-        return NULL;
-@@ -616,13 +643,13 @@
- }
- 
- PyObject *
--get_der_encoding_stack(STACK * stack){
-+get_der_encoding_stack(STACK_OF(X509) *stack){
-     PyObject * encodedString;
-     
-     unsigned char * encoding;
-     int len; 
-     
--    encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); 
-+    encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); 
-     if (!encoding) {
-        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-        return NULL;
---- tests/alltests.py
-+++ tests/alltests.py
-@@ -37,6 +37,7 @@
-         'tests.test_rc4',
-         'tests.test_rsa',
-         'tests.test_smime',
-+        'tests.test_ssl_offline',
-         'tests.test_threading',
-         'tests.test_x509']
-     if os.name == 'posix':
---- tests/test_smime.py
-+++ tests/test_smime.py
-@@ -37,7 +37,7 @@
-         buf = BIO.MemoryBuffer(self.cleartext)
-         s = SMIME.SMIME()
-         s.load_key('tests/signer_key.pem', 'tests/signer.pem')
--        p7 = s.sign(buf)
-+        p7 = s.sign(buf, SMIME.PKCS7_DETACHED)
-         assert len(buf) == 0
-         assert p7.type() == SMIME.PKCS7_SIGNED, p7.type()
-         assert isinstance(p7, SMIME.PKCS7), p7
-@@ -73,9 +73,8 @@
-         
-         p7, data = SMIME.smime_load_pkcs7_bio(self.signed)
-         
--        assert data.read() == self.cleartext
-         assert isinstance(p7, SMIME.PKCS7), p7
--        v = s.verify(p7)
-+        v = s.verify(p7, data)
-         assert v == self.cleartext
-     
-         t = p7.get0_signers(sk)
-@@ -95,7 +94,6 @@
-         s.set_x509_store(st)
-         
-         p7, data = SMIME.smime_load_pkcs7_bio(self.signed)
--        assert data.read() == self.cleartext
-         assert isinstance(p7, SMIME.PKCS7), p7
-         self.assertRaises(SMIME.PKCS7_Error, s.verify, p7) # Bad signer
- 
-@@ -169,7 +167,7 @@
-         s.set_cipher(SMIME.Cipher('des_ede3_cbc'))
-         
-         tmp = BIO.MemoryBuffer()
--        s.write(tmp, p7, buf)
-+        s.write(tmp, p7)
- 
-         p7 = s.encrypt(tmp)
-         
-@@ -211,6 +209,7 @@
-         assert p7.write(f) == 1
-         f.close()
- 
-+        p7 = s.sign(BIO.MemoryBuffer('some text'), SMIME.PKCS7_DETACHED)
-         self.filenameSmime = 'tests/sig.p7s'
-         f = BIO.openfile(self.filenameSmime, 'wb')
-         assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
-@@ -220,7 +219,7 @@
-         buf = BIO.MemoryBuffer()
-         assert SMIME.load_pkcs7(self.filename).write_der(buf) == 1
-         s = buf.read()
--        assert len(s) == 1204, len(s)
-+        assert len(s) in (1204, 1243), len(s)
-         
-     def test_load_pkcs7(self):
-         assert SMIME.load_pkcs7(self.filename).type() == SMIME.PKCS7_SIGNED
---- tests/test_ssl_offline.py
-+++ tests/test_ssl_offline.py
-@@ -0,0 +1,60 @@
-+"""Unit tests for M2Crypto.SSL offline parts
-+
-+Copyright (C) 2006 Open Source Applications Foundation. All Rights Reserved.
-+
-+Copyright (C) 2009-2010 Heikki Toivonen. All Rights Reserved.
-+"""
-+
-+import unittest, doctest
-+from M2Crypto.SSL import Checker
-+from M2Crypto import X509
-+from M2Crypto import SSL
-+from test_ssl import srv_host
-+
-+
-+class CheckerTestCase(unittest.TestCase):
-+    def test_checker(self):
-+
-+        check = Checker.Checker(host=srv_host,
-+                                peerCertHash='7B754EFA41A264AAD370D43460BC8229F9354ECE')
-+        x509 = X509.load_cert('tests/server.pem')
-+        assert check(x509, srv_host)
-+        self.assertRaises(Checker.WrongHost, check, x509, 'example.com')
-+        
-+        doctest.testmod(Checker)
-+
-+    
-+class ContextTestCase(unittest.TestCase):
-+    def test_ctx_load_verify_locations(self):
-+        ctx = SSL.Context()
-+        self.assertRaises(ValueError, ctx.load_verify_locations, None, None)
-+        
-+    def test_map(self):
-+        from M2Crypto.SSL.Context import map, _ctxmap
-+        assert isinstance(map(), _ctxmap)
-+        ctx = SSL.Context()
-+        assert map()
-+        ctx.close()
-+        assert map() is _ctxmap.singleton
-+
-+    def test_certstore(self):
-+        ctx = SSL.Context()
-+        ctx.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, 9)
-+        ctx.load_verify_locations('tests/ca.pem')
-+        ctx.load_cert('tests/x509.pem')
-+
-+        store = ctx.get_cert_store()
-+        assert isinstance(store, X509.X509_Store)
-+
-+
-+def suite():
-+    suite = unittest.TestSuite()
-+    suite.addTest(unittest.makeSuite(CheckerTestCase))
-+    suite.addTest(unittest.makeSuite(ContextTestCase))
-+    return suite    
-+
-+
-+if __name__ == '__main__':
-+    Rand.load_file('randpool.dat', -1)
-+    unittest.TextTestRunner().run(suite())
-+    Rand.save_file('randpool.dat')
---- tests/test_ssl.py
-+++ tests/test_ssl.py
-@@ -2,7 +2,10 @@
- 
- """Unit tests for M2Crypto.SSL.
- 
--Copyright (c) 2000-2004 Ng Pheng Siong. All rights reserved."""
-+Copyright (c) 2000-2004 Ng Pheng Siong. All rights reserved.
-+
-+Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
-+"""
- 
- """
- TODO
-@@ -405,8 +408,11 @@
-         try:
-             ctx = SSL.Context('sslv23', weak_crypto=1)
-             s = SSL.Connection(ctx)
--            s.connect(self.srv_addr)
--            self.failUnlessEqual(s.get_version(), 'SSLv2')
-+            if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
-+                s.connect(self.srv_addr)
-+                self.failUnlessEqual(s.get_version(), 'SSLv2')
-+            else:
-+                self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
-             s.close()
-         finally:
-             self.stop_server(pid)
-@@ -1032,45 +1038,6 @@
-         # XXX need server to test against
- 
- 
--class CheckerTestCase(unittest.TestCase):
--    def test_checker(self):
--        from M2Crypto.SSL import Checker
--        from M2Crypto import X509
--
--        check = Checker.Checker(host=srv_host,
--                                peerCertHash='7B754EFA41A264AAD370D43460BC8229F9354ECE')
--        x509 = X509.load_cert('tests/server.pem')
--        assert check(x509, srv_host)
--        self.assertRaises(Checker.WrongHost, check, x509, 'example.com')
--        
--        import doctest
--        doctest.testmod(Checker)
--        
--    
--class ContextTestCase(unittest.TestCase):
--    def test_ctx_load_verify_locations(self):
--        ctx = SSL.Context()
--        self.assertRaises(ValueError, ctx.load_verify_locations, None, None)
--        
--    def test_map(self):
--        from M2Crypto.SSL.Context import map, _ctxmap
--        assert isinstance(map(), _ctxmap)
--        ctx = SSL.Context()
--        assert map()
--        ctx.close()
--        assert map() is _ctxmap.singleton
--
--    def test_certstore(self):
--        ctx = SSL.Context()
--        ctx.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, 9)
--        ctx.load_verify_locations('tests/ca.pem')
--        ctx.load_cert('tests/x509.pem')
--
--        from M2Crypto import X509
--        store = ctx.get_cert_store()
--        assert isinstance(store, X509.X509_Store)
--
--
- class SessionTestCase(unittest.TestCase):
-     def test_session_load_bad(self):
-         self.assertRaises(SSL.SSLError, SSL.Session.load_session,
-@@ -1086,8 +1053,6 @@
- 
- def suite():
-     suite = unittest.TestSuite()
--    suite.addTest(unittest.makeSuite(CheckerTestCase))
--    suite.addTest(unittest.makeSuite(ContextTestCase))
-     suite.addTest(unittest.makeSuite(SessionTestCase))
-     suite.addTest(unittest.makeSuite(XmlRpcLibTestCase))
-     suite.addTest(unittest.makeSuite(FtpsLibTestCase))
diff --git a/dev-python/m2crypto/m2crypto-0.20.2.ebuild b/dev-python/m2crypto/m2crypto-0.20.2.ebuild
deleted file mode 100644
index 53533578a48a..000000000000
--- a/dev-python/m2crypto/m2crypto-0.20.2.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/m2crypto/m2crypto-0.20.2.ebuild,v 1.14 2010/12/26 14:48:30 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="A python wrapper for the OpenSSL crypto library"
-HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/openssl-0.9.8"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.25
-	doc? ( dev-python/epydoc )
-	dev-python/setuptools"
-RESTRICT_PYTHON_ABIS="3.*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS="CHANGES"
-PYTHON_MODNAME="${MY_PN}"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${P}-openssl-1.0.0.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd doc
-		einfo "Generation of documentation"
-		PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib.*)" epydoc --html --output=api --name=M2Crypto M2Crypto || die "Generation of documentation failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		pushd demo > /dev/null
-		insinto /usr/share/doc/${PF}/example
-		doins -r *
-		popd > /dev/null
-	fi
-	dohtml -r doc/*
-}