Update patches.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 33 insertions, 27 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/Manifest b/dev-python/m2crypto/Manifest
index e3067b27cefa..ade149314315 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0.21.1-packaging.patch 2319 SHA256 8f874cc3a87b25fc13f1ab22ece4240b7f136887050d2ab7e3c5f2adcac94bed SHA512 fdbe229cc36216c8724b1d0f45a86708af433d066a024044dfd99047f9b161532f2ab32e88aac507bbf0b7873cda417894870852c2d678d30fa284667d28828e WHIRLPOOL fbf8bd6eb2d12869cd98d7bae7ce22f367adc6c46c4eec5cbcee4d9f5b268daf647f08e9f43b4840949a704c3c73a85c98f85c48ca9757b4b5df4fd7f5bca26a
+AUX 0.21.1-packaging.patch 2299 SHA256 b18103ac19caf5d058181d7d1aa93bbd1f765377e309602870efdb50d3b2131e SHA512 a3ee4c38a0661ab84e458864798b91b434dbfd4034c0d8652d9e7360fe53bf879b4a02b1b54c96a9442f3c6c31863284f24da09e6d39bcffed2b12c05f40026f WHIRLPOOL f4256bf526c9b1d6f58edb3ebafcf0220a4d443502a26a523ec66533501098afe438784bb0c5124e64618963bdab7cdfd4192c44a71c1f153595dc3ffd8c8a34
 AUX 0.22.3-Use-swig-generated-python-loader.patch 4468 SHA256 e7e99614688bbf4ba2c596bf67bbdaefc479b36cf2375acd23380e652813bc75 SHA512 e194f67da2486d13dc0b68df993c7339e1818f773a907cb516102f3e8a1682fca24b8d2e22f1438443c7b95bf8e9d0fb52d63a74fb505c6d6b1e0e78afa798a4 WHIRLPOOL c441e785fcb2f049e2810eb5f5b1bfd4cfb2686dea8065459da2b3f2c2a66a4e7570a6e539dcf086d7bc1a5e2f54b34e348e39be6643e7cbfb1c6b854c555b51
-AUX 0.22.3-packaging.patch 2572 SHA256 5631493d85e236a6ccc8e26f31cd034edd0fd0832049f4d7aa233bc588dd990a SHA512 ddb80f45de23441e4aba04ad0cf48dc9eab46b0d5031f22e7513424dcdd0f38340c04b1da7d17446c7eea2765249f4f7d00e67e0f8d2a3fb37e10aab6aa1d8e2 WHIRLPOOL fcc9133f9d3970643dea1b27b503036eb6a09ff23d66575913a25106c92b34a353b10e6bf27952e97c83cbf0c0352ce76071a96626a10879e77b3eef71e861f6
+AUX 0.22.3-packaging.patch 2573 SHA256 8a23859c4bd1e0da96aa200f03d1a9f5ff08b1fa83b4a35399801679f5a79b75 SHA512 d98dd96dace3705f407202726cd2f4780465f23ab323b43ee3d5929b731450ba329d27dbf1bc6a3840084a392de0e85e9bd90fc45a59144659325151c7b8d253 WHIRLPOOL 479f696cc8ec65a40bc985587d69ba8f7397b81e69e08f842f31f82e8cb4d290e08444498a9fdd6b8f24df48929319e71d7333078f57af8322809dd5ab0b8093
 AUX m2crypto-0.21.1-cross-compile.patch 1437 SHA256 a63ace788d51b9b04847b6d50d83360648322edba773a0d0f375f7fa86d15cd0 SHA512 9c10f1638eb6aa891434b94d9a7d574d498ccfd4e2dc1de03692130b8700bb7c38123d07e6635755a4a9766231c9de4a17f822f44623bcdb8601f9b5f38d6cab WHIRLPOOL 1bc566f065d6809df0181bf610c8f20da59037038ea2470ffb6aa10b720ca6c5ceb0c9890f63024958d5eaf23a8b52d0556aa6a98be86a5cbaad0ec1a44163c0
 AUX m2crypto-0.22.3-cross-compile.patch 1728 SHA256 87c2046e453f1dea08e03459a946eecaa9bf876d1a18ed70c88e142e3730df99 SHA512 efb77cb16f8a63ea13b4883732736bde53dd75bfee6e2913514e3c77f50e3b26f5e615405fbee880fea70a91ff5e31ba3bc640848616e23f829c270e77080dd9 WHIRLPOOL 23051fcc7228f392752506eedf6fdd953e7d4f770a9c1528164fea9dc03cbe106c794f3d6659a35be384be5fee93bcb4fb3ca19c19f1be909ffd26463b5e5bf6
 DIST M2Crypto-0.21.1.tar.gz 413563 SHA256 25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a SHA512 b261eed84b3bda8a664c065241c2007f6443235a0fbcdd856c5a0b1f015e75662724b72a56e94aeb174414fff5c8dd71dfcb4b18f677f576ab7e30811a8adf9b WHIRLPOOL 88f184452a660cff934371d18e0065974dec3cea052cf78ef0bbecf35ed2ef6d69f8a40016f1b3fbac24fa06697b7e4c5e9e1f6afd20d30ff63fa1c22b69e8d0
