gentoo auto-resync : 01:08:2023 - 10:47:11

5 files changed, 44 insertions, 519 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 00cda9439f16..05d82735224e 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,22 +1,19 @@
 AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8d8692ec5893040eee3c2842620e2a9186062936082f34610d3056c44e44a921116f99158dfb7481c4eccc82d33b3b18a63b379e SHA512 87bcecee3435dedcd87128c81d0002a786b4b23928973216f32c8d12b797d6a9948c3e7b41142235abe35734683e6ef84c02ffe255ba492a0ad43626071dc5a9
 AUX numpy-1.24.3-fix-c++-linkage.patch 993 BLAKE2B 9ad31b995b209ea0674ee144a72dfa6b6bf5e10e3676a8c3dda9327ff9befed5cbdcfc0819a9053e1d281862ea8df40514e8e0fc05fee8c4a743faf8f56f5e72 SHA512 29a1e287f04a68785284005d8d2ee56e26f5180e42bc4a7ba0dc06f5523c91447a5a749bd4492ecf7ba5c916f80f03e619429f75ae3636cef24c4f11f29a6d23
-AUX numpy-1.25.0-fix-long-double-check.patch 5788 BLAKE2B c004fa342349a22dda30566d3015257146cee89e5b15c32d9b0bdbd44f4c7be76749f248e792d9ffd77ea8a674a2dfe0d183a9de48a1bb0f450e7a3f2f9688b0 SHA512 d2ecea4bc1878cb3df1b730b705bfa445f8f74356a5232de7ef5c94624847703985ac51d6b5bc3b961be6ef4b854804a531b5645e57ae4f6197d5aedb2e1c459
 AUX numpy-1.25.0-skip-python3.12-irrelevant-tests.patch 7363 BLAKE2B ca4581f61fb1350803915bcc8e3198bd13c75e0c7e178c86e72682222cbafff396f23afad9d7427d9d2a4be625f84626c899493045a0b8cc7ee3d031d36712c3 SHA512 cce36c856beb2254436f2753ed94b7a933d1e4c06fe0a96c2be70d944f91bb13f3358f50981398d0b9169c0e01b64695c3adb797db15cb6b695488318e276886
 AUX numpy-1.25.0_rc1-meson-pyproject.toml.patch 16917 BLAKE2B 6cdda647c1c4f003adcaff3d634cbaa2f6c1624f2e44bfff1b6542189693a1dc99bf8a3da38d5e9a5dd2b3a6382d0430f03eb3c39811cf3b72e85a1bbae9ea0e SHA512 0a51b1c84356704f373ba1188dc63152e45fdb7bc71881e8ab08b67bfbf2e8f1e9b5544eedf6e3d8b4b872e294e28233e9f059dfdad42ff835bba22ee66d0d93
 AUX numpy-1.25.1-fix-scalartypes.patch 2745 BLAKE2B 97b80e877bf6d9036c0911b135869e2f3d0eab6828b4b1acdc957581d5a32063981b1aa688c46627cdb6f8be7fb839aadeb66012157e0f8f5e623e6d572441eb SHA512 144fd807dee3a844f8279cb7443ecd400862b257d36c42d6197c90514b8405c60466473436509983ed13ce9d23a137ef953ce21e3f4a2a2e16cb27a0fecb174a
 AUX replace_cpuflags.awk 405 BLAKE2B 1ac5f362a174793274a2e63fad73a7cf260b1fb139c479279c8cad7f400a376712b17312ee41defb785a7a2c84ec8e679aae48b41e88394a816f12f1cd366e56 SHA512 cce2253e00e2e56f3038782ff989703a9ef3d5f97d1b1f2570f6e23396d7abb7cff7f34588b67ec6c395cb192d7e3bfa6a8262ddf45193a2d0c91c2063efcf6d
 DIST numpy-1.24.0.tar.gz 10897101 BLAKE2B 59e2b913f90de76589d8fbb2f07e2d389012c7f6ce9bd641bc4837776465ce9c41c34f19f92bee55d4bae6245c1d2c84315b359ef0b089fd68d31cd7e7ec44b1 SHA512 3b4e6255b8d39e8504a50ecd3c2ba09d5b16d3f6c70b23b67e4dbf03d1fe390c55030f46090341d39a1ee8228c61ad6212fdc6e4579fcec9e26b4dbe70268661
 DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B e48f65eab709f0c57ec378d813a7b65bcaca6d5960b559d6db1c60726e5cf12517f4b2e1636b0ff815a2109925edccba200270db5170fd0aff5fd635919165ac SHA512 145fd7fb3919a185f75076d51b92c54a7fb1b776b637752ca15fdee15b239d6a517ef1bb8cded7c92e059cf6cda0146c24943c042d19b791e81125bc0ad4b820
