| 1 |
floppym 15/05/27 18:23:20 |
| 2 |
|
| 3 |
Modified: 0.22.3-packaging.patch 0.21.1-packaging.patch |
| 4 |
Log: |
| 5 |
Update patches. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/m2crypto/files/0.22.3-packaging.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/m2crypto/files/0.22.3-packaging.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/m2crypto/files/0.22.3-packaging.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/m2crypto/files/0.22.3-packaging.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: 0.22.3-packaging.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/m2crypto/files/0.22.3-packaging.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- 0.22.3-packaging.patch 25 May 2015 16:41:54 -0000 1.1 |
| 23 |
+++ 0.22.3-packaging.patch 27 May 2015 18:23:20 -0000 1.2 |
| 24 |
@@ -1,19 +1,27 @@ |
| 25 |
-From d307a38515c5d050bbf8555d79aff3e4ce78af78 Mon Sep 17 00:00:00 2001 |
| 26 |
+From 0f2c82f097cf6d3722b7793fe1159160f3f52725 Mon Sep 17 00:00:00 2001 |
| 27 |
From: Mike Gilbert <floppym@g.o> |
| 28 |
Date: Mon, 25 May 2015 12:08:47 -0400 |
| 29 |
Subject: [PATCH] Gentoo-specific packaging fixes |
| 30 |
|
| 31 |
Fix cross-compiles |
| 32 |
EPREFIX support |
| 33 |
-Revert custom build and install classes |
| 34 |
--- |
| 35 |
setup.py | 20 ++++---------------- |
| 36 |
1 file changed, 4 insertions(+), 16 deletions(-) |
| 37 |
|
| 38 |
diff --git a/setup.py b/setup.py |
| 39 |
-index fc89513..806464f 100644 |
| 40 |
+index fc89513..8360e7e 100644 |
| 41 |
--- a/setup.py |
| 42 |
+++ b/setup.py |
| 43 |
+@@ -32,7 +32,7 @@ class CustomBuild(build): |
| 44 |
+ class CustomInstall(install): |
| 45 |
+ def run(self): |
| 46 |
+ self.run_command('build_ext') |
| 47 |
+- self.do_egg_install() |
| 48 |
++ install.run(self) |
| 49 |
+ |
| 50 |
+ class _M2CryptoBuildExt(build_ext.build_ext): |
| 51 |
+ '''Specialization of build_ext to enable swig_opts to inherit any |
| 52 |
@@ -81,29 +81,19 @@ class _M2CryptoBuildExt(build_ext.build_ext): |
| 53 |
|
| 54 |
build_ext.build_ext.finalize_options(self) |
| 55 |
@@ -56,13 +64,6 @@ |
| 56 |
if sys.platform == 'darwin': |
| 57 |
my_extra_compile_args = ["-Wno-deprecated-declarations"] |
| 58 |
else: |
| 59 |
-@@ -162,5 +150,5 @@ interface.''', |
| 60 |
- |
| 61 |
- ext_modules = [m2crypto], |
| 62 |
- test_suite='tests.alltests.suite', |
| 63 |
-- cmdclass = {'build': CustomBuild, 'install': CustomInstall, 'build_ext': _M2CryptoBuildExt} |
| 64 |
-+ cmdclass = {'build_ext': _M2CryptoBuildExt} |
| 65 |
- ) |
| 66 |
-- |
| 67 |
2.4.1 |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.2 dev-python/m2crypto/files/0.21.1-packaging.patch |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/m2crypto/files/0.21.1-packaging.patch?rev=1.2&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/m2crypto/files/0.21.1-packaging.patch?rev=1.2&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/m2crypto/files/0.21.1-packaging.patch?r1=1.1&r2=1.2 |
| 77 |
|
| 78 |
Index: 0.21.1-packaging.patch |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/m2crypto/files/0.21.1-packaging.patch,v |
| 81 |
retrieving revision 1.1 |
| 82 |
retrieving revision 1.2 |
| 83 |
diff -u -r1.1 -r1.2 |
| 84 |
--- 0.21.1-packaging.patch 25 May 2015 17:16:54 -0000 1.1 |
| 85 |
+++ 0.21.1-packaging.patch 27 May 2015 18:23:20 -0000 1.2 |
| 86 |
@@ -1,19 +1,27 @@ |
| 87 |
-From 017d82b1f17446f38339589e25e9aba98f87f9f4 Mon Sep 17 00:00:00 2001 |
| 88 |
+From beb9c8df2e9cb79fcb1fd2a6ad6e43fff267c726 Mon Sep 17 00:00:00 2001 |
| 89 |
From: Mike Gilbert <floppym@g.o> |
| 90 |
Date: Mon, 25 May 2015 13:09:35 -0400 |
| 91 |
Subject: [PATCH] Gentoo-specific packaging fixes |
| 92 |
|
| 93 |
Fix cross-compiles |
| 94 |
EPREFIX support |
| 95 |
-Revert custom build and install classes |
| 96 |
--- |
| 97 |
setup.py | 11 ++++------- |
| 98 |
1 file changed, 4 insertions(+), 7 deletions(-) |
| 99 |
|
| 100 |
diff --git a/setup.py b/setup.py |
| 101 |
-index 0967216..bca474a 100644 |
| 102 |
+index 0967216..640e019 100644 |
| 103 |
--- a/setup.py |
| 104 |
+++ b/setup.py |
| 105 |
+@@ -33,7 +33,7 @@ class CustomBuild(build): |
| 106 |
+ class CustomInstall(install): |
| 107 |
+ def run(self): |
| 108 |
+ self.run_command('build_ext') |
| 109 |
+- self.do_egg_install() |
| 110 |
++ install.run(self) |
| 111 |
+ |
| 112 |
+ class _M2CryptoBuildExt(build_ext.build_ext): |
| 113 |
+ '''Specialization of build_ext to enable swig_opts to inherit any |
| 114 |
@@ -66,8 +66,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): |
| 115 |
opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl') |
| 116 |
opensslLibraryDir = os.path.join(self.openssl, 'lib') |
| 117 |
@@ -44,13 +52,6 @@ |
| 118 |
|
| 119 |
if sys.version_info < (2,4): |
| 120 |
|
| 121 |
-@@ -182,5 +179,5 @@ used to provide SSL for Twisted.''', |
| 122 |
- |
| 123 |
- ext_modules = [m2crypto], |
| 124 |
- test_suite='tests.alltests.suite', |
| 125 |
-- cmdclass = {'build': CustomBuild, 'install': CustomInstall, 'build_ext': _M2CryptoBuildExt} |
| 126 |
-+ cmdclass = {'build_ext': _M2CryptoBuildExt} |
| 127 |
- ) |
| 128 |
-- |
| 129 |
2.4.1 |
Archives