gentoo auto-resync : 01:11:2024 - 03:04:33

4 files changed, 43 insertions, 152 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index cf6edf736f42..d6c67e26ad9b 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,11 +1,10 @@
+AUX numpy-2.0.2-setuptools-74.patch 1108 BLAKE2B caaf54f911a6a260d0311c017be13620bb8386df122f62886aeff127c468cc5d7fd9ab2a8b55e4cf15330624b605e1caa4585b840bda2a9dcf2bcee307ee59cb SHA512 ff1280c6e17d580e9b762c29073f81131f30ae07890925874646defb2df47cfbfb1127262097df8ec9b15bc2c7fb44dc807013eccabc377eda5c98a1aaad7fa3
 DIST numpy-1.26.4.tar.gz 15786129 BLAKE2B ee759d3a857111bc494d5e989a7b005375d942b2a89cda69be4a3bd7c6cb195003fd2a8a0535f1858d8977ff688b0ec36360dcba9c3160206eedce5e28f191ef SHA512 f7121ab4099fa0686f9c095d456baa4a5869d651d7b7a06385f885f329cf08f11024b5df5e7b4ee705970062a8102ec4f709512eabbfd5c9fccce4ef83b9c208
 DIST numpy-2.0.0.tar.gz 18326228 BLAKE2B e3d1084b79e0e55cd9087bb34dc116e6c9d6ab14a416a07f727b9f5d5a9db236ecf74a53b7e758d078781c5e565e5557912962f2ddbfff7251ec5b231fabe01d SHA512 cd5612ce2db4be87afa8479c508c256c9ff7f1b15a6b010eb06ba962759cc26552b512ec82711680bab1ebedeb06dfc8d7bff9cec63c94efacaadd719448b287
 DIST numpy-2.0.2.tar.gz 18902015 BLAKE2B 63f993e3429bff1dac1ff79fad23a36a2493fd2c8a825ef96b6b87d82b0e68393d2829c5ecd9065df345c8bfbb1f8f385077f154264f7d2810d311d1d6672bd7 SHA512 d769fd4f07e082fae1661c6856d6d726e189f6931f3028c6819f9806aa9dfd15ab2b49c48b94bfd925eb3f74fddb6f044c9ba93bbb785b5476440dd1cf0b4999
-DIST numpy-2.1.1.tar.gz 18874860 BLAKE2B c828f2106e32429831aa8c64b3b94dfda1b097bcb7f3475b33306bed0b03c2aeb0af4e43ea47c6b3d5e6387b37e3f9ecdf6ae2a3fd4f526da5d121931b9521f1 SHA512 94843f88a32cc1df3e572ac13f294e49201a1f50fbd28707a500839cdff61958823c5b8748a7a54cd866a1acc9bd11efde53042141a81cca44393ee7cee78cdc
 DIST numpy-2.1.2.tar.gz 18878063 BLAKE2B b976b72bb113fc9c5e5a17c9d89038b6a11f2a09521ef46a610dd1fd04b0b11f08491728b2397ca5e3e9613aab3ad8c63b2b15a6378c535cf0e735226d517617 SHA512 3d69f6583e093e8fd0f441ec7dc4658c88fb714bb29574cd9510091ba059553f79c52492037353caf50b6cff1f7bd1e2501e445c7adde41bd9e08bab363e06e9
 EBUILD numpy-1.26.4.ebuild 5160 BLAKE2B 52a7676802baa6c09d2c61445253434394b20cd7c12e7c2d17ceab3f391e15c9e40ee3e1c0e37ee7fc300840910d79f070104aa99169040eb21cec6678ce5ac7 SHA512 daa4452207419e0fa283844a6c7fffb58b508db0be25a09087ea36dd8de476ca0c0b3b2dee16f47738a7e00e17a5efb288b64e558d649da71d3a47dbca7d8443
 EBUILD numpy-2.0.0.ebuild 3365 BLAKE2B a116b9eed3bd13c9f0ecfbfb3810ca697c7914010fd40ab53a74dcad4678f2da916f7589551707fa35ceacf07e110a8e12a339b086c16aee7122c9c64f341646 SHA512 b01cebf19c34af332c49196f67d96d4952907756764c9adfd126fb58b8fa6ae92ec5a9566dc77e2d79150c076b6bd33a254859a553e504ddf650155a5a39e304
