Resolve issues with swig-3.0.5, bug 538920.

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

5 files changed, 265 insertions, 15 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index b7af49ecc4d6..c608a78baa2e 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,13 @@
 # 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.85 2015/05/15 09:03:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.86 2015/05/25 16:41:54 floppym Exp $
+
+*m2crypto-0.22.3-r4 (25 May 2015)
+
+  25 May 2015; Mike Gilbert <floppym@gentoo.org>
+  +files/0.22.3-Use-swig-generated-python-loader.patch,
+  +files/0.22.3-packaging.patch, +m2crypto-0.22.3-r4.ebuild:
+  Resolve issues with swig-3.0.5, bug 538920.
 
   15 May 2015; Mike Frysinger <vapier@gentoo.org>
   +files/m2crypto-0.21.1-cross-compile.patch,
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index f37aa964abd2..7b702b7d1597 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,28 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+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 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
 DIST M2Crypto-0.22.3.tar.gz 74795 SHA256 6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72 SHA512 c179d3cf03ced77aed24285ca3f1527d5e05bbfe091a1522bff94a940fd390213fbb9b83d7ccd43ceae49626b427ae8790782cf93ead85be1e063bc4121c62e0 WHIRLPOOL 66a9a6e7c9b195814048a1bcecf6ef71a269bebb9dbda73801c88b3ba27330b555a46d05c53bbd0778f9c1e1bb5f9c6e7e860de443bf16baffc2072ee5996e31
 EBUILD m2crypto-0.21.1-r2.ebuild 1836 SHA256 5825d819a47f76f87a57670d3d540dd1dc55a6e58c045c649d9c0d43f1101805 SHA512 d7eead603d859425eb56dc687d7125c7008cbbc7cdfcb537ed17ec84b293bfb81be8298394920a97854982bc94747488277aa9e01de25e4f07cf904c724e081c WHIRLPOOL 4b442a936f0447a929f32579c0a6ec8a7021a895143eda48c3785fb1af5175d9c25378394f6f17e586bc8d01b6b66bc9ba2cc78541e8c47b1c9a1ed94225c836
 EBUILD m2crypto-0.22.3-r3.ebuild 1476 SHA256 93114f60c723983f4a2d4cebaf429218c8aef4048426923b735f6b8d537b09a2 SHA512 6fdac59e390a5f622d530e834271a81b4e026b20b3404c652d59c99ff2c890d7f4cfc11b960dcd0e4ac3f7b89c8e290ac12901acb8eba8f090d5da13ead8a78c WHIRLPOOL c1ed113f3c3ad44e53e9423fb45e7887351ce2577e1c992b4cc174b29d02d4153f9b86c2f174b8399a3b4f8f1a5323967247b0e408a66d955a2344b3b4063929
-MISC ChangeLog 11751 SHA256 b13063767bb4bf7bebe469338b4c46e2d4e0d3b0c4cd5ccded29d19bd055337b SHA512 b9cf7e0c3edd7e6921c2b92dc94c25211f483a27253c0f97efc91c22b37f27644aa58685a5c6458f6f77645f0a878c42a04c353fc28c445295a85034a3479950 WHIRLPOOL 0352cdb1bf81307fe70eb7da6ab8049d8b0aedefad807b62d9a8144c136dc6ccbd32b9292988f34088e22b744d76dc5714dedfc4a2cd3f6132616b5d7b241d84
+EBUILD m2crypto-0.22.3-r4.ebuild 1263 SHA256 11e715a716ea0e30f0da4aaffc72c39c5f0bb7bcbfa474229256b06b805ce72b SHA512 150d31cdd98759905259869725cc98a2f932f7e782b95a05e70c4a777fa44c7f13fa6f6bcdae4b8abd6eb045b6d074aef2adb20806d0404c436fcb41be447df2 WHIRLPOOL 595595d9a3a18e8d65f538f8a4de65ef64b912af2d3f240812330953fe961124ef305450173260ad7f52cd1a85a3991306035b0998ba57eb9d60618d04357c9a
+MISC ChangeLog 12000 SHA256 bef836dfc52d18387eb167219fd9a2b53bd50ec29732f18b81af2fbae4e1814f SHA512 848de2b17608498a8c9836543523e081541e9b58a5169dee6098916a3d4755382e2440cc8fcf23df188417286add64c256deafe8d32591405e29d074b8d88732 WHIRLPOOL d3278857a84b14235bdb1b5d87dafe2d7799cf87b73680ce2924e227e5fe38408bb0599874516897d855aab12ee3af80d38032e29b0d28ba3c4c0b40bf76e6be
 MISC metadata.xml 231 SHA256 4b3c3ef12b8947ff65c09c0c6bbeda5e9837776cbd593d20951d4fca97b38fc8 SHA512 70d64f2f5642ac485ed4b1ab58e307485d3bbe417edaab9c0cfc6ca1ad56de0b26b350b439bff4ac3d8d4c432df4b086f24f715a1ce631b8231bcd5cb9938561 WHIRLPOOL 59674c4927ea7a1df761e8ff83a04cafa8fc07973491a2c2e033e5afc2dead61366f0f66c8b14290b9e0652af24a8a0919753f8020e8a510ce1bbe4395165ae2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVVbZkAAoJEPGu1DbS6WIALKUP/3eqIQh9YT+AQLAqRX0kfMW6
-Yfn/YjdAqsAHmr831gfIcDg91kr8ZiNoHhjOM1TArA7GORsXf93YPXpqlqyPFCDJ
-ympO22VaDmvKMzdfRjyngBjTED1913fgkNcY7sEnFngRMrjXNwZn9eBq46ZDkxiR
-6SzztuhImv/GI8hy1M7LOtH2gu1s1cRikruJcFq+v4voZ8YSGLZkIirZNKliAyaO
-LlQ0tt0gr/SL9ha/H5nsZ2q7ZAWkkWbgS5Jg1gsUTPiJrr4vyVzUs9GBcU8pGiXQ
-hFkbG8t/7ir+RwKCEDgg8Oq51SIi/x7vpYHSyDfEvS6YHbldhVm46z1dQfG++cI/
-3O3xgA/gPgfWgXWDb8XZsBnDoO5mvfItc5PbeORrr4a+bzJuJsWQSuGqoz2Kwg9t
-4pLxyM00BLjTUOMfqvapV1YpCjgSpuWz398pe5Xraeg9WjT/io+ED20flzm+QqBt
-fgxHRWkrWsmRt8VJJwyUdDoPyUIzAywl5txhMIeUzKRYb11D9hnHXHVMV12aOQ+F
-hRYdB4R7kT2vziK94kklAgAtPkxJcXMVtu4Kdt8c8nVwyJKvPaIDgAaGkDYifGey
-7vlFTjo0XlsHvF2xo4jphdCj4zW1OhxL1Z2j2p1PdWw7jxyNJiKu+JpNfEmknPf4
-mLM7QtnXDAiXNZMOlZtW
-=SMUs
+iF4EAREIAAYFAlVjUNQACgkQC77qH+pIQ6SFqgD/fT2AOxVyCJg6nyz4iM6Ry5RQ
+iO5exXF9IbQ4zvBGVaIBAKf1Wr4pIGhOKXUrg6VIA96c6g/P1RScgiXDpNR3PDkg
+=HAdF
 -----END PGP SIGNATURE-----