-DIST numpy-1.24.3.tar.gz 10909904 BLAKE2B 3b14f8b6a7bd484de43c3b0e57f161388d6226e05ed9bc3d1edfaafc713b9597c7574b9b9c20b4e3a6bd291d32a607d95c72d6e25fa346ffdaf97c94767bc315 SHA512 d4b5841cbe68ee6653f99018e4e0182f2e5519a1cd69c14e0a95aa180f878e6a6786ccf0a7c78bf0d511c53e7535d7144fee428572dec7a4b60b25c8a1c0c9e1
 DIST numpy-1.24.4.tar.gz 10911229 BLAKE2B 2f054b4ede249653707c3df8ccf6df31b747c0625891ae6e01134f84b02d1300e1d7a88b5741e0e0f05218673d95374f263e5bfddbf17c9510aa93bac002eafc SHA512 89eb90548ad4f38cfe0a5077eef426058eed08ca17633024887e4d0ff5bdfe98736b1ad6850fe643bc0035d55ac4cd39b5971895eea9dcf247b5ff186654ed68
-DIST numpy-1.25.0.tar.gz 10426700 BLAKE2B 9a6c9b7e1172a21ec7cc3b2a0b292308ed7a859072ba73cac3c472cd60f45acd66032f24df19bddef8aa0aee7a243e21d3fa04b68f1383efc6af834cdc04b589 SHA512 e464d82bba0487f520ec7a820492343af5172e807e0f746688bbaff636a31947da62704ef0f35c74a46fb42332f4644f3c497d544789d22e5c01ca0823f82909
 DIST numpy-1.25.1.tar.gz 10428993 BLAKE2B ee3edaf5416ac858b995f0cb8df75962af01619969a2c70fa10b4e0d0a1c96a3b441ee470a463cdb7c60910d8823af1c41d37933f87bcaa0a724655d052ed20a SHA512 69cc5426f657a21a6a1fb3bb043b8acec90b87969f90177abb6d7294ca96d04f723ddf90fa40822704b16147a390abafbcda9702e40405ea6b6e22377aade71d
+DIST numpy-1.25.2-patches.tar.xz 7212 BLAKE2B 718331b2d9f8380df239bf2ad9c24d79924e08797825d7c8655124a55e059790f96641633cdb42c597646764ca9efcaf277d5f5b75f042f533c28f2a81d5a5a8 SHA512 bcc0c55710b8d874e1dd9a57fad5698e09e3c96254922db32a8beeae9a5a54532cb0660d3ce43ca68e70fa7227bca9e0d12a0298aa6972ad2cbcecfe4aee3e85
+DIST numpy-1.25.2.tar.gz 10805282 BLAKE2B f138eaf237f3e8052cafbe9fc98b4b62fb0748079df8599fc0950624c856294157410a2ec6fe381eaa8386b1530a39f7037ae1887c9fcfe2e77a3d7ad1ca0171 SHA512 6846d558c227329b6e700965ffa4c7886a7ca5f35234a56d734bc8201d19f7ac87d8ea081094bca13685130dce7bfb98ee4aa3a9dbd538288f10f1d9d82fb699
 EBUILD numpy-1.24.0.ebuild 4196 BLAKE2B a7359b00b007339381f458502457b2d2f9f07daf4f9affa239944de9ef3afef4318d063d7a934da394707d3ba5d53b043f68bb59f903ded5847122f0fce35567 SHA512 90500a1ee3a0a5a9ebd741dd9c870e6d57ec27e5da7dc4fc4dcac46f59212cabd777f806110180c11a55c4ffccbfdcaf0d0b5d1598beb5359779b6d6ba6a1c00
 EBUILD numpy-1.24.2.ebuild 4366 BLAKE2B a7a396b29efaf6a07bd68f76e0cae0d069f530a4d4d915b89cf5a47a42a4e9cf29215089f0a8f819fd24961280fe83f103f28b6be90758eb78f3f408ab5eb23b SHA512 b1186214bf08642b6ca267d0a84ec03c8f4b6256e728eb17d789eb34a43760bf87ea18696ef30b12494bff23a3b8b6f1980085c900c5341c8d43b8da468549f5
-EBUILD numpy-1.24.3-r1.ebuild 4628 BLAKE2B f6562a9a62262c0b78105ae9033537c65ee06ba79df7fb8e7ad6ecde01c7393dfc5e13234446e1642aaa3b05b1c8e9af4c7b6854a3c3a5f85931b259fb82d574 SHA512 ace98f02994fd18fb67e2879c2bcbe6fba39ed16cc3ee43acb75f50755175b4c6dfe6d72a21eb28a86e5ec2638f07ba6506d38a89b4b3155c41ba1827459f951
-EBUILD numpy-1.24.3.ebuild 4581 BLAKE2B bf5f6eebf4a61a9d6c78c1e203db03e29f53064df3edabb2e2b1a0dc44abd5a13003d1d6d85e29eac3f44a5dfaeaf690be6f014896b0eed5fb1bb47a76b56916 SHA512 8900cb724bfeb570c812f073ce4b53c5242c342183d160950cedff2ae7159638f717a8006aed7f9f451e8bb3bd48830c975b0494aebe69e0f3189340f03df22a
 EBUILD numpy-1.24.4-r1.ebuild 5156 BLAKE2B 25bec383fd68bee81b0652f5f1845b2e598db5f3b9923c3e9d0d00e6d93fb9430e6845c673cce1c0a29791966acf1933db6d9074b8385c1cded6becfdb361a8c SHA512 9396face806a2c17952c2bc0802acc54f0c5c29bc9cc1a3265f60b0d72cc5094c2c6f9065e02bc4d6bb051f9201f6d1f4a74c936843fb4148811bcf6420a2765
 EBUILD numpy-1.24.4.ebuild 4628 BLAKE2B f6562a9a62262c0b78105ae9033537c65ee06ba79df7fb8e7ad6ecde01c7393dfc5e13234446e1642aaa3b05b1c8e9af4c7b6854a3c3a5f85931b259fb82d574 SHA512 ace98f02994fd18fb67e2879c2bcbe6fba39ed16cc3ee43acb75f50755175b4c6dfe6d72a21eb28a86e5ec2638f07ba6506d38a89b4b3155c41ba1827459f951
-EBUILD numpy-1.25.0-r2.ebuild 3970 BLAKE2B 1c389a3487d90170531396cdd2c84891280724d33771e5c7e49c5eeb15bae338d1becc232f76d7183a880b633a0da6119b301e320a6f37f9a8adf5376c20115c SHA512 f3a6ec2f32237913c0ed18d829b6495dfc609824a4c89b436b67b3d4313d8fc10510f25b44741e265340dc447e696fed8d2339158c84b81259bd22a79f7240f6
 EBUILD numpy-1.25.1-r3.ebuild 4444 BLAKE2B bc98460d27c6acd233ed219af855f93da93e6dd43db721195fd7e318256509145907136a1336f5d21c7252d05330eaf6b8f83f3f2bd4e4915d92ff447c57b564 SHA512 8dd4d5a3367d1260aa242558048d02da616695aa54f4b666b494d24aac7bef306bf7467fb73e6a7138f67086af51d3d191830a47c14b73062bf0836c345f4397
+EBUILD numpy-1.25.2.ebuild 4989 BLAKE2B a10f6a0c10619fa1859f6926620931f686f03243657b62e9aa203bd7c0a5be2b80ccbae5cb1a50e1acdd85f4910b28b6ba023efe4cb5052d012082e41067496a SHA512 c31349b3eccb781862007a9edbce57a21011897423f0565746a16526b65312db2321b2f2b6e6aee78f2fe41ac52d657bcd900354ce81701d75ec1200e9fbb05b
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch b/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch
deleted file mode 100644
index 4f3ef21c93b3..000000000000
--- a/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-https://github.com/numpy/numpy/commit/de0b2d5c6dee9303c4a055e7591978ed5a06e403
-
-From de0b2d5c6dee9303c4a055e7591978ed5a06e403 Mon Sep 17 00:00:00 2001
-From: matoro <matoro@users.noreply.github.com>
-Date: Sun, 18 Jun 2023 19:39:06 -0400
-Subject: [PATCH] BLD: Port long double identification to C for meson
-
-This ports the old Python code for identifying the long double
-representation to C, so that it can be easily invoked by meson.  The
-original implementation is at https://github.com/numpy/numpy/blob/eead09a3d02c09374942cdc787c0b5e4fe9e7472/numpy/core/setup_common.py#L264-L434
-
-The C portion of the code has been tested and confirmed to work on
-systems with the following formats, either natively or via an
-alternative ABI:  INTEL_EXTENDED_16_BYTES_LE, IEEE_QUAD_BE,
-IEEE_QUAD_LE, IBM_DOUBLE_DOUBLE_BE, IBM_DOUBLE_DOUBLE_LE,
-IEEE_DOUBLE_BE, INTEL_EXTENDED_12_BYTES_LE.
-
-The original meson port includes an error condition with the comment
-"This should not be possible, 12 bits of "content" should still result
-in sizeof() being 16."  As far as I can tell this is incorrect, as
-compiling on an x86_64 system with 32-bit ABI (gcc -m32) does indeed
-have sizeof(long double)==12.  This is reflected in the C code.
-
-Closes gh-23972, closes
-https://github.com/mesonbuild/meson/issues/11068.
----
- numpy/core/meson.build | 110 ++++++++++++++++++++++++++++++++---------
- 1 file changed, 87 insertions(+), 23 deletions(-)
-
-diff --git a/numpy/core/meson.build b/numpy/core/meson.build
-index 3427de408f1..92b393e4bc1 100644
---- a/numpy/core/meson.build
-+++ b/numpy/core/meson.build
-@@ -361,29 +361,93 @@ foreach intrin: optional_intrinsics
-   endif
- endforeach
- 
--# long double representation detection (see setup_common.py)
--# TODO: this is still incomplete, and different from how it's done in the
--# numpy.distutils based build, see https://github.com/mesonbuild/meson/issues/11068
--longdouble_size = cc.sizeof('long double')
--if longdouble_size == 8
--  if host_machine.endian() == 'little'
--    longdouble_format = 'IEEE_DOUBLE_LE'
--  else
--    longdouble_format = 'IEEE_DOUBLE_BE'
--  endif
--elif longdouble_size == 12
--  error('This should not be possible, 12 bits of "content" should still result in sizeof() being 16. Please report this error!'
--  )
--elif longdouble_size == 16
--  if host_machine.endian() == 'little'
--    # FIXME: this varies, there's multiple formats here! Not yet implemented.
--    #        TBD how we deal with the mess of old long double formats.
--    longdouble_format = 'INTEL_EXTENDED_16_BYTES_LE'
--  else
--    error('No idea what this is ....')
--  endif
--else
--  error('Unknown long double size: ' + londouble_size)
-+# This is a port of the old python code for identifying the long double
-+# representation to C.  The old Python code is in this range:
-+# https://github.com/numpy/numpy/blob/eead09a3d02c09374942cdc787c0b5e4fe9e7472/numpy/core/setup_common.py#L264-L434
-+# This port is in service of solving gh-23972
-+# as well as https://github.com/mesonbuild/meson/issues/11068
-+longdouble_format = meson.get_compiler('c').run(
-+'''
-+#include <stdio.h>
-+#include <string.h>
-+
-+#define repcmp(z) (memcmp((const char *)&foo.x, z, sizeof(foo.x)) == 0)
-+
-+const struct {
-+  char before[16];
-+  long double x;
-+  char after[8];
-+} foo = {{'\0'}, -123456789.0, {'\0'}};
-+
-+int main(void) {
-+  switch (sizeof(foo.x)) {
-+  case 8: {
-+    if (repcmp(
-+            ((const char[]){0000, 0000, 0000, 0124, 0064, 0157, 0235, 0301}))) {
-+      fprintf(stdout, "IEEE_DOUBLE_LE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0301, 0235, 0157, 0064, 0124, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "IEEE_DOUBLE_BE");
-+      return 0;
-+    }
-+    fprintf(stdout, "UNKNOWN");
-+    return 1;
-+  }
-+  case 12: {
-+    if (repcmp(((const char[]){0000, 0000, 0000, 0000, 0240, 0242, 0171, 0353,
-+                               0031, 0300, 0000, 0000}))) {
-+      fprintf(stdout, "INTEL_EXTENDED_12_BYTES_LE");
-+      return 0;
-+    }
-+    if (repcmp(((const char[]){0300, 0031, 0000, 0000, 0353, 0171, 0242, 0240,
-+                               0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "MOTOROLA_EXTENDED_12_BYTES_BE");
-+      return 0;
-+    }
-+    fprintf(stdout, "UNKNOWN");
-+    return 1;
-+  }
-+  case 16: {
-+    if (repcmp(
-+            ((const char[]){0000, 0000, 0000, 0000, 0240, 0242, 0171, 0353,
-+                            0031, 0300, 0000, 0000, 0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "INTEL_EXTENDED_16_BYTES_LE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0300, 0031, 0326, 0363, 0105, 0100, 0000, 0000,
-+                            0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "IEEE_QUAD_BE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000,
-+                            0000, 0000, 0100, 0105, 0363, 0326, 0031, 0300}))) {
-+      fprintf(stdout, "IEEE_QUAD_LE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0000, 0000, 0000, 0124, 0064, 0157, 0235, 0301,
-+                            0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "IBM_DOUBLE_DOUBLE_LE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0301, 0235, 0157, 0064, 0124, 0000, 0000, 0000,
-+                            0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "IBM_DOUBLE_DOUBLE_BE");
-+      return 0;
-+    }
-+    fprintf(stdout, "UNKNOWN");
-+    return 1;
-+  }
-+  }
-+}
-+''').stdout()
-+if longdouble_format == 'UNKNOWN' or longdouble_format == 'UNDEFINED'
-+  error('Unknown long double format of size: ' + cc.sizeof('long double').to_string())
- endif
- cdata.set10('HAVE_LDOUBLE_' + longdouble_format, true)
- 
-
diff --git a/dev-python/numpy/numpy-1.24.3-r1.ebuild b/dev-python/numpy/numpy-1.24.3-r1.ebuild
deleted file mode 100644
index 50f9ea27a06d..000000000000
--- a/dev-python/numpy/numpy-1.24.3-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi
-inherit toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.24.3-fix-c++-linkage.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz" -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.24.3.ebuild b/dev-python/numpy/numpy-1.24.3.ebuild
deleted file mode 100644
index 66d2ac04315a..000000000000
--- a/dev-python/numpy/numpy-1.24.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi
-inherit toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz" -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.25.0-r2.ebuild b/dev-python/numpy/numpy-1.25.2.ebuild
index 61b8eb41ef9c..423366aad0e7 100644
--- a/dev-python/numpy/numpy-1.25.0-r2.ebuild
+++ b/dev-python/numpy/numpy-1.25.2.ebuild
@@ -17,12 +17,13 @@ HOMEPAGE="
 	https://github.com/numpy/numpy/
 	https://pypi.org/project/numpy/
 "
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.25.2-patches.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
 IUSE="lapack"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 RDEPEND="
