gentoo resync : 25.08.2020

6 files changed, 52 insertions, 44 deletions

diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index f09cae341a8e..3b5c13855517 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,7 +1,6 @@
-DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba68d4ed76d7bc138e4b2d53dbd4bf7dc6fd75a8e5277eccb9740c67d5fdf5b640fbc577f22690ee32db434c3676 SHA512 910cef89443546c9a5f600cbe06cbdc396ac82d15d852768c06c2f97e764b05ee9fe9bea7687404a9a962924bd33c45d9de2a04b448fe6350d8cc31c4e163dfc
+AUX pyfakefs-4.1.0-openpyxl.patch 1239 BLAKE2B e30306dfcbfe84a26e96550ce7fadaa15a81a229d8cbc32fbfa08f97a71dd1bc558cf984bb5d5a2627ee3e71cfd6dcd1197815195bb6cdb9956b7d82ba61bbdf SHA512 985d3020b7f768723634b0b5ac6f55ec8ee524ec1d7c14fa594a5be7e3dba674e65785f498b36d20b554f9b187fb381e50abd00ed75c070444682ca8fb85e2cb
 DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
-DIST pyfakefs-4.0.2.tar.gz 177627 BLAKE2B a52bd900466203af6170bb9ce92f1e5f73f246d576f12390f5b52224de34fa69a3a4c426319b701953f040e343bcf267e20ea2a33df62c4a46f6397f760330aa SHA512 ba14cbc278ece50142d441b7731b01ba316ba9f11e5d442476e12b8b678490aace9578eb3b2fa2e47d6805795ceaf85574d3c5fb992a098585597c7e96d7143a
-EBUILD pyfakefs-3.7.1.ebuild 870 BLAKE2B 9747111d6a1176e1f095f24313bb9fc60fcbd96492b73b6268269bd7d177c81afb0671fcadbfba9d42557bd7ff16dd9e9eff19acfcdb8888895082791bcfa867 SHA512 b00d85a7831213a5cf428a0c01fdc6b3d5251cd9533a8b95caf86c553c0bfff7c2fcd342ed86d5ae37e611aed47cb08c022ef5c7963b1c7232d000c63d981af4
-EBUILD pyfakefs-3.7.2.ebuild 893 BLAKE2B 689b0b8470e1652b2a4a8b07fd4b653114fe06dd27d5c6cbf92a9884ddea12e9369c540445034cac8a992603f486d40ef111e949709c14ab0c578928bec1b8cd SHA512 68f886b385e8a9539e48c55f0113490504f03dfad5990a17165e6ddd676d92145798a2ed67645a947e8fd2cf8cc5ba9506bd4b13fd4a4617084dbc3874dc5c96
-EBUILD pyfakefs-4.0.2.ebuild 883 BLAKE2B c2f8841919d18ee508576c6220cffd28aae9850940e34f22558edee2ae0d05aa625c23481cca23f0a308d2a88f7354d06ad937b5cbba7fc23b5b849f4727ca55 SHA512 e39a85618b8cd7d063e5d2a7a61d924bf8cca756d281fb7a21bd14797b4d8405f5e307bdabf526eb5eb8d4e705ba0182d5c4129c1606c26a907f4571c6d44082
-MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
+DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4
+EBUILD pyfakefs-3.7.2.ebuild 891 BLAKE2B 78f7762db59798dc284049bb9155f89bce96ee625bc2b97b20f4e1640252897c914840f72b984cb8ff5ead1ada6bee4d77566ea207be4684653438870aab6607 SHA512 c48e7fd77ea469d9bde01754b86839b7897d4a5208bb8559c5481eff3f01c401788a064fed506a8ed9a0af364fb993d8f7559eb34ad202300b5c6fbd9c6e5ec1
+EBUILD pyfakefs-4.1.0.ebuild 764 BLAKE2B b9b5af3324a385608892207630e44ca6ec2776e109fe7e06436800b1c2b68ab31b043b397148917ba9c9e3135b283f0f18a6bd29388b143346aa699c3d5200a3 SHA512 463931a17f23eb9f30ccf3f36c49230f3c2a61c9340e849114fa5fbea25108d350168ceac3ed0458ed2e5a0d153741805bc2d6749aa9327cd210df937a2b0a0a
+MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch b/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
new file mode 100644
index 000000000000..44b76b0132bf
--- /dev/null
+++ b/dev-python/pyfakefs/files/pyfakefs-4.1.0-openpyxl.patch
@@ -0,0 +1,38 @@
+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/metadata.xml b/dev-python/pyfakefs/metadata.xml
index 0a79b8f3f70d..4c153f30ad75 100644
--- a/dev-python/pyfakefs/metadata.xml
+++ b/dev-python/pyfakefs/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyfakefs</remote-id>
 		<remote-id type="github">jmcgeheeiv/pyfakefs</remote-id>
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
deleted file mode 100644
index c0436c536db7..000000000000
--- a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-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 ~hppa ~ppc ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
index f2c68f229024..46549c155c2c 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -15,7 +15,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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
index f23510b3baab..b51d5b7e0bf1 100644
--- a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
@@ -15,14 +15,13 @@ 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 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~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}"