dev-python/numpy: Revert accidental change to patch

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=568454

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
index db4a47d4d67cc0fe29b22ed34b4d49ab10d0e029..674dbfadbf089d9a71f7a061c03e01b7b1a3dcf4 100644 (file)
--- a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
+++ b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
@@ -1,11 +1,11 @@
- numpy/distutils/system_info.py | 29 +++++------------------------
- 1 file changed, 5 insertions(+), 24 deletions(-)
+ numpy/distutils/system_info.py | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
 
 diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index d7eb49e..aa62b09 100644
+index a050430..d0878a5 100644
 --- a/numpy/distutils/system_info.py
 +++ b/numpy/distutils/system_info.py
-@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0):
+@@ -303,26 +303,7 @@ def get_info(name, notfound_action=0):
        1 - display warning message
        2 - raise error
      """
@@ -33,32 +33,3 @@ index d7eb49e..aa62b09 100644
            'fft_opt': fft_opt_info,
            'fftw': fftw_info,
            'fftw2': fftw2_info,
-@@ -1690,7 +1671,7 @@ class blas_info(system_info):
-             lib = self.has_cblas(info)
-             if lib is not None:
-                 info['language'] = 'c'
--                info['libraries'] = [lib]
-+                info['libraries'] = lib
-                 info['define_macros'] = [('HAVE_CBLAS', None)]
-         self.set_info(**info)
- 
-@@ -1722,16 +1703,16 @@ class blas_info(system_info):
-                 # check for cblas lib, and if not present check for blas lib.
-                 try:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
--                                      libraries=["cblas"],
-+                                      libraries=info["libraries"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "cblas"
-+                    res = info["libraries"]
-                 except distutils.ccompiler.LinkError:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
-                                       libraries=["blas"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "blas"
-+                    res = ["blas"]
-             except distutils.ccompiler.CompileError:
-                 res = None
-         finally: