5 files changed, 23 insertions, 61 deletions
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index a1816a056c36..d7eecb191b89 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,8 +1,7 @@
-AUX pyfakefs-3.4.3-tests.patch 1725 BLAKE2B d2db35dd471ea803a9ddc65ad458cb3b17e74a406391e2658ea61ae14e566f3a5ad107119ad72934790a930c4d19b775fc9149b2638b6d2fa0872e8462457ce8 SHA512 7a62c91f9eef2a505287a075f45838b722979f11c85a30cea9e695037bf396d977daab95817603c65e695b83532e3a73eacbcf7bf3928f12cae1fa1269935744
-DIST pyfakefs-3.4.3.tar.gz 156896 BLAKE2B 2450cb67dbb25d2029a113dd95c3d51e60ef66c6683a5898ea73800ce1269d628af9f8daa85195d5b473f18b7c3262f2f26fc9c17caf80ce2f5159c247ebea5b SHA512 aafcad5d801f625273239221c56e46229ff8ab622cfb474d92f8555cfff90279ad9a092c20878279454c59033ad23d53cfe877023ac5d20c5a67a610b62ba7f1
-DIST pyfakefs-3.5.8.tar.gz 171519 BLAKE2B 18eb784cf62108c3363b3b5fa137ec4ce830583d263dcecc6f007e6cdeb8a8eefcc4f9eecfba4a9b5b485508749f6dc75a47ff67bc8f5e77f2c0abae2cdd1778 SHA512 e72042dc80545d4a8602bf90bc832298184040389c8fd182df1ef33712061b4937623ca98d70e59b4a388677626f861ff096de939b5caa372849ee10fc3dd8bb
 DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba68d4ed76d7bc138e4b2d53dbd4bf7dc6fd75a8e5277eccb9740c67d5fdf5b640fbc577f22690ee32db434c3676 SHA512 910cef89443546c9a5f600cbe06cbdc396ac82d15d852768c06c2f97e764b05ee9fe9bea7687404a9a962924bd33c45d9de2a04b448fe6350d8cc31c4e163dfc
-EBUILD pyfakefs-3.4.3.ebuild 713 BLAKE2B c1aae975305b1d3555cccea2aee091b75f158c638a50f39e84a8f0b4aebed0be4638548c70b940a8f45ff521ed9826b54488130c39762911de8f6733f5693d7c SHA512 4272510a33b3b29aba9d2882fe3938193a7c323bdb81c014b429ea10cd59bb7558b3394898a8794cad8e60c22989347872cf30dd037b799976482f0fd0677811
-EBUILD pyfakefs-3.5.8.ebuild 856 BLAKE2B 2592aa52f4db10fdad9b81beefd941cd3efa18b8234da2fafe8c28e26fef759d7158208fba8014b1d90269e14c7078066cbe4da4b7a34ac2c636728adf07e973 SHA512 cfd6413cfd3b53e4340b422b8b8fb91a31ec93717e2e226f2a2e9892550f3716f8550cf57ee0718981897604dac8aa90a91f8eb8bc87105f24f30535b73160a5
-EBUILD pyfakefs-3.7.1.ebuild 865 BLAKE2B 80b219a5269c1bb068deba60f5a9a5f07788d107a9abf7f29d1e7f561797df0b48d0b76d233cc9275177c039b5dcb0460d2f8973aec0310411ae6b49409adcf7 SHA512 ab822eda58f4e2540482ec3fd480a44ef5a595e35b0d21c3f1a653a8205a97021e840adce6577b3741053235751564f8477001fbf2c11aa085ddb147f0bc2a0f
+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 872 BLAKE2B a000a5fa7b3583e61497f18ce914cbe808a4a506aeda82a00a5d006377e9800b3bb5ba73b28a19a1f7bcb76e320f9d93c1c73ccfbc68e571250113dc2c407094 SHA512 65abed9aa60eb431b24f192af9917959963ebc81b04baae6a6610b049646842df37c316e850b78a561d2f45e3a066003d770ba455a7c99093d81162893f8a641
+EBUILD pyfakefs-4.0.2.ebuild 864 BLAKE2B 3d2df00a1912a6b1348c27aab9f457abe4c39d2b0a8968242b6341f1eec420a957bf6cde211349ff72dda94a1073d722c5b8d4af9d0d761616cfffd8b61824f5 SHA512 1a5943568db72ea853e509fe72c55bfdce514385953f71f40bc55accbc3054d440ca5552e60fdddd19a1505cbed8aac0acf24c08ec9884acd4ae5370b12609a2
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/files/pyfakefs-3.4.3-tests.patch b/dev-python/pyfakefs/files/pyfakefs-3.4.3-tests.patch
deleted file mode 100644
index c87005b054c9..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-3.4.3-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Drop checks that fail due to sandboxing and skip failing tell check.
-
---- pyfakefs-3.4.3/pyfakefs/tests/fake_os_test.py
-+++ pyfakefs-3.4.3/pyfakefs/tests/fake_os_test.py
-@@ -688,7 +688,6 @@
-         self.os.chdir(directory)
-         self.assert_raises_os_error(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assert_raises_os_error(errno.ENOENT, self.os.remove, '/plugh')
- 
-     def test_remove_dir_linux(self):
-         self.check_linux_only()
-@@ -1202,6 +1201,8 @@
-             self.assertEqual(b'\0\0abcde', f.read())
- 
-     def test_append_mode_tell_linux_windows(self):
-+        # skipping real fs test - python2 on the actual filesystem is also 7
-+        self.skip_real_fs()
-         # Regression test for #300
-         self.check_linux_and_windows()
-         tell_result = 5 if self.is_python2 else 7
-@@ -2443,8 +2444,8 @@
-         # trying to create a link from a non-existent file should fail
-         self.skip_if_symlink_not_supported()
-         self.assert_raises_os_error(errno.ENOENT,
--                                    self.os.link, '/nonexistent_source',
--                                    '/link_dest')
-+                                    self.os.link, 'nonexistent_source',
-+                                    'link_dest')
- 
-     def test_link_delete(self):
-         self.skip_if_symlink_not_supported()
-@@ -2791,7 +2792,6 @@
-         self.os.chdir(directory)
-         self.assert_raises_os_error(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assert_raises_os_error(errno.ENOENT, self.os.remove, '/Plugh')
- 
-     def test_remove_dir_mac_os(self):
-         self.check_macos_only()
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
index f4f040ab876b..c0436c536db7 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.1.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="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
index b007cb54b5c5..6c05ba250bbe 100644
--- a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+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
@@ -13,14 +15,15 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	"${PYTHON}" -m ${PN}.tests.all_tests || die "tests failed under ${EPYTHON}"
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
index 6386a5b02bc7..6851f87bd31c 100644
--- a/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
@@ -13,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="~amd64 ~arm ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -22,8 +24,6 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/pyfakefs-3.4.3-tests.patch )
-
 python_test() {
-	"${PYTHON}" -m ${PN}.tests.all_tests || die "tests failed under ${EPYTHON}"
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
 }