2 files changed, 105 insertions, 0 deletions
diff --git a/dev-python/mpi4py/files/mpi4py-1.3.1-ldshared.patch b/dev-python/mpi4py/files/mpi4py-1.3.1-ldshared.patch
new file mode 100644
index 000000000000..ae1eade0de2d
--- /dev/null
+++ b/dev-python/mpi4py/files/mpi4py-1.3.1-ldshared.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User Christoph Junghans <junghans@votca.org>
+# Date 1407773183 21600
+#      Mon Aug 11 10:06:23 2014 -0600
+# Node ID ee313041ba5d7f0706f8140b4e965179e807ef56
+# Parent  c66c1be9d40ae69aa61c45572fbe14ef3209378e
+Fix usage of LDSHARED
+
+- LDSHARED contain the linker, too
+- was used as it would only contain the options in the latter part
+- use split_linker_cmd to throw away the linker cmd
+- see https://bugs.gentoo.org/show_bug.cgi?id=514288
+
+diff -r c66c1be9d40a -r ee313041ba5d conf/mpidistutils.py
+--- a/conf/mpidistutils.py	Wed Sep 04 22:40:25 2013 +0300
++++ b/conf/mpidistutils.py	Mon Aug 11 10:06:23 2014 -0600
+@@ -176,6 +176,7 @@
+         opt        = environ.get('OPT',        opt       )
+         ccshared   = environ.get('CCSHARED', ccshared)
+         ldshared   = environ.get('LDSHARED', ldshared)
++        _, ldshared = split_linker_cmd(ldshared)
+         cflags     = ' '.join((basecflags, opt, cflags))
+         cxxflags   = ' '.join((basecflags, opt, cxxflags))
+         cxxflags = cxxflags.replace('-Wstrict-prototypes', '')
diff --git a/dev-python/mpi4py/files/mpi4py-1.3.1-py3-test-backport-1.patch b/dev-python/mpi4py/files/mpi4py-1.3.1-py3-test-backport-1.patch
new file mode 100644
index 000000000000..f92639f5be5f
--- /dev/null
+++ b/dev-python/mpi4py/files/mpi4py-1.3.1-py3-test-backport-1.patch
@@ -0,0 +1,81 @@
+ test/test_win.py | 48 +++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 37 insertions(+), 11 deletions(-)
+
+diff --git a/test/test_win.py b/test/test_win.py
+index 6da5c1f..7127e56 100644
+--- a/test/test_win.py
++++ b/test/test_win.py
+@@ -1,6 +1,30 @@
+ import sys
+ from mpi4py import MPI
+ import mpiunittest as unittest
++try:
++    from sys import getrefcount
++except ImportError:
++    class getrefcount(object):
++        def __init__(self, arg):
++            pass
++        def __eq__(self, other):
++            return True
++        def __add__(self, other):
++            return self
++        def __sub__(self, other):
++            return self
++
++def memzero(m):
++    n = len(m)
++    if n == 0: return
++    try:
++        zero = '\0'.encode('ascii')
++        m[0] = zero
++    except TypeError:
++        zero = 0
++        m[0] = zero
++    for i in range(n):
++        m[i] = zero
+ 
+ class BaseTestWin(object):
+ 
+@@ -11,29 +35,31 @@ class BaseTestWin(object):
+         try:
+             self.mpi_memory = MPI.Alloc_mem(10)
+             self.memory = self.mpi_memory
+-            try:
+-                zero = bytearray([0])
+-            except NameError:
+-                zero = str('\0')
+-            self.memory[:] = zero * len(self.memory)
++            memzero(self.memory)
+         except MPI.Exception:
+             from array import array
+             self.mpi_memory = None
+             self.memory = array('B',[0]*10)
+-        refcnt = sys.getrefcount(self.memory)
++        refcnt = getrefcount(self.memory)
+         self.WIN = MPI.Win.Create(self.memory, 1, self.INFO, self.COMM)
+         if type(self.memory).__name__ == 'buffer':
+-            self.assertEqual(sys.getrefcount(self.memory), refcnt+1)
++            self.assertEqual(getrefcount(self.memory), refcnt+1)
+         else:
+-            self.assertEqual(sys.getrefcount(self.memory), refcnt)
++            if sys.version_info[:3] < (3, 3):
++                self.assertEqual(getrefcount(self.memory), refcnt)
++            else:
++                self.assertEqual(getrefcount(self.memory), refcnt+1)
+ 
+     def tearDown(self):
+-        refcnt = sys.getrefcount(self.memory)
++        refcnt = getrefcount(self.memory)
+         self.WIN.Free()
+         if type(self.memory).__name__ == 'buffer':
+-            self.assertEqual(sys.getrefcount(self.memory), refcnt-1)
++            self.assertEqual(getrefcount(self.memory), refcnt-1)
+         else:
+-            self.assertEqual(sys.getrefcount(self.memory), refcnt)
++            if sys.version_info[:3] < (3, 3):
++                self.assertEqual(getrefcount(self.memory), refcnt)
++            else:
++                self.assertEqual(getrefcount(self.memory), refcnt-1)
+         if self.mpi_memory:
+             MPI.Free_mem(self.mpi_memory)
+