Update patches.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 27 insertions, 21 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index 3d9dcc42c5e6..b1f70ffaa75c 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.92 2015/05/26 22:34:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.93 2015/05/27 18:23:20 floppym Exp $
+
+  27 May 2015; Mike Gilbert <floppym@gentoo.org> files/0.21.1-packaging.patch,
+  files/0.22.3-packaging.patch:
+  Update patches.
 
   26 May 2015; Mike Gilbert <floppym@gentoo.org> m2crypto-0.21.1-r3.ebuild,
   m2crypto-0.22.3-r4.ebuild:
diff --git a/dev-python/m2crypto/files/0.21.1-packaging.patch b/dev-python/m2crypto/files/0.21.1-packaging.patch
index 0ea16fbd9096..9c72ba5f6700 100644
--- a/dev-python/m2crypto/files/0.21.1-packaging.patch
+++ b/dev-python/m2crypto/files/0.21.1-packaging.patch
@@ -1,19 +1,27 @@
-From 017d82b1f17446f38339589e25e9aba98f87f9f4 Mon Sep 17 00:00:00 2001
+From beb9c8df2e9cb79fcb1fd2a6ad6e43fff267c726 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Mon, 25 May 2015 13:09:35 -0400
 Subject: [PATCH] Gentoo-specific packaging fixes
 
 Fix cross-compiles
 EPREFIX support
-Revert custom build and install classes
 ---
  setup.py | 11 ++++-------
  1 file changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 0967216..bca474a 100644
+index 0967216..640e019 100644
 --- a/setup.py
 +++ b/setup.py
+@@ -33,7 +33,7 @@ class CustomBuild(build):
+ class CustomInstall(install):
+     def run(self):
+         self.run_command('build_ext')
+-        self.do_egg_install()
++        install.run(self)
+ 
+ class _M2CryptoBuildExt(build_ext.build_ext):
+     '''Specialization of build_ext to enable swig_opts to inherit any 
 @@ -66,8 +66,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
          opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
          opensslLibraryDir = os.path.join(self.openssl, 'lib')
@@ -44,13 +52,6 @@ index 0967216..bca474a 100644
  
  if sys.version_info < (2,4):
  
-@@ -182,5 +179,5 @@ used to provide SSL for Twisted.''',
- 
-       ext_modules = [m2crypto],
-       test_suite='tests.alltests.suite',
--      cmdclass = {'build': CustomBuild, 'install': CustomInstall, 'build_ext': _M2CryptoBuildExt}
-+      cmdclass = {'build_ext': _M2CryptoBuildExt}
-       )
 -- 
 2.4.1
 
diff --git a/dev-python/m2crypto/files/0.22.3-packaging.patch b/dev-python/m2crypto/files/0.22.3-packaging.patch
index 54a4b560aba3..26952a4e78e8 100644
--- a/dev-python/m2crypto/files/0.22.3-packaging.patch
+++ b/dev-python/m2crypto/files/0.22.3-packaging.patch
@@ -1,19 +1,27 @@
-From d307a38515c5d050bbf8555d79aff3e4ce78af78 Mon Sep 17 00:00:00 2001
+From 0f2c82f097cf6d3722b7793fe1159160f3f52725 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Mon, 25 May 2015 12:08:47 -0400
 Subject: [PATCH] Gentoo-specific packaging fixes
 
 Fix cross-compiles
 EPREFIX support
-Revert custom build and install classes
 ---
  setup.py | 20 ++++----------------
  1 file changed, 4 insertions(+), 16 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index fc89513..806464f 100644
+index fc89513..8360e7e 100644
 --- a/setup.py
 +++ b/setup.py
+@@ -32,7 +32,7 @@ class CustomBuild(build):
+ class CustomInstall(install):
+     def run(self):
+         self.run_command('build_ext')
+-        self.do_egg_install()
++        install.run(self)
+ 
+ class _M2CryptoBuildExt(build_ext.build_ext):
+     '''Specialization of build_ext to enable swig_opts to inherit any
 @@ -81,29 +81,19 @@ class _M2CryptoBuildExt(build_ext.build_ext):
  
          build_ext.build_ext.finalize_options(self)
@@ -56,13 +64,6 @@ index fc89513..806464f 100644
  if sys.platform == 'darwin':
     my_extra_compile_args = ["-Wno-deprecated-declarations"]
  else:
-@@ -162,5 +150,5 @@ interface.''',
- 
-       ext_modules = [m2crypto],
-       test_suite='tests.alltests.suite',
--      cmdclass = {'build': CustomBuild, 'install': CustomInstall, 'build_ext': _M2CryptoBuildExt}
-+      cmdclass = {'build_ext': _M2CryptoBuildExt}
-       )
 -- 
 2.4.1