python-m2crypto 0.18 update to 0.18.2 and bring back from nonworking

5 files changed, 42 insertions, 55 deletions

diff --git a/packages/nonworking/python/python-m2crypto/0.13p1.patch b/packages/nonworking/python/python-m2crypto/0.13p1.patch
deleted file mode 100644
index ad359185e6..0000000000
--- a/packages/nonworking/python/python-m2crypto/0.13p1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- M2Crypto/SSL/Connection.py.org	Wed Mar 31 08:49:57 2004
-+++ M2Crypto/SSL/Connection.py	Wed Mar 31 08:50:45 2004
-@@ -143,11 +143,11 @@
-         """Set this connection's underlying socket to _mode_."""
-         self.socket.setblocking(mode)
-         if mode:
--            self.send = self.write = self._write_bio
--            self.recv = self.read = self._read_bio
-+            self.send = self.write = Connection._write_bio
-+            self.recv = self.read = Connection._read_bio
-         else:
--            self.send = self.write = self._write_nbio
--            self.recv = self.read = self._read_nbio
-+            self.send = self.write = Connection._write_nbio
-+            self.recv = self.read = Connection._read_nbio
- 
-     def fileno(self):
-         return self.socket.fileno()
---- M2Crypto/DSA.py.org	Wed Mar 31 08:53:16 2004
-+++ M2Crypto/DSA.py	Wed Mar 31 08:53:35 2004
-@@ -35,7 +35,7 @@
- 
-     def __getattr__(self, name):
-         if name in ['p', 'q', 'g', 'pub', 'priv']:
--            method = getattr(m2, 'm2.dsa_get_%s' % (name,))
-+            method = getattr(m2, 'dsa_get_%s' % (name,))
-             assert m2.dsa_type_check(self.dsa), "'dsa' type error"
-             return method(self.dsa)
-         else:
---- M2Crypto/_version.py.org	Wed Mar 31 12:25:21 2004
-+++ M2Crypto/_version.py	Wed Mar 31 12:24:18 2004
-@@ -1,8 +1,8 @@
- """M2Crypto Version Info"""
- 
--RCS_id='$Id: _version.py,v 1.2 2004/03/25 06:33:29 ngps Exp $'
-+RCS_id='$Id: _version.py,v 1.3 2004/03/31 01:30:58 ngps Exp $'
- 
- import string
--version_info = (0, 13)
-+version_info = (0, 13, 1)
- version = string.join(map(lambda x: "%s" % x, version_info), ".")
- 
diff --git a/packages/nonworking/python/python-m2crypto_0.18.bb b/packages/nonworking/python/python-m2crypto_0.18.bb
deleted file mode 100644
index 009345e5a0..0000000000
--- a/packages/nonworking/python/python-m2crypto_0.18.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "A Python crypto and SSL toolkit"
-SECTION = "devel/python"
-PRIORITY = "optional"
-DEPENDS = "openssl swig-native"
-LICENSE = "BSD"
-SRCNAME = "M2Crypto"
-
-SRC_URI = "http://sandbox.rulemaker.net/ngps/Dist/m2crypto-0.13.zip \
-	   file://0.13p1.patch;patch=1;pnum=0"
-S = "${WORKDIR}/m2crypto-0.13"
-
-inherit distutils
-
diff --git a/packages/nonworking/python/python-m2crypto/.mtn2git_empty b/packages/python/python-m2crypto/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/python/python-m2crypto/.mtn2git_empty
+++ b/packages/python/python-m2crypto/.mtn2git_empty
diff --git a/packages/python/python-m2crypto/install.patch b/packages/python/python-m2crypto/install.patch
new file mode 100644
index 0000000000..6c70ccf516
--- /dev/null
+++ b/packages/python/python-m2crypto/install.patch
@@ -0,0 +1,24 @@
+Index: m2crypto-0.18.2/setup.py
+===================================================================
+--- m2crypto-0.18.2.orig/setup.py
++++ m2crypto-0.18.2/setup.py
+@@ -38,7 +38,7 @@ class _M2CryptoBuildExt(build_ext.build_
+             self.openssl = 'c:\\pkg'
+         else:
+             self.libraries = ['ssl', 'crypto']
+-            self.openssl = '/usr'
++            self.openssl = os.environ.get( "STAGING_DIR" )
+        
+     
+     def finalize_options(self):
+@@ -47,8 +47,8 @@ class _M2CryptoBuildExt(build_ext.build_
+ 
+         build_ext.build_ext.finalize_options(self)
+ 
+-        opensslIncludeDir = os.path.join(self.openssl, 'include')
+-        opensslLibraryDir = os.path.join(self.openssl, 'lib')
++        opensslIncludeDir = os.environ.get( "STAGING_INCDIR" )
++        opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" )
+         
+         self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+                           [opensslIncludeDir]]
diff --git a/packages/python/python-m2crypto_0.18.2.bb b/packages/python/python-m2crypto_0.18.2.bb
new file mode 100644
index 0000000000..c83a2ec076
--- /dev/null
+++ b/packages/python/python-m2crypto_0.18.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A Python crypto and SSL toolkit"
+SECTION = "devel/python"
+PRIORITY = "optional"
+DEPENDS = "openssl swig-native"
+LICENSE = "BSD"
+SRCNAME = "M2Crypto"
+PR = "ml0"
+
+SRC_URI = "http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-${PV}.tar.gz \
+           file://install.patch;patch=1"
+S = "${WORKDIR}/m2crypto-0.18.2"
+
+inherit setuptools
+
+export STAGING_DIR := "${STAGING_DIR}"
+export STAGING_INCDIR := "${STAGING_INCDIR}"
+export STAGING_LIBDIR := "${STAGING_LIBDIR}"
+