version bump (patch only), fixing SWIG errors with latest python/openssl (made patch for it), added 'doc' use-flag (pulls api-docs, installs examples), general ebuild cleanup.

(Portage version: 2.0.53_rc6)

5 files changed, 165 insertions, 11 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index 184434b1afca..8ae1b201773b 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.13 2005/10/16 21:18:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.14 2005/11/02 16:29:47 sbriesen Exp $
+
+*m2crypto-0.13.1 (02 Nov 2005)
+
+  02 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/m2crypto-0.13-gentoo.patch, +m2crypto-0.13.1.ebuild:
+  version bump (patch only), fixing SWIG errors with latest python/openssl
+  (made patch for it), added 'doc' use-flag (pulls api-docs, installs
+  examples), general ebuild cleanup.
 
   16 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
   m2crypto-0.07_alpha3.ebuild, m2crypto-0.12.ebuild,
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 012410ff5668..34c5a9abdd9d 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 94d97aa441647931f7d20ddadf4fec73 ChangeLog 1725
 MD5 7601c8dba6f5d47b6abd298e4aa754c1 files/digest-m2crypto-0.07_alpha3 68
 MD5 7861e3954b04c975b4c51806c167389b files/digest-m2crypto-0.12 62
 MD5 7861e3954b04c975b4c51806c167389b files/digest-m2crypto-0.12-r1 62
 MD5 0dde9c7574cf4a141183111f8c3f97dd files/digest-m2crypto-0.13 62
+MD5 f88a0ced38ccaf267115763f8b183d78 files/digest-m2crypto-0.13.1 186
+MD5 bcc28d831719f7777f745bd96ab35865 files/m2crypto-0.13-gentoo.patch 5874
 MD5 509c817f2a2805cc8a3e6b9a4aef8547 m2crypto-0.07_alpha3.ebuild 775
 MD5 4f3f393a3f7a9d5f7c19931d4bce6004 m2crypto-0.12-r1.ebuild 789
 MD5 ff91b3dd02995b40b890b286df854125 m2crypto-0.12.ebuild 769
