gentoo resync : 17.08.2021

3 files changed, 80 insertions, 2 deletions

diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index aa324148bad8..49242cdf9618 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,4 +1,5 @@
 AUX xarray-0.18.2-backports.patch 4296 BLAKE2B baec8fba250bf160e2a56873439ebfbdad06d49f6dc7838379c86b03dbb1d9cd123e8a617d44f4dd3b1cd93df5087dd37b3a5307bcb402eb9fe6f71a64276cfe SHA512 043c8bd86cbd08cef1629e7f4b4dc2b225dde73d2a1f54ffe787bcf568f15aaa5c9eb096eb0156e5fec4f519808ffbe402e2d4f36092a1432ad4ae860b896c83
+AUX xarray-0.19.0-riscv_tests_datetime.patch 1832 BLAKE2B bd38f8d95e67d8c44a17db4283b0e2c8d7b1a87ea2d4c96dd65e186b99d453d4cf3f5b52d70e2077648612c44b9fa26a0f44740f89fa23000bf7f88ac5dec7cf SHA512 40be0dd9969e21dfb6d6183d1aaa18ead960c6aa4888a10b6636bd3ab05d5995fd95c18fd87b95de535b36d0c0bd90302e9e781229407f25c7c68b25042d197c
 DIST xarray-0.17.0.tar.gz 2055584 BLAKE2B afbd28032069e4b498c87abd34661dc96525cb581a08fcf68eeaca08468afb9b452650bce4d21cada0eb1cb75ad11b0565a6b965b11120d4bef4d4cd612fa91d SHA512 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
 DIST xarray-0.18.1.tar.gz 2849935 BLAKE2B f4d510a049e67431737ba7f6a66fdd83061e6e5728ac6bfd3b9f104b24cc619cb1d0f05bbe6911e952c312ef229dbf1a68842b75dbb0ecf811fcc7d6e78569b0 SHA512 e1842d7bf06ee23716038fd58e7ae3a2014012cbc49394c9000272cb0498c1d333cbf3133b1d8fcdbddd524d44f6fa5fcc117c992d0ab1d3d0b9c4ddfc317847
 DIST xarray-0.18.2.tar.gz 2850065 BLAKE2B 16d8f5e10a7c9cb4247a3bc8f496f249d66235673e79d0707077e20b54a7d94a7b754fb00f44b876fa21273521f9e2e7d52183798ca33b8e62b30fbc57621c5a SHA512 3cfd6a3b77c48a73eb72e6c39db33aba266925df7ce9b8270231dd14032a717094073a2c3686b09fcff25313b548a452f9ed902211e254254389d15f025d8d0d
@@ -6,5 +7,5 @@ DIST xarray-0.19.0.tar.gz 2882403 BLAKE2B 454595076074c9805f0ff6f8b761a61e4c1724
 EBUILD xarray-0.17.0.ebuild 1090 BLAKE2B 95aa23f92a87a18dfbb8eafb225bb00ad0d8803d153bf6dbc7c14d2098bd396f2a423642c7f0dd55b0ae3a4a0f9d0c91c4e07470e2c35b9a6d7860cf3e437a43 SHA512 7b1774d9f94f1510d3e470e4a887a8bdb9986a4a4825d42737adb45492b5701f678da43ad8f4466d52ee28a1847f7470653fe042185be7bdb950319512f36fb9
 EBUILD xarray-0.18.1.ebuild 1092 BLAKE2B eeaa65c52f8cb7d9c8abce710e7402fc3647484cf288189dd3561c5f6e7e865a2b01c75525943dc18696877b7c164205b091d08d8e2e24f77b037b024d322f72 SHA512 6d4fc469c4878ebc65a4b1681e402f0e6363b524b1fdd59fdf36a449e22f5c8c54d0847d38a1d557f0f79a23b532b2bef68c7ae5a799a598162c774dff9086e9
 EBUILD xarray-0.18.2-r1.ebuild 1141 BLAKE2B 338570635e45d5ab3338db0755ec1d68cfecd6bb26a13aaba05e05f1d434271b4c62ad5e01058257fa4745a6bba3ce42e54ed19bdd2457805f3b4e13085b0659 SHA512 bf468d1fc27df838d8b97891633628bbe83f5df16892deebb0771cf514af0e8942eaf2c92847af1301244d8dd8ce6318fe62d1bee447e2481221e897a2579eb7
