[oe-commits] org.oe.dev python-m2crypto 0.18 update to 0.18.2 and bring back from nonworking

[mickeyl commit]

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

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 52629bff12083c0a72010e57f521eba848300afb
ViewMTN: http://monotone.openembedded.org/revision/info/52629bff12083c0a72010e57f521eba848300afb
Files:
1
packages/nonworking/python/python-m2crypto/0.13p1.patch
packages/nonworking/python/python-m2crypto
packages/python/python-m2crypto
packages/nonworking/python/python-m2crypto_0.18.bb
packages/python/python-m2crypto_0.18.2.bb
packages/python/python-m2crypto/install.patch
Diffs:

#
# mt diff -r73105a15f58b71f277a31b69e9ba0757b855e948 -r52629bff12083c0a72010e57f521eba848300afb
#
# 
# 
# delete "packages/nonworking/python/python-m2crypto/0.13p1.patch"
# 
# rename "packages/nonworking/python/python-m2crypto"
#     to "packages/python/python-m2crypto"
# 
# rename "packages/nonworking/python/python-m2crypto_0.18.bb"
#     to "packages/python/python-m2crypto_0.18.2.bb"
# 
# add_file "packages/python/python-m2crypto/install.patch"
#  content [394df2a93ef2947d73c3ba052febf357d50cf50a]
# 
# patch "packages/python/python-m2crypto_0.18.2.bb"
#  from [426bf73014b501f716bf34415a6fb360b6e762af]
#    to [5cd46ab1f120e06a7a18f33c51e0a97bb83cfe73]
# 
============================================================
--- packages/python/python-m2crypto/install.patch	394df2a93ef2947d73c3ba052febf357d50cf50a
+++ packages/python/python-m2crypto/install.patch	394df2a93ef2947d73c3ba052febf357d50cf50a
@@ -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]]
============================================================
--- packages/nonworking/python/python-m2crypto_0.18.bb	426bf73014b501f716bf34415a6fb360b6e762af
+++ packages/python/python-m2crypto_0.18.2.bb	5cd46ab1f120e06a7a18f33c51e0a97bb83cfe73
@@ -1,13 +1,18 @@ SRCNAME = "M2Crypto"
 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://sandbox.rulemaker.net/ngps/Dist/m2crypto-0.13.zip \
-	   file://0.13p1.patch;patch=1;pnum=0"
-S = "${WORKDIR}/m2crypto-0.13"
+SRC_URI = "http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-${PV}.tar.gz \
+           file://install.patch;patch=1"
+S = "${WORKDIR}/m2crypto-0.18.2"
 
-inherit distutils
+inherit setuptools
 
+export STAGING_DIR := "${STAGING_DIR}"
+export STAGING_INCDIR := "${STAGING_INCDIR}"
+export STAGING_LIBDIR := "${STAGING_LIBDIR}"
+