diff --git a/dev-python/m2crypto/files/0.22.3-Use-swig-generated-python-loader.patch b/dev-python/m2crypto/files/0.22.3-Use-swig-generated-python-loader.patch
new file mode 100644
index 000000000000..9ddd5509fdf6
--- /dev/null
+++ b/dev-python/m2crypto/files/0.22.3-Use-swig-generated-python-loader.patch
@@ -0,0 +1,138 @@
+From 803188070e486030cb1d2e53692b39305c742b17 Mon Sep 17 00:00:00 2001
+From: Joe Julian <jjulian@io.com>
+Date: Tue, 19 May 2015 23:54:08 -0700
+Subject: [PATCH] Use swig generated python loader
+
+---
+ .gitignore           |  6 +++++-
+ M2Crypto/__init__.py |  4 ++--
+ M2Crypto/m2.py       |  4 +---
+ SWIG/_m2crypto.def   |  2 +-
+ SWIG/_m2crypto.i     |  2 +-
+ setup.py             | 25 +++++++++++++++++++++----
+ 6 files changed, 31 insertions(+), 12 deletions(-)
+
+diff --git a/M2Crypto/__init__.py b/M2Crypto/__init__.py
+index 647e057..38dbbd5 100644
+--- a/M2Crypto/__init__.py
++++ b/M2Crypto/__init__.py
+@@ -19,7 +19,7 @@ Copyright 2008-2011 Heikki Toivonen. All rights reserved.
+ version_info = (0, 22)
+ version = '.'.join([str(_v) for _v in version_info])
+ 
+-import __m2crypto
++import m2crypto
+ import m2
+ import ASN1
+ import AuthCookie
+@@ -47,4 +47,4 @@ import m2xmlrpclib
+ import threading
+ import util
+ 
+-__m2crypto.lib_init()
++m2crypto.lib_init()
+diff --git a/M2Crypto/m2.py b/M2Crypto/m2.py
+index e4bb695..516cadb 100644
+--- a/M2Crypto/m2.py
++++ b/M2Crypto/m2.py
+@@ -25,7 +25,5 @@ Portions created by Open Source Applications Foundation (OSAF) are
+ Copyright (C) 2004 OSAF. All Rights Reserved.
+ """
+ 
+-from __m2crypto import *
++from m2crypto import *
+ lib_init()
+-
+-
+diff --git a/SWIG/_m2crypto.def b/SWIG/_m2crypto.def
+index 753db2c..3e9d5bc 100644
+--- a/SWIG/_m2crypto.def
++++ b/SWIG/_m2crypto.def
+@@ -1,2 +1,2 @@
+ EXPORTS

+-init__m2crypto
++init_m2crypto
+diff --git a/SWIG/_m2crypto.i b/SWIG/_m2crypto.i
+index 50be5c3..e491222 100644
+--- a/SWIG/_m2crypto.i
++++ b/SWIG/_m2crypto.i
+@@ -8,7 +8,7 @@
+  *
+  */
+ 
+-%module(threads=1) _m2crypto
++%module(threads=1) m2crypto
+ /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.
+    Disable threadallow as well, only enable it for operations likely to
+    block. */
+diff --git a/setup.py b/setup.py
+index bac6f9f..fc89513 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,9 +17,22 @@ import os, sys, platform
+ from setuptools import setup
+ from setuptools.command import build_ext
+ 
++from distutils.util import get_platform
+ from distutils.core import Extension
+ from distutils.spawn import find_executable
+ 
++from distutils.command.build import build
++from setuptools.command.install import install
++
++class CustomBuild(build):
++    def run(self):
++        self.run_command('build_ext')
++        build.run(self)
++
++class CustomInstall(install):
++    def run(self):
++        self.run_command('build_ext')
++        self.do_egg_install()
+ 
+ class _M2CryptoBuildExt(build_ext.build_ext):
+     '''Specialization of build_ext to enable swig_opts to inherit any
+@@ -70,11 +83,12 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+ 
+         self.add_multiarch_paths()
+ 
+-        opensslIncludeDir = os.path.join(self.openssl, 'include')
++        includeDir = os.path.join(self.openssl, 'include')
++        opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+ 
+         self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]]
++                          [opensslIncludeDir, includeDir]]
+         self.swig_opts.append('-includeall')
+         self.swig_opts.append('-modern')
+ 
+@@ -85,6 +99,9 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             elif platform.architecture()[0] == '32bit':
+                 self.swig_opts.append('-D__i386__')
+ 
++        self.swig_opts.append('-outdir')
++        self.swig_opts.append(os.path.join(os.getcwd(),'M2Crypto'))
++
+         self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+                               os.path.join(os.getcwd(), 'SWIG')]
+ 
+@@ -103,7 +120,7 @@ if sys.platform == 'darwin':
+ else:
+    my_extra_compile_args = []
+ 
+-m2crypto = Extension(name = 'M2Crypto.__m2crypto',
++m2crypto = Extension(name = 'M2Crypto._m2crypto',
+                      sources = ['SWIG/_m2crypto.i'],
+                      extra_compile_args = ['-DTHREADING'] + my_extra_compile_args,
+                      #extra_link_args = ['-Wl,-search_paths_first'], # Uncomment to build Universal Mac binaries
+@@ -145,5 +162,5 @@ interface.''',
+ 
+       ext_modules = [m2crypto],
+       test_suite='tests.alltests.suite',
+-      cmdclass = {'build_ext': _M2CryptoBuildExt}
++      cmdclass = {'build': CustomBuild, 'install': CustomInstall, '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
new file mode 100644
index 000000000000..54a4b560aba3
--- /dev/null
+++ b/dev-python/m2crypto/files/0.22.3-packaging.patch
@@ -0,0 +1,68 @@
+From d307a38515c5d050bbf8555d79aff3e4ce78af78 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
+--- a/setup.py
++++ b/setup.py
+@@ -81,29 +81,19 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+ 
+         build_ext.build_ext.finalize_options(self)
+ 
+-        self.add_multiarch_paths()
+-
+         includeDir = os.path.join(self.openssl, 'include')
+         opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+ 
+-        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir, includeDir]]
++        eprefix = os.getenv('EPREFIX', '')
++        self.swig_opts = ['-I' + eprefix + '/usr/include']
+         self.swig_opts.append('-includeall')
+         self.swig_opts.append('-modern')
+ 
+-        # Fedora does hat tricks.
+-        if platform.linux_distribution()[0] in ['Fedora', 'CentOS']:
+-            if platform.architecture()[0] == '64bit':
+-                self.swig_opts.append('-D__x86_64__')
+-            elif platform.architecture()[0] == '32bit':
+-                self.swig_opts.append('-D__i386__')
+-
+         self.swig_opts.append('-outdir')
+         self.swig_opts.append(os.path.join(os.getcwd(),'M2Crypto'))
+ 
+-        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+-                              os.path.join(os.getcwd(), 'SWIG')]
++        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
+ 
+         if sys.platform == 'cygwin':
+             # Cygwin SHOULD work (there's code in distutils), but
+@@ -113,8 +103,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             # Someday distutils will be fixed and this won't be needed.
+             self.library_dirs += [os.path.join(self.openssl, 'bin')]
+ 
+-        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
+-
+ 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
+
diff --git a/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild b/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild
new file mode 100644
index 000000000000..7df88adddb9b
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild,v 1.1 2015/05/25 16:41:54 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+# swig-3.0.5 results in broken constants, #538920
+RDEPEND=">=dev-libs/openssl-0.9.8:0="
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/0.22.3-Use-swig-generated-python-loader.patch
+	epatch "${FILESDIR}"/0.22.3-packaging.patch
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}