5 files changed, 2 insertions, 181 deletions
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 4db6eb1f27bb..96a2bcfd1eea 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,8 +1,3 @@
-AUX bottleneck-1.3.8-numpy-2.patch 2279 BLAKE2B 4a2252953a963390a96c2e2ba7d2b86708595aa803d52698728a49f43ba51dc5d8320f38f63e2d766b9dfd1d46bfac6db8e17a3329855fe97e289eb72f9c9c7d SHA512 faf5931418f2744159b23aabe075a4881bb3545a4f89fe56c62fc907fb7371d4963d487e3dbf0c4323c7b2a8ba97327fe568843b53ddefd1bc1906ea817a2a40
-DIST Bottleneck-1.3.8.tar.gz 103252 BLAKE2B 1e520e33eaa86b7328d469a8de2f0cacedb401f9dab3686cad40132caa23e77055b71e630fadda9305f3d416e8958e9762053e6d46afba4cf15489db77418b67 SHA512 951a927ce368643e2ccb5154c05381ce9ff17bc703c0bcd85eab547e345601ad82eb1dc85fa16d667753bf3dc9d0296025984dae463a0153944a85a085331a8e
 DIST bottleneck-1.4.0.tar.gz 103490 BLAKE2B c72b53bd1f4325fa53d7824e335ec50a37da7650c097bdda22548637c1e5a95bfa219dad1361dfb2eecdcf0fa1445a5c6cfb94b7472290fa6317524dc474f46c SHA512 07c1224d63a34e12488dce1f72152fdc493db904130cef46092f7f9c3218a04032e90d64dbf385069072c5d56c7ea09db15897d5c77b9d53db2e3da9414f84cc
