From dd884e71ef724af1df4a41a034360f78e0e22b1f Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Mon, 11 Dec 2023 20:40:16 +0000
Subject: Adding metadata

---
 dev-python/numpy/files/numpy-1.26.1-alpha.patch    | 25 ----------------------
 .../numpy/files/numpy-1.26.1-more-arches.patch     | 16 ++++++++++++++
 dev-python/numpy/numpy-1.26.1.ebuild               |  5 ++++-
 dev-python/numpy/numpy-1.26.2.ebuild               |  5 ++++-
 4 files changed, 24 insertions(+), 27 deletions(-)
 delete mode 100644 dev-python/numpy/files/numpy-1.26.1-alpha.patch
 create mode 100644 dev-python/numpy/files/numpy-1.26.1-more-arches.patch

(limited to 'dev-python/numpy')

diff --git a/dev-python/numpy/files/numpy-1.26.1-alpha.patch b/dev-python/numpy/files/numpy-1.26.1-alpha.patch
deleted file mode 100644
index a0b2ca2eda91..000000000000
--- a/dev-python/numpy/files/numpy-1.26.1-alpha.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/909738
-https://github.com/numpy/numpy/pull/25078
-
-commit 43aaf2093d8dfb3c1fea5d409ea4aa1d0f77816f
-Author: matoro <matoro@users.noreply.github.com>
-Date:   Mon Nov 6 10:21:32 2023 -0500
-
-    BUG: alpha doesn't use REAL(10)
-    
-    Same as e.g. loongarch per gh-24904.  At this point seems like it should
-    be more of an exclude list than an include one...
-
-diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py
-index f352bbaa2..d17b052f9 100755
---- a/numpy/f2py/crackfortran.py
-+++ b/numpy/f2py/crackfortran.py
-@@ -2452,7 +2452,7 @@ def _selected_real_kind_func(p, r=0, radix=0):
-     if p < 16:
-         return 8
-     machine = platform.machine().lower()
--    if machine.startswith(('aarch64', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')):
-+    if machine.startswith(('aarch64', 'alpha', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')):
-         if p <= 33:
-             return 16
-     else:
diff --git a/dev-python/numpy/files/numpy-1.26.1-more-arches.patch b/dev-python/numpy/files/numpy-1.26.1-more-arches.patch
new file mode 100644
index 000000000000..a6f622517521
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.26.1-more-arches.patch
@@ -0,0 +1,16 @@
+https://github.com/numpy/numpy/pull/25078
+https://github.com/numpy/numpy/pull/25254
+
+diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py
+index f352bbaa2..d17b052f9 100755
+--- a/numpy/f2py/crackfortran.py
++++ b/numpy/f2py/crackfortran.py
+@@ -2452,7 +2452,7 @@ def _selected_real_kind_func(p, r=0, radix=0):
+     if p < 16:
+         return 8
+     machine = platform.machine().lower()
+-    if machine.startswith(('aarch64', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')):
++    if machine.startswith(('aarch64', 'alpha', 'arm64', 'loongarch', 'mips', 'power', 'ppc', 'riscv', 's390x', 'sparc')):
+         if p <= 33:
+             return 16
+     else:
diff --git a/dev-python/numpy/numpy-1.26.1.ebuild b/dev-python/numpy/numpy-1.26.1.ebuild
index d08d5e4f8bc1..964ec4516b99 100644
--- a/dev-python/numpy/numpy-1.26.1.ebuild
+++ b/dev-python/numpy/numpy-1.26.1.ebuild
@@ -49,7 +49,10 @@ BDEPEND="
 		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=( "${FILESDIR}/${PN}-1.26.1-alpha.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.26.1-more-arches.patch"
+)
 
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
diff --git a/dev-python/numpy/numpy-1.26.2.ebuild b/dev-python/numpy/numpy-1.26.2.ebuild
index e07a7be47a33..70f22d68717d 100644
--- a/dev-python/numpy/numpy-1.26.2.ebuild
+++ b/dev-python/numpy/numpy-1.26.2.ebuild
@@ -49,7 +49,10 @@ BDEPEND="
 		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=( "${FILESDIR}/${PN}-1.26.1-alpha.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.26.1-more-arches.patch"
+)
 
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
-- 
cgit v1.3.1