gentoo resync : 14.12.2020

5 files changed, 2 insertions, 95 deletions

diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 80109fd86f7f..71b588bdddcd 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,13 +1,8 @@
-AUX pyfakefs-4.1.0-openpyxl.patch 1239 BLAKE2B e30306dfcbfe84a26e96550ce7fadaa15a81a229d8cbc32fbfa08f97a71dd1bc558cf984bb5d5a2627ee3e71cfd6dcd1197815195bb6cdb9956b7d82ba61bbdf SHA512 985d3020b7f768723634b0b5ac6f55ec8ee524ec1d7c14fa594a5be7e3dba674e65785f498b36d20b554f9b187fb381e50abd00ed75c070444682ca8fb85e2cb
-DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4
-DIST pyfakefs-4.2.0.tar.gz 192826 BLAKE2B b1b337f5845075d8c9f32565dc1169ec2fde7e49a0bcf2f446d09f090c8c46c69690259bfc1d8e76b754477303de049790a69a209c0ed11af465bd5ca2b2ddcd SHA512 d70266bac134eca45af3d2838f9f276217305add719aa1ed3606406b33b2d2f8bda20fbcdd4653e2a5e08baf717dd0f20005aa6f66ea519e52247c88fa8d72b2
 DIST pyfakefs-4.2.1.tar.gz 192910 BLAKE2B dd1826b8fbddb9c9f272cd6fe0a286a41dbcf1bba625cfaef22ea1f17089f6acf346c3a84e56e6ad41f501329c06539bcda72cad670481a3ad770d014ad1e93d SHA512 99ee0ece46ed457dcf98c4c59ee905e58bbfe66e4fadcc3d3d9d725c2ce7b4fae25bc3cf847c85045a828beab52f315ec2ee78e6fea4b23cfe9aaddfd49f1829
 DIST pyfakefs-4.3.0.tar.gz 194821 BLAKE2B f7deca18ad019dba12ac35bac44be339fc1eef0ef609f33b2fa8974f3bd65a25fba043f0afef0e332f9a71f5014444eb7c6e890acbfcfc9c8acb780dc88140a6 SHA512 42c6e9da0f098eeb948fbe3f1f26e8fddfb35d3156543ccc2297cc0fb971a87911a94ca925d2fd12531999fd9314b615f49688a3e9a4aef19522cd08bdabe72a
 DIST pyfakefs-4.3.1.tar.gz 194638 BLAKE2B 752fb2ec88d7468ca439e7124e26b9f111f3b3971a47062b598a0d66c9fc5d8d317716ad73648de727ad6072546fd7b02f7f3a65da45998a20d5f5f3e5999bf1 SHA512 9e1521b7c051ef984329ebe9e2003f72a6f54497dcde46b3fe1b14f282ba436dc17ebd6b8e570714eb1ed8de9f484e6bc94ece0a39985a47f7668f350b5a797f
 DIST pyfakefs-4.3.2.tar.gz 194897 BLAKE2B c3b36e280cb73c4bcd2349382eb67726c19627b0c6dc392a0f38ec7f9f001e5ddbe93734de6d177c68ea1e2213c5c7d06827e3aa12af0c7cd744ba35b8d5df5c SHA512 50479d2ac7b8622ee30c4c2f09cb3d2bdfb315b4eb61eecb37f8946f038ec9048d653250a0f58dcef55b1b8347b040ecd416f61f26ecfdf7b083801114770803
-EBUILD pyfakefs-4.1.0.ebuild 738 BLAKE2B f3deaab9c1e94c81db2ffdf999a498dd7e7c221cb7db10f4d728f647d6cd6a7cfb520d271d533d447327d02adfd9287abd685b9ee710b344458bea2a8a856b9d SHA512 8fe06ccd381b0caa5b101d78519c40acdd9b025859ac8225b1783a6b41a4ca8558adfebfdbbad48ac2c471523c32c4623fc02a861f849beb97bb65e5b342ab16
-EBUILD pyfakefs-4.2.0.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
-EBUILD pyfakefs-4.2.1.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
+EBUILD pyfakefs-4.2.1.ebuild 690 BLAKE2B ff030a1f00ded2adfc8b128f2dfadde2d02dcdf8c2c5535c2d67c91c21ec07874993e9e6e772ae9fc5af8f4b387b4fa2e1b13e9da0e2af7e33e3d18728a0f6b7 SHA512 e461e9dbbaf75603e855f5d236c8ee6b4b651dc6ec1cd3092a6ebcdd5e167a061ef17fe2d6652558777f765395a0e21ca1f711d5f8f9d68a5cc828f1371ba876
 EBUILD pyfakefs-4.3.0.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
 EBUILD pyfakefs-4.3.1.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
 EBUILD pyfakefs-4.3.2.ebuild 709 BLAKE2B 9173aa57fe05213cb4d0542bcfddaab1408992cc44d3a7c25f4fc77f538f5c37de4513ca3db5cf73911a017a94575831a92f835058b0a1efb7c27b3c5af0e3fb SHA512 ca87513a5b5bc21446324e51de8e077f1417e7d4c3ab6e7bfac8534e01e325f6f2b96b14cc191e57fcc824c836b20b740dfa88bfb2d32e3455a64b8ebe4c9670
diff --git a/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch b/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
deleted file mode 100644
index 44b76b0132bf..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1d6fabcaccf8dc716f7a49a67f5342d83ef37976 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 12 Jul 2020 21:26:33 +0200
-Subject: [PATCH] Skip test_write_excel if openpyxl is not installed
-
-test_write_excel fails if pandas are installed but openpyxl is not.
-Adjust the condition around the case appropriately.
----
- pyfakefs/tests/patched_packages_test.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/pyfakefs/tests/patched_packages_test.py b/pyfakefs/tests/patched_packages_test.py
-index 05ed7ef..f8d8a1a 100644
---- a/pyfakefs/tests/patched_packages_test.py
-+++ b/pyfakefs/tests/patched_packages_test.py
-@@ -28,6 +28,11 @@ try:
- except ImportError:
-     xlrd = None
- 
-+try:
-+    import openpyxl
-+except ImportError:
-+    openpyxl = None
-+
- 
- class TestPatchedPackages(fake_filesystem_unittest.TestCase):
-     def setUp(self):
-@@ -57,6 +62,7 @@ class TestPatchedPackages(fake_filesystem_unittest.TestCase):
-             df = pd.read_excel(path)
-             assert (df.columns == [1, 2, 3, 4]).all()
- 
-+    if pd is not None and openpyxl is not None:
-         def test_write_excel(self):
-             self.fs.create_dir('/foo')
-             path = '/foo/bar.xlsx'
--- 
-2.27.0
-
diff --git a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
deleted file mode 100644
index 4209e0be8c6d..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-openpyxl.patch
-)
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.2.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.2.0.ebuild
deleted file mode 100644
index a437b0e387d6..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
index a437b0e387d6..de3186579fe3 100644
--- a/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest