gentoo resync : 14.12.2020

5 files changed, 7 insertions, 60 deletions

diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 9f6175aa5b51..2781f99aab05 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,8 +1,5 @@
-AUX xarray-0.10.8-skip-broken-test.patch 513 BLAKE2B c4d6298732029f509df209679b7d5fa285a9093053a08a1668a7f12e97a9d2d3738b170b05eb0b681c1a631268dc8213124eafa6cbcb9ba8dbfb53d6da0dbd49 SHA512 8b70650a30d0e5ce5d6c88c19515fb176de2151414042ba8a73b340e2cc6bdc1976ec0b4c723b4943178a886d29bae1e192059452c61e8eb2065b39ed18f23c5
-DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
-DIST xarray-0.16.0.tar.gz 1987841 BLAKE2B 9e191d0c8416b3cbeac484b4bdb12a702314bd6bb982c958f346152ce31832f901c257c59adeca6d32f513de62245648610fd21f4d2ba0e9d6360239c2c4134a SHA512 25a4c967d316eac97389ac4f7e43483655ba93bec0af0f338416f8cd9493dc22b6709c7c66640dc5021f70438d2e26c8f419bda178bb6f27f951b8515b2610fc
 DIST xarray-0.16.1.tar.gz 2007111 BLAKE2B 426485a921669e2a5c92eec143d5470c5fabcbe9c0ec440c39b27b3b95aa2e87d494397c3b3ad69b0856a2c467b025beccd188aee40a5b96a5d411bb2d66ada6 SHA512 b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321
-EBUILD xarray-0.12.1.ebuild 819 BLAKE2B c15568e77135a74e626d0d6f7bca6f3da1fd0201b43937aaeaac741485b26f96a090242a84980a8aec33334206c8946a6e0d5a5f7e2819802c00218f0b893c58 SHA512 bf64094261b878e2909cd828a04385a44fef2242716b77c9156fafa42ab9f6b2bac7848948be30d382b11b0172390aeee38a21dfaeb389f1246f274899430efd
-EBUILD xarray-0.16.0.ebuild 982 BLAKE2B 99479a192c0bf087500b944ee2ea0deb0b9e264559a5b9128d3c3684119233adb9968ec7288f28d35e58eb37db3eab58ee89bbe20275ca1dac1f7592c2b9c606 SHA512 53262dc3a7e4d6ce554c14129245c124790b9ed4f4fef452c4aab8f1dcf21dac1673978b457a73eff46ccc545e167e4ae383b6b0556d4a63e0c952b408c887bb
-EBUILD xarray-0.16.1.ebuild 935 BLAKE2B eba45f22e6729d45c973a7dc0182b86857e98caff650d6d8f9e6310275c622bcf22cd45a88e4c1a35cd37c2340673f17aaaf72772b05dd9734790a325a1c2d1d SHA512 400680bc75d1b97a9f59e407189a88155e457c6e8605a0f7fd6e8bb717b3f31a3687fb365600038c85f32f9ba7147ddbad6b9b75900358694bf2e3c5d13a7008
+DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B 3b95c688a3979323b93ec46c9f218795fbf9df56a7ba1459a507ac36379b3240c351cbb3f1907a204199c6c0c4c0c1c516552548d1e03fb987ad718561aa9772 SHA512 f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8
+EBUILD xarray-0.16.1.ebuild 934 BLAKE2B 495aec100f0d8e541397ccd53fb0f56995f087e73ee5d6428080714e93dca94423c021778fefd9520c11aea249710f8bef0bc35ab7b806141a9539ecafc76ce0 SHA512 90b7b8af54625edb445033b755d360dbe8fa9b253a65b1eb6102d7c3f5e46700121610766731335ae968dcd5a96a1a7157e6b65c9755ba45059a1f03c6281c30
+EBUILD xarray-0.16.2.ebuild 936 BLAKE2B 530b0210443897ede392262d6f439046c3adac756ab38786e01b48ce61264b087475e6106e33f1559193c2b778060dce3bebdfd4fa4c1f89ebbc3941630adcdd SHA512 ec036c61b4a8f514fef95680b3a49b6cbe2d2965183d954d200eca8e86b0aee5d8d09673bc35547f4919c42002bfdf792af5fc5aed67f7d0762d16e4dae5ee90
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch b/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
deleted file mode 100644
index 62798cbcb5ba..000000000000
--- a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py
-index 290c7a6e..d49a048e 100644
---- a/xarray/tests/test_variable.py
-+++ b/xarray/tests/test_variable.py
-@@ -373,6 +373,7 @@ class VariableSubclassTestCases(object):
-             assert v[0].values == np.asarray(data)[0]
-             assert np.asarray(v[0]) == np.asarray(data)[0]
- 
-+    @pytest.mark.skip("Fails on Gentoo")
-     def test_equals_all_dtypes(self):
-         for v, _ in self.example_1d_objects():
-             v2 = v.copy()
diff --git a/dev-python/xarray/xarray-0.12.1.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild
deleted file mode 100644
index 5339b36685a5..000000000000
--- a/dev-python/xarray/xarray-0.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
-)
-
-python_test() {
-	pytest -v || die
-}
diff --git a/dev-python/xarray/xarray-0.16.1.ebuild b/dev-python/xarray/xarray-0.16.1.ebuild
index 2028b99f72d8..8a88be7efd44 100644
--- a/dev-python/xarray/xarray-0.16.1.ebuild
+++ b/dev-python/xarray/xarray-0.16.1.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 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/xarray-0.16.0.ebuild b/dev-python/xarray/xarray-0.16.2.ebuild
index f2df870cfa95..e4da2b36730c 100644
--- a/dev-python/xarray/xarray-0.16.0.ebuild
+++ b/dev-python/xarray/xarray-0.16.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # pkg_resources use in code
-DISTUTILS_USE_SETUPTOOLS=manual
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
@@ -15,12 +15,11 @@ 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 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41.2[${PYTHON_USEDEP}]"
+	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]"
 # note: most of test dependencies are optional
 BDEPEND="
 	test? (