gentoo auto-resync : 25:10:2022 - 15:53:58

2 files changed, 0 insertions, 102 deletions

diff --git a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
deleted file mode 100644
index 73c5cae90d00..000000000000
--- a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python/numpy/files?id=e5ce90a04e79f6413604e96e4803cb95ada7c859
-https://bugs.gentoo.org/567938
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index 82e864a5c..1d77e5854 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -501,33 +501,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'flame': flame_info,          # use lapack_opt instead
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'accelerate': accelerate_info,      # use blas_opt instead
--          'openblas64_': openblas64__info,
--          'openblas64__lapack': openblas64__lapack_info,
--          'openblas_ilp64': openblas_ilp64_info,
--          'openblas_ilp64_lapack': openblas_ilp64_lapack_info,
-+    cl = {'flame': flame_info,          # use lapack_opt instead
-           'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-@@ -947,10 +921,7 @@ def get_libs(self, key, default):
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         c = customized_ccompiler()
diff --git a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch b/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch
deleted file mode 100644
index 6a31d2efe970..000000000000
--- a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/numpy/numpy/commit/689d905f501b7abbddf0fdef241fa586a83e5cd6
-https://github.com/numpy/numpy/pull/20116
-https://bugs.gentoo.org/802150
-
-From 7dcf62379f41407d8f9583d1c2016e3d8ec48384 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Thu, 14 Oct 2021 14:58:52 +0900
-Subject: [PATCH] MAINT: Fix issue with C compiler args containing spaces
-
-Instead of doing a dumb string split, use shlex to make sure args
-containing spaces are handled properly.
----
- numpy/distutils/unixccompiler.py | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
-index 733a9fc5094..4884960fdf2 100644
---- a/numpy/distutils/unixccompiler.py
-+++ b/numpy/distutils/unixccompiler.py
-@@ -5,6 +5,7 @@
- import os
- import sys
- import subprocess
-+import shlex
- 
- from distutils.errors import CompileError, DistutilsExecError, LibError
- from distutils.unixccompiler import UnixCCompiler
-@@ -30,15 +31,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
-     if 'OPT' in os.environ:
-         # XXX who uses this?
-         from sysconfig import get_config_vars
--        opt = " ".join(os.environ['OPT'].split())
--        gcv_opt = " ".join(get_config_vars('OPT')[0].split())
--        ccomp_s = " ".join(self.compiler_so)
-+        opt = shlex.join(shlex.split(os.environ['OPT']))
-+        gcv_opt = shlex.join(shlex.split(get_config_vars('OPT')[0]))
-+        ccomp_s = shlex.join(self.compiler_so)
-         if opt not in ccomp_s:
-             ccomp_s = ccomp_s.replace(gcv_opt, opt)
--            self.compiler_so = ccomp_s.split()
--        llink_s = " ".join(self.linker_so)
-+            self.compiler_so = shlex.split(ccomp_s)
-+        llink_s = shlex.join(self.linker_so)
-         if opt not in llink_s:
--            self.linker_so = llink_s.split() + opt.split()
-+            self.linker_so = self.linker_so + shlex.split(opt)
- 
-     display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
-