-EBUILD numpy-2.0.2.ebuild 3369 BLAKE2B 674c9daa3fb9efe12865d79be6acde78207ed4c92a5cac4e66b76db938eb1551a7f4cb6ea98402c9922617714285cd5216152f9a82ab0899b68186477e6d7d6b SHA512 2d3b65641a87ed7e6077677a839c1c01227461b870172d063edd4d74723fc21b233de2d9717cf24e1334d344e9f3625e143155c6012d1f054c8640bcb54e605d
-EBUILD numpy-2.1.1.ebuild 3857 BLAKE2B cbaec5125e352f83572453c8f57f5c74a276515a44959d2c22e7378a3cb1f033b5e03e2763c2d2b14ea9a97e8093d5b5e9970ca0c2ac25b47fd9b9fdffa87bc0 SHA512 bb72491cecc9b20c49b8a67ac1ec8cba8dac653d23fb743541769f792a81c4f82d6af835b6c8e0c495821ebd6f62eaec4db938708fdbb7971d92b883108f40ee
+EBUILD numpy-2.0.2-r1.ebuild 3651 BLAKE2B 5ef920dfbc92e3c38245d7baf70879e6140abb5fc8ec98d75fbc34cc99fc9a12fb9c75ac7a677aef3c457bc819a3337edf2dd02d8b2c76999570f859ae6ec4c8 SHA512 9f76b668194b7263d35b127e529e523f65b9a6fce6a1b38248de293a4cc558acf12205abac75c2a6c65563eb87f8558dbc8c1f2e9d30adc34127fe0422002f24
 EBUILD numpy-2.1.2.ebuild 3858 BLAKE2B 2b3b2b28a5ac88a1076c317b54bc43d00b3594fe47796c4c3394a8d0a7d199b38b953244c0be5d75c8badb5bbecbbb30512ad2778d28e67f658bebaf9228cc0d SHA512 5b734c82dd0193ab95ae25142a232e92d48692f3652ddb932e17e032b215341a6d9bc9a4c2fb3c9a1696a7afc2c2be9d2997c91cc5cfd819a370fff82ac26802
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/files/numpy-2.0.2-setuptools-74.patch b/dev-python/numpy/files/numpy-2.0.2-setuptools-74.patch
new file mode 100644
index 000000000000..7e61378bdecc
--- /dev/null
+++ b/dev-python/numpy/files/numpy-2.0.2-setuptools-74.patch
@@ -0,0 +1,29 @@
+From 1cc02cc6710384c52e1082a33d1617504eaed296 Mon Sep 17 00:00:00 2001
+From: Katie Rust <katie@ktpanda.org>
+Date: Mon, 16 Sep 2024 13:04:22 -0500
+Subject: [PATCH] BUG: Stub out `get_build_msvc_version` if
+ `distutils.msvccompiler` cannot be imported (fixes #27405)
+
+---
+ numpy/distutils/mingw32ccompiler.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
+index 39905a784088..2599a9e9a807 100644
+--- a/numpy/distutils/mingw32ccompiler.py
++++ b/numpy/distutils/mingw32ccompiler.py
+@@ -24,7 +24,13 @@
+ 
+ import distutils.cygwinccompiler
+ from distutils.unixccompiler import UnixCCompiler
+-from distutils.msvccompiler import get_build_version as get_build_msvc_version
++
++try:
++    from distutils.msvccompiler import get_build_version as get_build_msvc_version
++except ImportError:
++    def get_build_msvc_version():
++        return None
++
+ from distutils.errors import UnknownFileError
+ from numpy.distutils.misc_util import (msvc_runtime_library,
+                                        msvc_runtime_version,
diff --git a/dev-python/numpy/numpy-2.0.2.ebuild b/dev-python/numpy/numpy-2.0.2-r1.ebuild
index 36b49c01956b..b2f86a093db9 100644
--- a/dev-python/numpy/numpy-2.0.2.ebuild
+++ b/dev-python/numpy/numpy-2.0.2-r1.ebuild
@@ -57,6 +57,11 @@ EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
 python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/numpy/numpy/pull/27406
+		"${FILESDIR}/${P}-setuptools-74.patch"
+	)
+
 	# bug #922457
 	filter-lto
 	# https://github.com/numpy/numpy/issues/25004
@@ -119,6 +124,13 @@ python_test() {
 			;;
 	esac
 
+	if has_version ">=dev-python/setuptools-74[${PYTHON_USEDEP}]"; then
+		# msvccompiler removal
+		EPYTEST_DESELECT+=(
+			tests/test_public_api.py::test_api_importable
+		)
+	fi
+
 	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
 		# depends on importing numpy.random from system namespace
 		EPYTEST_DESELECT+=(
diff --git a/dev-python/numpy/numpy-2.1.1.ebuild b/dev-python/numpy/numpy-2.1.1.ebuild
deleted file mode 100644
index c65ca99ea528..000000000000
--- a/dev-python/numpy/numpy-2.1.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 pypi
-
-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/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# +lapack because the internal fallbacks are pretty slow. Building without blas
-# is barely supported anyway, see bug #914358.
-IUSE="+lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-build/meson-1.1.0
-	>=dev-python/cython-3.0.6[${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/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# https://bugs.gentoo.org/925367
-	vrndq_f32
-)
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# bug #922457
-	filter-lto
-	# https://github.com/numpy/numpy/issues/25004
-	append-flags -fno-strict-aliasing
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dallow-noblas=$(usex !lapack true false)
-		-Dblas=$(usev lapack cblas)
-		-Dlapack=$(usev lapack lapack)
-		# TODO: cpu-* options
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Very disk-and-memory-hungry
-		numpy/lib/tests/test_io.py::TestSaveTxt::test_large_zip
-		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_fid
-		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
-
-		# 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
-
-		numpy/typing/tests/test_typing.py
-		# Uses huge amount of memory
-		numpy/core/tests/test_mem_overlap.py
-		'numpy/core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
-	)
-
-	if [[ $(uname -m) == armv8l ]]; then
-		# Degenerate case of arm32 chroot on arm64, bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				numpy/_core/tests/test_nditer.py::test_iter_refcount
-				numpy/_core/tests/test_limited_api.py::test_limited_api
-				numpy/f2py/tests/test_f2py2e.py::test_gh22819_cli
-			)
-			;&
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# flaky
-				numpy/f2py/tests/test_crackfortran.py
-				numpy/f2py/tests/test_data.py::TestData::test_crackedlines
-				numpy/f2py/tests/test_data.py::TestDataF77::test_crackedlines
-				numpy/f2py/tests/test_f2py2e.py::test_gen_pyf
-			)
-			;;
-	esac
-
-	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
-		# depends on importing numpy.random from system namespace
-		EPYTEST_DESELECT+=(
-			'numpy/random/tests/test_extending.py::test_cython'
-		)
-	fi
-
-	if has_version ">=dev-python/setuptools-74[${PYTHON_USEDEP}]"; then
-		# msvccompiler removal
-		EPYTEST_DESELECT+=(
-			numpy/tests/test_public_api.py::test_all_modules_are_expected_2
-			numpy/tests/test_public_api.py::test_api_importable
-		)
-		EPYTEST_IGNORE+=(
-			numpy/distutils/tests/test_mingw32ccompiler.py
-			numpy/distutils/tests/test_system_info.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}