-EBUILD xarray-0.19.0.ebuild 1093 BLAKE2B 06c44e2d4016c288a965fc7c41c0a8dce05bd6429af8681334f3ccec379f72724f2c32e16237189ec9f57fbe093df489b1b5a0082d6432061d67784823c331b9 SHA512 b7aa68eb0cd472935e06de6c0269aa61e95c91d33f01c7bbf54b432939e099619c0cdd80c5a72b5dac729a612d633066861608163d747f722e371d29551201dc
+EBUILD xarray-0.19.0.ebuild 1168 BLAKE2B d150d55693fc0dc3984101060575e66543eca741d8d274f41e4fc75d6c71614485a15edca60998012277077bccdd6a61e7e793bc340582763578a038f1a8fbd2 SHA512 59afac39bcfeab5e2e29c6ef37e3ee9ff44cc34e1d569aebf6f8922c0d06478caf0c68ef70c4532fe780d7686e3c77806d06154b19e2af8636e29e9512010e7b
 MISC metadata.xml 508 BLAKE2B 173d15b73f7a3566c657ebf266b60c4c5b8b92e120fe5eac24bc7fc56faaf9378812386506914372aa9b65e49decd11e1f0e55b33ae41b1c51cda2a20f1bd23c SHA512 988742c143bbcd35de2bd649c72eb8db09f3310014b9a93033e383e1c8c6e799492616216b8389f272e46aa2afe925279550094049b9df2850f1fa78b6071966
diff --git a/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch b/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch
new file mode 100644
index 000000000000..1f356e95b561
--- /dev/null
+++ b/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch
@@ -0,0 +1,73 @@
+These tests are x86{_64}-centric because they rely on a specific result of
+casting a float64 NaN to int64, which is undefined in the C standard.
+See https://github.com/numpy/numpy/issues/8325 for details.
+
+--- a/xarray/tests/__init__.py
++++ b/xarray/tests/__init__.py
+@@ -40,6 +40,12 @@
+ )
+ 
+ 
++riscv_xfail = pytest.mark.xfail(
++    "riscv" in platform.machine(),
++    reason="expected failure on RISC-V",
++)
++
++
+ def _importorskip(modname, minversion=None):
+     try:
+         mod = importlib.import_module(modname)
+--- a/xarray/tests/test_backends.py
++++ b/xarray/tests/test_backends.py
+@@ -71,6 +71,7 @@
+     requires_scipy,
+     requires_scipy_or_netCDF4,
+     requires_zarr,
++    riscv_xfail,
+ )
+ from .test_coding_times import (
+     _ALL_CALENDARS,
+@@ -492,6 +493,7 @@
+             assert actual["x"].encoding["_Encoding"] == "ascii"
+ 
+     @arm_xfail
++    @riscv_xfail
+     def test_roundtrip_numpy_datetime_data(self):
+         times = pd.to_datetime(["2000-01-01", "2000-01-02", "NaT"])
+         expected = Dataset({"t": ("t", times), "t0": times[0]})
+--- a/xarray/tests/test_coding_times.py
++++ b/xarray/tests/test_coding_times.py
+@@ -36,6 +36,7 @@
+     requires_cftime,
+     requires_cftime_1_4_1,
+     requires_dask,
++    riscv_xfail,
+ )
+ 
+ _NON_STANDARD_CALENDARS_SET = {
+@@ -466,6 +467,7 @@
+ 
+ 
+ @arm_xfail
++@riscv_xfail
+ @requires_cftime
+ @pytest.mark.parametrize(
+     ["num_dates", "units", "expected_list"],
+--- a/xarray/tests/test_duck_array_ops.py
++++ b/xarray/tests/test_duck_array_ops.py
+@@ -38,6 +38,7 @@
+     requires_bottleneck,
+     requires_cftime,
+     requires_dask,
++    riscv_xfail,
+ )
+ 
+ 
+@@ -280,6 +281,7 @@
+ 
+ 
+ @arm_xfail
++@riscv_xfail
+ @pytest.mark.filterwarnings("ignore::RuntimeWarning")
+ @pytest.mark.parametrize("dask", [False, True] if has_dask else [False])
+ def test_datetime_mean(dask):
diff --git a/dev-python/xarray/xarray-0.19.0.ebuild b/dev-python/xarray/xarray-0.19.0.ebuild
index 32c7a2041315..c69ae4eb50f7 100644
--- a/dev-python/xarray/xarray-0.19.0.ebuild
+++ b/dev-python/xarray/xarray-0.19.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
@@ -30,6 +30,10 @@ BDEPEND="
 		>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
+)
+
 distutils_enable_tests pytest
 
 python_test() {