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

4 files changed, 43 insertions, 144 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 77e43d9d5cfe..fc7fe06b675d 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,10 +1,8 @@
 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.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-r1.ebuild 4978 BLAKE2B 8721cc7541b4c9915f3a7c01c2488ce08d0b2c9242394db03cc3309209c404ec865f79199a76211a25597aec9fcdbc86d0a7c7f4173d48bafe618710ea9c17d5 SHA512 958615b8207d4968776957433cfe8180649831ef07db712193f22ee40713ad2f8c9ccdecc233333bf915259601a513463ed2ebd9f2a9959bbdd9602f00c61d64
-EBUILD numpy-2.1.2.ebuild 5363 BLAKE2B 4978e48361013c84bac1b9d36a06c880b552fbebf306d83667d4dbf7c239f4728dc54dafee40a13ce81d037c4a656bf4ecf9f9fef7bcf76161e9e2996743c809 SHA512 7397421b80ba8117e86b80dc9ed8f43afdc72b19a6b6a8740242741f7cb0640e0c99ef1d5f6c0692a024c6213e15c2f974cef02f0432aa0236266ed3b39dbc65
+EBUILD numpy-2.0.2-r1.ebuild 5981 BLAKE2B 5adc5fa3b06c8e00cd79304b874d659ad00effcbff7062531ce4d4a6779b37ad2d7bf5b6eb6d7730d5ab6fa607cf79adac8ea9467a131aaad2ba210bd76d0e11 SHA512 088cd7cd334601dd1f8a0fc3c08d40c4a0ec1a539e00c7d8c99a9f0a6aa24b44f721499af3052ace1bd46d2c62b0d0238b5046a9a769bec9317b6d8e20d347d5
+EBUILD numpy-2.1.2.ebuild 6253 BLAKE2B aef7d9d5ae9cef32ce148a6ec9a6a582f653b4b73c868f1a9484ca0130fc1d0ff3f246fee32af0b488acafcafbce374d14b539f53ff38e7d425a2967a4733cda SHA512 0d76e3662331bb6900afa0178c6c495b07494045369b3db382c6b9880b0396857aa1e7643e5046e8145d5123131b360e6d238360f672accc44d7bcbb21e88195
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-2.0.0.ebuild b/dev-python/numpy/numpy-2.0.0.ebuild
deleted file mode 100644
index b5ebbb001efe..000000000000
--- a/dev-python/numpy/numpy-2.0.0.ebuild
+++ /dev/null
@@ -1,137 +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
-		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
-		_core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# Runs the whole test suite recursively, that's just crazy
-		core/tests/test_mem_policy.py::test_new_policy
-
-		typing/tests/test_typing.py
-		# Uses huge amount of memory
-		core/tests/test_mem_overlap.py
-		'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+=(
-			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				_core/tests/test_nditer.py::test_iter_refcount
-				_core/tests/test_limited_api.py::test_limited_api
-				f2py/tests/test_f2py2e.py::test_gh22819_cli
-			)
-			;&
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# flaky
-				f2py/tests/test_crackfortran.py
-				f2py/tests/test_data.py::TestData::test_crackedlines
-				f2py/tests/test_data.py::TestDataF77::test_crackedlines
-				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+=(
-			'random/tests/test_extending.py::test_cython'
-		)
-	fi
-
-	rm -rf numpy || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs numpy
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-2.0.2-r1.ebuild b/dev-python/numpy/numpy-2.0.2-r1.ebuild
index 16b2628f9896..e4c66e49e229 100644
--- a/dev-python/numpy/numpy-2.0.2-r1.ebuild
+++ b/dev-python/numpy/numpy-2.0.2-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+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="big-endian +lapack"
@@ -114,8 +114,29 @@ python_test() {
 				_core/tests/test_function_base.py::TestLinspace::test_denormal_numbers
 				f2py/tests/test_kind.py::TestKind::test_real
 				f2py/tests/test_kind.py::TestKind::test_quad_precision
+
+				# require too much memory
+				'_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+				'_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
 			)
-			;&
+			;;
+		hppa)
+			EPYTEST_DESELECT+=(
+				# https://bugs.gentoo.org/942689
+				"_core/tests/test_dtype.py::TestBuiltin::test_dtype[int]"
+				"_core/tests/test_dtype.py::TestBuiltin::test_dtype[float]"
+				f2py/tests/test_kind.py::TestKind::test_real
+				f2py/tests/test_kind.py::TestKind::test_quad_precision
+				tests/test_ctypeslib.py::TestAsArray::test_reference_cycles
+				tests/test_ctypeslib.py::TestAsArray::test_segmentation_fault
+				tests/test_ctypeslib.py::TestAsCtypesType::test_scalar
+				tests/test_ctypeslib.py::TestAsCtypesType::test_subarray
+				tests/test_ctypeslib.py::TestAsCtypesType::test_structure
+				tests/test_ctypeslib.py::TestAsCtypesType::test_structure_aligned
+				tests/test_ctypeslib.py::TestAsCtypesType::test_union
+				tests/test_ctypeslib.py::TestAsCtypesType::test_padded_union
+			)
+			;;
 		ppc|x86)
 			EPYTEST_DESELECT+=(
 				# require too much memory
diff --git a/dev-python/numpy/numpy-2.1.2.ebuild b/dev-python/numpy/numpy-2.1.2.ebuild
index ddb5d3e4058f..0382087fb9cb 100644
--- a/dev-python/numpy/numpy-2.1.2.ebuild
+++ b/dev-python/numpy/numpy-2.1.2.ebuild
@@ -114,7 +114,24 @@ python_test() {
 				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
 				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
 			)
-			;&
+			;;
+		hppa)
+			EPYTEST_DESELECT+=(
+				# https://bugs.gentoo.org/942689
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype[int]"
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype[float]"
+				numpy/f2py/tests/test_kind.py::TestKind::test_real
+				numpy/f2py/tests/test_kind.py::TestKind::test_quad_precision
+				numpy/tests/test_ctypeslib.py::TestAsArray::test_reference_cycles
+				numpy/tests/test_ctypeslib.py::TestAsArray::test_segmentation_fault
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_scalar
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_subarray
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_structure
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_structure_aligned
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_union
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_padded_union
+			)
+			;;
 		ppc|x86)
 			EPYTEST_DESELECT+=(
 				# require too much memory