-DIST bottleneck-1.4.0rc5.tar.gz 103528 BLAKE2B 760c0958507b5472525694f7b5a11bdb999aa7fb14ab1465d49a81ef8725a007cf070e8393a807a703af7aad1419aafb19859d62bf8871be0348d60b4913d62c SHA512 68394c00567456af54096005d1f971abe872ee1f6d8776aac46d7e183bbb20dbee730e6845fd2c94cdc4dcdb4b8da2e154610784227d5058153c078c61bd9311
-EBUILD bottleneck-1.3.8-r1.ebuild 1161 BLAKE2B 7af94d381eff057374cbee8872cc26b1041fd76708a16b6e90174fcbe24e01d499e76eb5754faa701f9d49c8a7c4d007f735805a849d9383f4fca98ef8fd0bee SHA512 9bb18bc3bd61595c8a71d0e910af3b673eb71d89b8b0ec67907f3ef4cc7c35bea357b8013f5ac97e1476e376d218250becd96459a47ff3117a511ddbba273a75
-EBUILD bottleneck-1.4.0.ebuild 1050 BLAKE2B 0ca91dbc536c3251bc7f409fe625b1d8674068e710be6e26fd1f6614e9759573bc8b4476609da485b9192cef0f69321609c2eab8eaa3b5c1b2e0ebe731fac4a4 SHA512 af09fce18c34d5378c0f04edd1f2b16d8b7229ec6925c109b23c069c4b97c8f7a7702685f173bb769baa3fff4c7a297913c0f53c357b2496d08527aeab914cb8
-EBUILD bottleneck-1.4.0_rc5.ebuild 1050 BLAKE2B 0ca91dbc536c3251bc7f409fe625b1d8674068e710be6e26fd1f6614e9759573bc8b4476609da485b9192cef0f69321609c2eab8eaa3b5c1b2e0ebe731fac4a4 SHA512 af09fce18c34d5378c0f04edd1f2b16d8b7229ec6925c109b23c069c4b97c8f7a7702685f173bb769baa3fff4c7a297913c0f53c357b2496d08527aeab914cb8
+EBUILD bottleneck-1.4.0.ebuild 1045 BLAKE2B f14f172e8bc9e678dac47aed1139075b0b5809bcb9a24d95fa8f6aec09de97251110028fd80da5f957f43feeee012d65e4cde10c70d0981865ac64de5684edc3 SHA512 9af56599a14bfcc59b83fcddeb7fa69066fbf0951fb01dccd3874bb340aab9e3e1374e2e55031f22c3a37a05433327a8cd614f99df7a5f965311aeadc1e229d8
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild b/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
deleted file mode 100644
index 1466f916a5e9..000000000000
--- a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,58 +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=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="
-	https://github.com/pydata/bottleneck/
-	https://pypi.org/project/Bottleneck/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-DEPEND="
-	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/pydata/bottleneck/pull/450
-	"${FILESDIR}/${P}-numpy-2.patch"
-)
-
-src_prepare() {
-	# don't overwrites user's optimization level
-	sed -e '/extra_compile_args=\["-O2"\]/d' -i setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# GC assumptions?
-				tests/memory_test.py::test_memory_leak
-			)
-			;;
-	esac
-
-	rm -rf bottleneck || die
-	epytest --pyargs bottleneck
-}
diff --git a/dev-python/bottleneck/bottleneck-1.4.0.ebuild b/dev-python/bottleneck/bottleneck-1.4.0.ebuild
index 10ecbed939fe..e598b4de31ff 100644
--- a/dev-python/bottleneck/bottleneck-1.4.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
diff --git a/dev-python/bottleneck/bottleneck-1.4.0_rc5.ebuild b/dev-python/bottleneck/bottleneck-1.4.0_rc5.ebuild
deleted file mode 100644
index 10ecbed939fe..000000000000
--- a/dev-python/bottleneck/bottleneck-1.4.0_rc5.ebuild
+++ /dev/null
@@ -1,52 +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=setuptools
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="
-	https://github.com/pydata/bottleneck/
-	https://pypi.org/project/Bottleneck/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-DEPEND="
-	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# don't overwrites user's optimization level
-	sed -e '/extra_compile_args=\["-O2"\]/d' -i setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# GC assumptions?
-				tests/memory_test.py::test_memory_leak
-			)
-			;;
-	esac
-
-	rm -rf bottleneck || die
-	epytest --pyargs bottleneck
-}
diff --git a/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch b/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch
deleted file mode 100644
index 153b984f1fe7..000000000000
--- a/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 787d6daa292ef013efb2ce93f100079457330363 Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Thu, 9 May 2024 20:27:16 +0200
-Subject: [PATCH 3/3] Replace np.array(a, copy=False) with np.asarray(a)
-
-See https://numpy.org/devdocs/numpy_2_0_migration_guide.html#adapting-to-changes-in-the-copy-keyword
----
- bottleneck/slow/move.py           | 8 ++++----
- bottleneck/slow/nonreduce_axis.py | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/bottleneck/slow/move.py b/bottleneck/slow/move.py
-index 0aa06f141..76a54a24e 100644
---- a/bottleneck/slow/move.py
-+++ b/bottleneck/slow/move.py
-@@ -52,7 +52,7 @@ def move_argmin(a, window, min_count=None, axis=-1):
-     "Slow move_argmin for unaccelerated dtype"
- 
-     def argmin(a, axis):
--        a = np.array(a, copy=False)
-+        a = np.asarray(a)
-         flip = [slice(None)] * a.ndim
-         flip[axis] = slice(None, None, -1)
-         a = a[tuple(flip)]  # if tie, pick index of rightmost tie
-@@ -78,7 +78,7 @@ def move_argmax(a, window, min_count=None, axis=-1):
-     "Slow move_argmax for unaccelerated dtype"
- 
-     def argmax(a, axis):
--        a = np.array(a, copy=False)
-+        a = np.asarray(a)
-         flip = [slice(None)] * a.ndim
-         flip[axis] = slice(None, None, -1)
-         a = a[tuple(flip)]  # if tie, pick index of rightmost tie
-@@ -115,7 +115,7 @@ def move_rank(a, window, min_count=None, axis=-1):
- 
- def move_func(func, a, window, min_count=None, axis=-1, **kwargs):
-     "Generic moving window function implemented with a python loop."
--    a = np.array(a, copy=False)
-+    a = np.asarray(a)
-     if min_count is None:
-         mc = window
-     else:
-@@ -226,7 +226,7 @@ def lastrank(a, axis=-1):
-     -0.5
- 
-     """
--    a = np.array(a, copy=False)
-+    a = np.asarray(a)
-     ndim = a.ndim
-     if a.size == 0:
-         # At least one dimension has length 0
-diff --git a/bottleneck/slow/nonreduce_axis.py b/bottleneck/slow/nonreduce_axis.py
-index f09dfa739..1dd67529a 100644
---- a/bottleneck/slow/nonreduce_axis.py
-+++ b/bottleneck/slow/nonreduce_axis.py
-@@ -15,7 +15,7 @@ def nanrankdata(a, axis=None):
- 
- 
- def _rank(func1d, a, axis):
--    a = np.array(a, copy=False)
-+    a = np.asarray(a)
-     if axis is None:
-         a = a.ravel()
-         axis = 0