7 files changed, 2 insertions, 427 deletions
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index f2f25eb23f1c..a387dc146dce 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,13 +1,5 @@
-AUX xarray-2024.1.1-pytest-8.patch 3537 BLAKE2B fad48831eb697cf3d6f36eda1b96e160deaf35a158c39292f6fe566ad80a6c37290c918392e75d120110538515cd7e2714fda7dfc5f10cb9e78832ba7a2be330 SHA512 8be5a6efa52a6914dddf1e20e0553359d894eb9a365bdc4dd027ea0412a64418631b58ad3d809494065ef61253d22aad2fd528ba8a193ee5e9905ba9dffb0a38
-DIST xarray-2024.03.0.gh.tar.gz 3722922 BLAKE2B 52025d8ba196500ac989fc8ff85ae7578cae3602ede77b663350acf0e132d2d9358f3170c697aa2f158c2f3f3520607c23f9060356fec0942ebddb9ca3e039da SHA512 5d62c102a3fdf6dfc16182d3822386dc9edb75204dff9a9b8e3aa7bbe5b223c477f2a73f0a0e35de3454d9e738da6205da0c308bc778f8ffc9af80c20a49d6af
-DIST xarray-2024.1.1.tar.gz 3614037 BLAKE2B cc50fbfa19a2c9229b85b8c7d5d0e7e7f6d3e5a484955fcc81aa0b37839a0b992d2c2f928e4097ca05c7b8294ed1061fbd0c1b7e7c65c9087a940dab97c520ce SHA512 b6447ca2c80b3a3091ac2baba648fef4faa79ffff272360e9726b318b517ede9d2717d1b6f77f03fdacf55527233f1a37c0d114901fe1a265d3e435cf293a487
-DIST xarray-2024.2.0.tar.gz 3634288 BLAKE2B 8d1165360300da5af6d670947e5280052a3d8915768e02448b86ab38283d6d45258a2c4eb91982ba732ccedb3a7afc5f274116c9ee0072d35cdc5631b8a2ca50 SHA512 dcfe6d1f0edab8659664c5399b96d622d2e3df2f85bb7672d9afab6f74294a6449772efde080aaa7323f733c09cbd0f6f037e547be0afa79f39450eead777828
 DIST xarray-2024.5.0.tar.gz 3710689 BLAKE2B 04d2d9c70c90bccd0f269dde91be8a3f213b2dfe2d380b041abe946d118e80d0816ef09ed7e225b7bb164902c1943c1be335f1cac815d12c4aace6a0217379bb SHA512 d3aa6ef73afd2fd8a5c5551631ca5385d14221474bdab4c404cee1405b370c2f998c895bfd3506e6ccc1b2f511996b0eebefb331768df047d5e8b398ad2f9199
 DIST xarray-2024.6.0.tar.gz 3715179 BLAKE2B 42fa46883d27f656dca9b82e1647bd94a62a427582cd52d847131a8e01caf77a597fcc128453fee1f68c38897a9f995dd4c644e9b68b551ee1c28bc0d48e9465 SHA512 b6f24f834d71cca84f6a485858571a17bcb250915d4f84c886c9e16fc240ae3c3e91d573726e8a09f1dbe269abbfae97498868476eef1a90813ddb29c6a6db62
-EBUILD xarray-2024.1.1-r1.ebuild 3564 BLAKE2B 7622ed6536a17a58f4c23e6a6306166d0612d5acc1fcf3e12dac75d4591d9567171fb19937681c93eb10a1cb278ace21b8a539285e55b9ace9329740c9f6b895 SHA512 c74f65ffcaa1c0f3f9062314297171011b3b019b90018cdc23d2f64113ac999d8e1df730cf2264985f91623f004d2ec18986cc6bb31e639164c5b57127a22541
-EBUILD xarray-2024.2.0-r1.ebuild 3636 BLAKE2B ca9f23f3f122f7e13421ea6401aabf5195084bc13635974fc2d8094112a38e62dc424b7579b1ee42cd54dedc24e9f63c4056feb3c1670aef9a45b664b9201829 SHA512 e55cd7e3c87db8399bd1508e1b814709acb6c13f465d6cd119375914761bde70dc4c15a395f7a65ddd20f4cd00a9001991975ee855f0bb402b39ad02d59d62f3
-EBUILD xarray-2024.3.0-r1.ebuild 2620 BLAKE2B 37ff1ae1bd505e05ca2d69d875b3d08d23b2511a9e0c10ee7e3ff99bccf476266b01526dfd74f4625f197a675a9afa6d9bd1c0f9b25a449b8467e45befdb855e SHA512 387a7bbb541ff0cfa60c3fab06b9c86e4254c9b88b83a6836989d7a4c5c37f81bbf7def47852a404bacf1df90655f6fbbaac813a00ad1235b3e1b95009640dcb
-EBUILD xarray-2024.3.0.ebuild 2772 BLAKE2B d1c2a8fa21aaef77317940874e6e2c1c36fc918edd6ad986e765078340821656636bedffbb96b78ffd88583f9e8afaa7afdbc57d2ccc4ca8c986090fe05bba0d SHA512 3ff22fc4dd92b06fcdff180207a936486b57eb1717ee8b662796a53211e9c49bca5ced84461c4ab5955b5af8bd991fbc0399d89f0200f00e9bf8c6fef6934808
-EBUILD xarray-2024.5.0.ebuild 3038 BLAKE2B 8e7d8b309671134d9220de49c0fc32b3fd690c52612f69e224e44a3aac0571ae96690f588793645b199a869bb65579e4be18580c1611e6fbd950cc9ccd5f21e0 SHA512 3b2130c5939d4ef50f85278d981971a51f395c78824292092371c253f5dabdd42362eb0d4ec3d6bf373c438fe85059e0bcfd9009b9205ac7cba2c9b032dcf776
+EBUILD xarray-2024.5.0.ebuild 3037 BLAKE2B a51b24716ae5f767f354374b85b56cc7cbcd7e5304bd2b2700945ade90b21ecb071533e87c69790eeb3d6ec4b0cbf8f3289ecc380fba7c2ad9707847964a9db4 SHA512 1cd5c6d0a0280a97725972d5d37029226a6a5b5aa59e95e59abc00e74c7590f801b9e13eedce1a794cf619156d9c203220391400b9f18949274eda904ef15f4f
 EBUILD xarray-2024.6.0.ebuild 3445 BLAKE2B 873d29c2b5bab5332c70bbaa9f3d1217014704c4edc069d5834719309fe941ec1f7829812871065e1ba89d2cbe12715d82d0b17532f9f90152dbd8146ef9db1e SHA512 42173534f2ad500a563b2a4a656432b89b0bcc172c475cb4e729f8af316db30a4f63e18562c44bc7a951efbbd6eec2f3b3e575c25746ca7b458019ab899ed1a2
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch b/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch
deleted file mode 100644
index e85bb6de7b71..000000000000
--- a/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 306a50e344522a3f321d49d95488f457975fa553 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 31 Jan 2024 11:31:26 +0100
-Subject: [PATCH 1/2] test_dataset: remove incorrect pytest.warns() to fix
- pytest-8
-
-Remove two incorrect `pytest.warns()` assertions to fix test failures
-with pytest-8.0.0.  Prior to this version, an exception raised would
-cause `pytest.warns()` to be ignored.  This way fixed in 8.0.0, and now
-warnings must actually be emitted prior to the exception.
-
-In `test_drop_index_labels()`, the exception is raised at the very
-beginning of the function, prior to the deprecation warning.
-
-In `test_rename_multiindex()`, the warning is not emitted at all (it is
-not applicable to the call in question).
----
- xarray/tests/test_dataset.py | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/xarray/tests/test_dataset.py b/xarray/tests/test_dataset.py
-index fa9448f2f4..77d172f00b 100644
---- a/xarray/tests/test_dataset.py
-+++ b/xarray/tests/test_dataset.py
-@@ -2724,8 +2724,7 @@ def test_drop_index_labels(self) -> None:
-         assert_identical(data, actual)
- 
-         with pytest.raises(ValueError):
--            with pytest.warns(DeprecationWarning):
--                data.drop(["c"], dim="x", errors="wrong_value")  # type: ignore[arg-type]
-+            data.drop(["c"], dim="x", errors="wrong_value")  # type: ignore[arg-type]
- 
-         with pytest.warns(DeprecationWarning):
-             actual = data.drop(["a", "b", "c"], "x", errors="ignore")
-@@ -3159,8 +3158,7 @@ def test_rename_multiindex(self) -> None:
-                 original.rename({"a": "x"})
- 
-         with pytest.raises(ValueError, match=r"'b' conflicts"):
--            with pytest.warns(UserWarning, match="does not create an index anymore"):
--                original.rename({"a": "b"})
-+            original.rename({"a": "b"})
- 
-     def test_rename_perserve_attrs_encoding(self) -> None:
-         # test propagate attrs/encoding to new variable(s) created from Index object
-
-From 3bc5abf4da35edda1f0c3e9e0d53e39331c1a76b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 31 Jan 2024 11:35:04 +0100
-Subject: [PATCH 2/2] test_groupby: Clear recorded warnings for pytest-8
- compatibility
-
-Clear the warnings recorded during the `pytest.warns()` use
-in `test_groupby_dims_property`, to fix test failures with pytest-8.0.0.
-Prior to this version, `pytest.warns()` invocation used to capture all
-warnings.  Now it only captures the warnings that match the arguments,
-and the remaining warnings are re-emitted and therefore caught by
-`recwarn` fixture.  To provide compatibility with both versions of
-pytest, clear the recorded warnings immediately after `pytest.warns()`.
-
-Fixes #8681
----
- xarray/tests/test_groupby.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/xarray/tests/test_groupby.py b/xarray/tests/test_groupby.py
-index 25fabd5e2b..b65c01fe76 100644
---- a/xarray/tests/test_groupby.py
-+++ b/xarray/tests/test_groupby.py
-@@ -67,6 +67,8 @@ def test_groupby_dims_property(dataset, recwarn) -> None:
-     with pytest.warns(UserWarning, match="The `squeeze` kwarg"):
-         assert dataset.groupby("x").dims == dataset.isel(x=1).dims
-         assert dataset.groupby("y").dims == dataset.isel(y=1).dims
-+    # in pytest-8, pytest.warns() no longer clears all warnings
-+    recwarn.clear()
- 
-     # when squeeze=False, no warning should be raised
-     assert tuple(dataset.groupby("x", squeeze=False).dims) == tuple(
diff --git a/dev-python/xarray/xarray-2024.1.1-r1.ebuild b/dev-python/xarray/xarray-2024.1.1-r1.ebuild
deleted file mode 100644
index f04ef4dd3f70..000000000000
--- a/dev-python/xarray/xarray-2024.1.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~riscv x86"
-IUSE="big-endian"
-
-RDEPEND="
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/pydata/xarray/pull/8686
-	"${FILESDIR}/${P}-pytest-8.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning-targeted tests are fragile and not important to end users
-		xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-		# TODO: segv in netcdf4-python
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-5]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-None]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-5]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-None]'
-		xarray/tests/test_backends.py::TestDask::test_save_mfdataset_compute_false_roundtrip
-		# TODO: broken
-		xarray/tests/test_backends.py::TestNetCDF4Data
-		xarray/tests/test_backends.py::TestNetCDF4ViaDaskData
-		# hangs
-		xarray/tests/test_backends.py::TestDask::test_dask_roundtrip
-		# mismatches when pyarrow is installed
-		# https://github.com/pydata/xarray/issues/8092
-		xarray/tests/test_dask.py::TestToDaskDataFrame::test_to_dask_dataframe_2D
-		xarray/tests/test_dask.py::TestToDaskDataFrame::test_to_dask_dataframe_not_daskarray
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.2.0-r1.ebuild b/dev-python/xarray/xarray-2024.2.0-r1.ebuild
deleted file mode 100644
index 27b1fc1abdc4..000000000000
--- a/dev-python/xarray/xarray-2024.2.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~riscv ~x86"
-IUSE="big-endian"
-
-RDEPEND="
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning-targeted tests are fragile and not important to end users
-		xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-		# TODO: segv in netcdf4-python
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-5]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-None]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-5]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-None]'
-		xarray/tests/test_backends.py::TestDask::test_save_mfdataset_compute_false_roundtrip
-		# TODO: broken
-		xarray/tests/test_backends.py::TestNetCDF4Data
-		xarray/tests/test_backends.py::TestNetCDF4ViaDaskData
-		# hangs
-		xarray/tests/test_backends.py::TestDask::test_dask_roundtrip
-		# mismatches when pyarrow is installed
-		# https://github.com/pydata/xarray/issues/8092
-		xarray/tests/test_dask.py::TestToDaskDataFrame::test_to_dask_dataframe_2D
-		xarray/tests/test_dask.py::TestToDaskDataFrame::test_to_dask_dataframe_not_daskarray
-	)
-	local EPYTEST_IGNORE=(
-		# requires datatree_ subpackage that is not part of public API
-		# https://github.com/pydata/xarray/issues/8768
-		xarray/tests/datatree
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.3.0-r1.ebuild b/dev-python/xarray/xarray-2024.3.0-r1.ebuild
deleted file mode 100644
index 706c9190dad7..000000000000
--- a/dev-python/xarray/xarray-2024.3.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-# TODO: switch back to pypi in the next release
-MY_PV=2024.03.0
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-SRC_URI="
-	https://github.com/pydata/xarray/archive/v${MY_PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv ~x86"
-IUSE="big-endian"
-
-RDEPEND="
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/cftime[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.3.0.ebuild b/dev-python/xarray/xarray-2024.3.0.ebuild
deleted file mode 100644
index 94a95af2dca4..000000000000
--- a/dev-python/xarray/xarray-2024.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-# TODO: switch back to pypi in the next release
-MY_PV=2024.03.0
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-SRC_URI="
-	https://github.com/pydata/xarray/archive/v${MY_PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~riscv x86"
-IUSE="big-endian"
-
-RDEPEND="
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires dev-python/cftime
-		'xarray/tests/test_coding_times.py::test_encode_cf_datetime_datetime64_via_dask[mixed-cftime-pandas-encoding-with-prescribed-units-and-dtype]'
-	)
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.5.0.ebuild b/dev-python/xarray/xarray-2024.5.0.ebuild
index 0407fe0f8e37..67e63004b7d8 100644
--- a/dev-python/xarray/xarray-2024.5.0.ebuild
+++ b/dev-python/xarray/xarray-2024.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 IUSE="big-endian"
 
 RDEPEND="