@@ -13,12 +13,12 @@ EBUILD m2crypto-0.21.1-r2.ebuild 1836 SHA256 5825d819a47f76f87a57670d3d540dd1dc5
 EBUILD m2crypto-0.21.1-r3.ebuild 1424 SHA256 875a0e6c2d6085eb8af56a30f7fed3abbfeb6d1103f5ef8ede28e4e9dad6a49b SHA512 0333d2bc840409dcd81e04f7489ec6f548f5937e8d2e14dca917ff88d75032fa12ec4988e1a5e01479bd36cd1bf82e9d307363386f4268d7b95781a3439329f5 WHIRLPOOL 31dcba95b622c1aadd6df6895c7f03fdacfc18ee6da0e1d505350d11ac59e718cdde547372be86e5fff83dc4678ae65fbda2f39e2fed51b135a9a9e2d025e4dc
 EBUILD m2crypto-0.22.3-r3.ebuild 1461 SHA256 298d6f4d78973822ba14b86d44dd9e05b995103347d3cd6194414095eaab7bfe SHA512 dd05d935b16d6fa7073996765259bd9b4c19eb974626aafeb71298feb5fc8a7738035f362f2a7fa73ed87b7519033a856afa1071671d60b7cc92becc5590deda WHIRLPOOL a5b2a2a090194adc5aad2ebba54d5ceb361b3c0925a2147cea3e2b85a7de9c1552e9672a0e5a685d714504f21d99a9c98d13a6141f057d57f17080c539f998bc
 EBUILD m2crypto-0.22.3-r4.ebuild 1136 SHA256 49c1d1de28b06d5db89570a3c87cb7b2012e1a68de664e03819e838cac2044d0 SHA512 c0a0c31ff434bb1352c2e322e22e48b715983cc6ca57cd93aba6199040fd10f31d3d6dc7a817f1adb51810beb72a61563fa7daff3d7d3420939e976023d33f85 WHIRLPOOL 48d88b527a1b932259565bda59697e5bb5ecd6e1d67eb3254ea633ae5601e86b6969511f115026682002817897e3694aa4203dbe0303ccdcb6775a41df8f8300
-MISC ChangeLog 13175 SHA256 f6d21bf63bcb718488cb2301114cee7e7dad319945a961e25aacdce7f3816e06 SHA512 48660adfb08eb666ac257a9eb6ffc48b6c4002d93d8f049db5fb7136a4bc8087a202ce425f515fe88a3f7bc5559c2766995ae6d5a506ab49586c1567fbb0d978 WHIRLPOOL 2fbf363f598f6ef4e921ba256614a76972fd488ad9d0b22f9d57eb3c22e46084d495622d035e4dcb3167779f1f35f9ba212754451fe6eea4644d169f6848ccd1
+MISC ChangeLog 13305 SHA256 6a48293ebe8b1029516f00eb90a5cce794f04ff4ca5603872a9b4b7ffa3ae7cc SHA512 aa6e49fb792ef28ae1194f82340e38b9745dc69ffcd33f886afbce006a75bd516acadce36145b3ccece35ddc8ad54344a742b25be956b32eaa1b6b17e805ff02 WHIRLPOOL 879ebac58caeabf749093117f69a52fe5e73eb4399bbf40de57dbf1ff1ccd35d9e7c02aec3ea0881478b1b58af95327644e7f653d5f3033b4db6e5bda24e6331
 MISC metadata.xml 231 SHA256 4b3c3ef12b8947ff65c09c0c6bbeda5e9837776cbd593d20951d4fca97b38fc8 SHA512 70d64f2f5642ac485ed4b1ab58e307485d3bbe417edaab9c0cfc6ca1ad56de0b26b350b439bff4ac3d8d4c432df4b086f24f715a1ce631b8231bcd5cb9938561 WHIRLPOOL 59674c4927ea7a1df761e8ff83a04cafa8fc07973491a2c2e033e5afc2dead61366f0f66c8b14290b9e0652af24a8a0919753f8020e8a510ce1bbe4395165ae2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVk9PoACgkQC77qH+pIQ6SpEgEAsWcuq+xq4E37AaDnxRWUKevy
-0VaNSxy5Jw7HbonvaFgA/R+67iMLCf54xT1X99nnVg2hvkqPctbO3cgwUDfeQfmZ
-=Eghh
+iF4EAREIAAYFAlVmC5kACgkQC77qH+pIQ6QhegD9HbHaDfOwe9ZOh17ZGQBvzztt
+n3jMYeHsJ/BR3ZMRgaQA/jwPH/mg3mQKiN9LXAAZQ7vOgxT3gRVSzob3gN2u9Wgb
+=G0Hj
 -----END PGP SIGNATURE-----
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