Version bump. Fixes one test-error (upstream bug: http://bugzilla.osafoundation.org/show_bug.cgi?id=11893). Added ~sh keyword wrt bug #172817).

(Portage version: 2.1.4.4)

3 files changed, 87 insertions, 2 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index 0037825d5c08..36b2c31d2727 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/m2crypto
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.30 2007/09/20 01:18:51 hawking Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.31 2008/02/24 11:34:25 dev-zero Exp $
+
+*m2crypto-0.18.2 (24 Feb 2008)
+
+  24 Feb 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/m2crypto-0.18.2-timeval_struct_size.patch, +m2crypto-0.18.2.ebuild:
+  Version bump. Fixes one test-error (upstream bug:
+  http://bugzilla.osafoundation.org/show_bug.cgi?id=11893). Added ~sh keyword
+  wrt bug #172817).
 
   20 Sep 2007; Ali Polatel <hawking@gentoo.org>
   +files/m2crypto-0.18-ssize_t.patch, -m2crypto-0.17-r1.ebuild,
diff --git a/dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch b/dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch
new file mode 100644
index 000000000000..77a4b2993c0c
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch
@@ -0,0 +1,24 @@
+--- M2Crypto/SSL/Connection.py.orig	2008-02-24 12:27:31.000000000 +0100
++++ M2Crypto/SSL/Connection.py	2008-02-24 12:28:26.000000000 +0100
+@@ -4,6 +4,8 @@
+ 
+ # Python
+ import socket
++import struct
++sizeof_timeval = struct.calcsize('ll')
+ 
+ # M2Crypto
+ from Cipher import Cipher, Cipher_Stack
+@@ -325,10 +327,10 @@
+         return m2.ssl_get_default_session_timeout(self.ssl)
+ 
+     def get_socket_read_timeout(self):
+-        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, 8))
++        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, sizeof_timeval))
+ 
+     def get_socket_write_timeout(self):
+-        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_SNDTIMEO, 8))
++        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_SNDTIMEO, sizeof_timeval))
+ 
+     def set_socket_read_timeout(self, timeo):
+         assert isinstance(timeo, timeout.timeout)
diff --git a/dev-python/m2crypto/m2crypto-0.18.2.ebuild b/dev-python/m2crypto/m2crypto-0.18.2.ebuild
new file mode 100644
index 000000000000..3e33ae34cfae
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.18.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.18.2.ebuild,v 1.1 2008/02/24 11:34:25 dev-zero Exp $
+
+inherit distutils portability eutils multilib
+
+MY_P="${PN}-${PV%.*}"
+
+DESCRIPTION="A python wrapper for the OpenSSL crypto library"
+HOMEPAGE="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
+SRC_URI="http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/openssl-0.9.8"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.25
+	doc? ( dev-python/epydoc )
+	dev-python/setuptools"
+
+PYTHON_MODNAME="M2Crypto"
+
+src_unpack() {
+	distutils_src_unpack
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-timeval_struct_size.patch"
+}
+
+src_install() {
+	DOCS="CHANGES INSTALL"
+	distutils_src_install
+
+	if use doc; then
+		cd "${S}/demo"
+		treecopy . "${D}/usr/share/doc/${PF}/example"
+
+		einfo "Generating API docs as requested..."
+		cd "${S}/doc"
+		distutils_python_version
+		export PYTHONPATH="${PYTHONPATH}:${D}/usr/$(get_libdir)/python${PYVER}/site-packages"
+		einfo "${PYTHONPATH}"
+		epydoc --html --output=api --name=M2Crypto M2Crypto
+	fi
+	dohtml -r *
+}
+
+src_test() {
+	"${python}" setup.py test || die "test failed"
+}