+MD5 31339a3e75482eca7ac7e009cc8721b4 m2crypto-0.13.1.ebuild 1346
 MD5 a1e3a3225d43f188faccca237d5baa54 m2crypto-0.13.ebuild 792
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDUsPAKf2g/qXtneoRAhtUAKCGUTfovI/SRiJtLNMfUz0BXi2/6ACfQZ87
-UFFCgWxjIf6zEBmtXJ/cjuc=
-=DPq+
------END PGP SIGNATURE-----
diff --git a/dev-python/m2crypto/files/digest-m2crypto-0.13.1 b/dev-python/m2crypto/files/digest-m2crypto-0.13.1
new file mode 100644
index 000000000000..388408563d83
--- /dev/null
+++ b/dev-python/m2crypto/files/digest-m2crypto-0.13.1
@@ -0,0 +1,3 @@
+MD5 4bc65c6cd30d01fa5ea5163b637464d5 0.13p1.patch 1645
+MD5 3ba3e53b308f3448ab32a8bb421c5299 m2crypto-0.13-apidoc.zip 596553
+MD5 be2790a34349ab452dddbcfe4c95606a m2crypto-0.13.zip 410759
diff --git a/dev-python/m2crypto/files/m2crypto-0.13-gentoo.patch b/dev-python/m2crypto/files/m2crypto-0.13-gentoo.patch
new file mode 100644
index 000000000000..add8369b09b8
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-0.13-gentoo.patch
@@ -0,0 +1,94 @@
+--- setup.py.orig	2004-03-28 13:06:59.000000000 +0200
++++ setup.py	2005-11-02 15:20:58.000000000 +0100
+@@ -14,7 +14,7 @@
+ 
+ # This copy of swig_sources is from Python 2.2.
+ 
+-def swig_sources (self, sources):
++def swig_sources (self, sources, extension=None):
+ 
+     """Walk the list of source files in 'sources', looking for SWIG
+     interface (.i) files.  Run SWIG on all that are found, and
+--- SWIG/_ssl.i.orig	2004-03-25 05:41:11.000000000 +0100
++++ SWIG/_ssl.i	2005-11-02 15:08:10.722472561 +0100
+@@ -18,7 +18,7 @@
+ %apply Pointer NONNULL { RSA * };
+ %apply Pointer NONNULL { PyObject *pyfunc };
+ 
+-%name(ssl_get_error) extern int SSL_get_error(SSL *, int);
++%name(ssl_get_error) extern int SSL_get_error(const SSL *, int);
+ %name(ssl_get_state) extern const char *SSL_state_string(const SSL *);
+ %name(ssl_get_state_v) extern const char *SSL_state_string_long(const SSL *);
+ %name(ssl_get_alert_type) extern const char *SSL_alert_type_string(int);
+@@ -34,13 +34,13 @@
+ %name(ssl_ctx_new) extern SSL_CTX *SSL_CTX_new(SSL_METHOD *);
+ %name(ssl_ctx_free) extern void SSL_CTX_free(SSL_CTX *);
+ %name(ssl_ctx_set_verify_depth) extern void SSL_CTX_set_verify_depth(SSL_CTX *, int);
+-%name(ssl_ctx_get_verify_depth) extern int SSL_CTX_get_verify_depth(SSL_CTX *);
+-%name(ssl_ctx_get_verify_mode) extern int SSL_CTX_get_verify_mode(SSL_CTX *);
++%name(ssl_ctx_get_verify_depth) extern int SSL_CTX_get_verify_depth(const SSL_CTX *);
++%name(ssl_ctx_get_verify_mode) extern int SSL_CTX_get_verify_mode(const SSL_CTX *);
+ %name(ssl_ctx_set_cipher_list) extern int SSL_CTX_set_cipher_list(SSL_CTX *, const char *);
+ %name(ssl_ctx_add_session) extern int SSL_CTX_add_session(SSL_CTX *, SSL_SESSION *);
+ %name(ssl_ctx_remove_session) extern int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *);
+ %name(ssl_ctx_set_session_timeout) extern long SSL_CTX_set_timeout(SSL_CTX *, long);
+-%name(ssl_ctx_get_session_timeout) extern long SSL_CTX_get_timeout(SSL_CTX *);
++%name(ssl_ctx_get_session_timeout) extern long SSL_CTX_get_timeout(const SSL_CTX *);
+ 
+ %name(bio_new_ssl) extern BIO *BIO_new_ssl(SSL_CTX *, int);
+ 
+@@ -54,29 +54,29 @@
+ %name(ssl_shutdown) extern int SSL_shutdown(SSL *);
+ %name(ssl_do_handshake) extern int SSL_do_handshake(SSL *);
+ %name(ssl_renegotiate) extern int SSL_renegotiate(SSL *);
+-%name(ssl_pending) extern int SSL_pending(SSL *);
++%name(ssl_pending) extern int SSL_pending(const SSL *);
+ 
+-%name(ssl_get_peer_cert) extern X509 *SSL_get_peer_certificate(SSL *);
+-%name(ssl_get_current_cipher) extern SSL_CIPHER *SSL_get_current_cipher(SSL *);
+-%name(ssl_get_verify_mode) extern int SSL_get_verify_mode(SSL *);
+-%name(ssl_get_verify_depth) extern int SSL_get_verify_depth(SSL *);
+-%name(ssl_get_verify_result) extern long SSL_get_verify_result(SSL *);
+-%name(ssl_get_ssl_ctx) extern SSL_CTX *SSL_get_SSL_CTX(SSL *);
+-%name(ssl_get_default_session_timeout) extern long SSL_get_default_timeout(SSL *);
++%name(ssl_get_peer_cert) extern X509 *SSL_get_peer_certificate(const SSL *);
++%name(ssl_get_current_cipher) extern SSL_CIPHER *SSL_get_current_cipher(const SSL *);
++%name(ssl_get_verify_mode) extern int SSL_get_verify_mode(const SSL *);
++%name(ssl_get_verify_depth) extern int SSL_get_verify_depth(const SSL *);
++%name(ssl_get_verify_result) extern long SSL_get_verify_result(const SSL *);
++%name(ssl_get_ssl_ctx) extern SSL_CTX *SSL_get_SSL_CTX(const SSL *);
++%name(ssl_get_default_session_timeout) extern long SSL_get_default_timeout(const SSL *);
+ 
+ %name(ssl_set_cipher_list) extern int SSL_set_cipher_list(SSL *, const char *);
+-%name(ssl_get_cipher_list) extern const char *SSL_get_cipher_list(SSL *, int);
++%name(ssl_get_cipher_list) extern const char *SSL_get_cipher_list(const SSL *, int);
+ 
+-%name(ssl_cipher_get_name) extern const char *SSL_CIPHER_get_name(SSL_CIPHER *);
+-%name(ssl_cipher_get_version) extern char *SSL_CIPHER_get_version(SSL_CIPHER *);
++%name(ssl_cipher_get_name) extern const char *SSL_CIPHER_get_name(const SSL_CIPHER *);
++%name(ssl_cipher_get_version) extern char *SSL_CIPHER_get_version(const SSL_CIPHER *);
+ 
+-%name(ssl_get_session) extern SSL_SESSION *SSL_get_session(SSL *);
++%name(ssl_get_session) extern SSL_SESSION *SSL_get_session(const SSL *);
+ %name(ssl_get1_session) extern SSL_SESSION *SSL_get1_session(SSL *);
+ %name(ssl_set_session) extern int SSL_set_session(SSL *, SSL_SESSION *);
+ %name(ssl_session_free) extern void SSL_SESSION_free(SSL_SESSION *);
+-%name(ssl_session_print) extern int SSL_SESSION_print(BIO *, SSL_SESSION *);
++%name(ssl_session_print) extern int SSL_SESSION_print(BIO *, const SSL_SESSION *);
+ %name(ssl_session_set_timeout) extern long SSL_SESSION_set_timeout(SSL_SESSION *, long);
+-%name(ssl_session_get_timeout) extern long SSL_SESSION_get_timeout(SSL_SESSION *);
++%name(ssl_session_get_timeout) extern long SSL_SESSION_get_timeout(const SSL_SESSION *);
+ 
+ %constant int ssl_error_none              = SSL_ERROR_NONE;
+ %constant int ssl_error_ssl               = SSL_ERROR_SSL;
+--- SWIG/_x509.i.orig	2004-03-21 13:37:46.000000000 +0100
++++ SWIG/_x509.i	2005-11-02 15:09:21.835536441 +0100
+@@ -43,7 +43,7 @@
+ %name(x509_name_entry_free) extern void X509_NAME_ENTRY_free( X509_NAME_ENTRY *);
+ %name(x509_name_entry_create_by_nid) extern X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID( X509_NAME_ENTRY **, int, int, unsigned char *, int);
+ %name(x509_name_entry_set_object) extern int X509_NAME_ENTRY_set_object( X509_NAME_ENTRY *, ASN1_OBJECT *);
+-%name(x509_name_entry_set_data) extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, unsigned char *, int);
++%name(x509_name_entry_set_data) extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, const unsigned char *, int);
+ %name(x509_name_entry_get_object) extern ASN1_OBJECT *X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *);
+ %name(x509_name_entry_get_data) extern ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *);
+ 
diff --git a/dev-python/m2crypto/m2crypto-0.13.1.ebuild b/dev-python/m2crypto/m2crypto-0.13.1.ebuild
new file mode 100644
index 000000000000..e37d0f32e7ef
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.13.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.13.1.ebuild,v 1.1 2005/11/02 16:29:47 sbriesen Exp $
+
+inherit distutils portability
+
+MY_PV="${PV%.*}"
+MY_P="${PN}-${MY_PV}"
+MY_PPV="${PV%.*}p${PV##*.}"
+
+DESCRIPTION="A python wrapper for the OpenSSL crypto library"
+HOMEPAGE="http://sandbox.rulemaker.net/ngps/m2/"
+SRC_URI="http://sandbox.rulemaker.net/ngps/Dist/${MY_P}.zip
+	doc? ( http://sandbox.rulemaker.net/ngps/Dist/${MY_P}-apidoc.zip )
+	http://sandbox.rulemaker.net/ngps/Dist/${MY_PPV}.patch"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND=">=dev-libs/openssl-0.9.7
+	>=dev-lang/swig-1.3.21
+	app-arch/unzip
+	virtual/python"
+
+PYTHON_MODNAME="M2Crypto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# apply patches
+	epatch "${DISTDIR}/${MY_PPV}.patch"
+	epatch "${FILESDIR}/${MY_P}-gentoo.patch"
+
+	# convert swig %name syntax to %rename syntax
+	# FIXME: doesn't work right now as expected. commented out for now.
+	#sed -i -e "s:^%name(\([^ ]*\))[^/]* \*\?\([^ ]\+\)(.*);.*:%rename \2 \1;:g" SWIG/*.i
+
+	# removing obsolete CVS dirs
+	rm -rf $(find -name CVS -type d)
+}
+
+src_install() {
+	DOCS="BUGS CHANGES INSTALL doc/ZServerSSL-HOWTO"
+	distutils_src_install
+	dohtml -r doc/*
+
+	if use doc; then
+		dohtml -r "${S}-doc"/*
+		cd demo && treecopy . "${D}/usr/share/doc/${PF}/example"
+	fi
+}