@@ -34,7 +35,6 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	>=dev-util/meson-1.1.0
-	<dev-python/cython-3[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
 	lapack? (
 		virtual/pkgconfig
@@ -51,9 +51,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.25.0_rc1-meson-pyproject.toml.patch
-	"${FILESDIR}"/${PN}-1.25.0-skip-python3.12-irrelevant-tests.patch
-	"${FILESDIR}"/${PN}-1.25.0-fix-long-double-check.patch
+	"${WORKDIR}"/${PN}-1.25.2-patches
 )
 
 distutils_enable_tests pytest
@@ -76,18 +74,39 @@ python_configure_all() {
 
 python_test() {
 	local EPYTEST_DESELECT=(
-		# very disk-and-memory-hungry
-		lib/tests/test_io.py::test_large_zip
+		# Very disk-and-memory-hungry
+		lib/tests/test_io.py::TestSaveTxt::test_large_zip
+		lib/tests/test_io.py::TestSavezLoad::test_closing_fid
+		lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
 
-		# precision problems
+		# Precision problems
 		core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
 
-		# runs the whole test suite recursively, that's just crazy
+		# Runs the whole test suite recursively, that's just crazy
 		core/tests/test_mem_policy.py::test_new_policy
 
+		# XXX: I've no idea why this ends up being needed in deselect and not ignore
 		typing/tests/test_typing.py
+		# Uses huge amount of memory
+		core/tests/test_mem_overlap.py
 	)
 
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			typing/tests/test_isfile.py::TestIsFile::test_isfile
+			tests/test_public_api.py::test_all_modules_are_expected_2
+			tests/test_public_api.py::test_api_importable
+
+			random/tests/test_extending.py
+			tests/test_ctypeslib.py
+		)
+
+		EPYTEST_IGNORE+=(
+			random/tests/test_extending.py
+			tests/test_ctypeslib.py
+		)
+	fi
+
 	if [[ ${EPYTHON} == pypy3 ]]; then
 		EPYTEST_DESELECT+=(
 			# TODO: crashed
@@ -96,8 +115,7 @@ python_test() {
 	fi
 
 	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
+		# Degenerate case of arm32 chroot on arm64, bug #774108
 		EPYTEST_DESELECT+=(
 			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
 		)
@@ -114,6 +132,17 @@ python_test() {
 		)
 	fi
 
+	if use hppa ; then
+		EPYTEST_DESELECT+=(
+			# TODO: Get selectedrealkind updated!
+			# bug #907228
+			# https://github.com/numpy/numpy/issues/3424 (https://github.com/numpy/numpy/issues/3424#issuecomment-412369029)
+			# https://github.com/numpy/numpy/pull/21785
+			f2py/tests/test_kind.py::TestKind::test_real
+			f2py/tests/test_kind.py::TestKind::test_quad_precision
+		)
+	fi
+
 	if [[ $(tc-endian) == "big" ]] ; then
 		# https://github.com/numpy/numpy/issues/11831 and bug #707116
 		EPYTEST_DESELECT+=(
@@ -121,6 +150,7 @@ python_test() {
 			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
 			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
 			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
+			f2py/tests/test_kind.py::TestKind::test_int
 		)
 	fi