gentoo resync : 05.02.2020

5 files changed, 14 insertions, 112 deletions

diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 0502e160f1e1..c565df3e7a00 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,12 +1,8 @@
-AUX pyfakefs-3.3-sandbox-tests.patch 1277 BLAKE2B 2ba11e2b2f5160dda4876b62723b965a6a38c8a96b8f56eaaa964a7ec038f61f3410a3a4c968bc06fa5f2e5468cad20a7d210d4288d328a9f4ae937e3cb50c5c SHA512 1ff58be274dc1380763149169b903ac10847a1b258191d3f0a3b90d0d45b169f9cd858396704d1410658cc32d9fd17cdbeafdcd34dce169d512dd7edbe9b83c3
-AUX pyfakefs-3.4.1-tests.patch 1734 BLAKE2B 3461bbbae5ebbcd4e349434d8fe429ef16b9ef21ab5f915d499f9bbc695cc5c71b17278c8843fab03a99a5cc7af1e28a02600dfe462e66e513fe9c8e25268de1 SHA512 752fe84adcb017efa523a746b82a70af41873017f3d5e6496900dfbaee09ede04a4b95a8928032d5e8305766953b69214a0b6660ee61baa18be58b93f0111c0c
 AUX pyfakefs-3.4.3-tests.patch 1725 BLAKE2B d2db35dd471ea803a9ddc65ad458cb3b17e74a406391e2658ea61ae14e566f3a5ad107119ad72934790a930c4d19b775fc9149b2638b6d2fa0872e8462457ce8 SHA512 7a62c91f9eef2a505287a075f45838b722979f11c85a30cea9e695037bf396d977daab95817603c65e695b83532e3a73eacbcf7bf3928f12cae1fa1269935744
-DIST pyfakefs-3.3.tar.gz 141704 BLAKE2B f805146024d9886ce6cb25b23f6f818bb37cac00a51528375b3da3e728515cb5ffd292352888861ff2b434ff71dd730bfbd84874fee0ae1f4d2cfca974f73771 SHA512 0044643964a4f2329d777476940b38d2d63c6de8f854992b4fba7b7e49f1186e7ce9811f83c9870655cbe33b7dda816c1aa1ce685e800e55c06d175c281748b7
-DIST pyfakefs-3.4.1.tar.gz 151662 BLAKE2B cbfdd7ab4c2936d484b5ff1e22852438c5c653e8875b7d363324e0a1aed0bfc5c492c2cd5c64a47052fcb4d043f567819f32067527b870ab42da8cfd92d40be3 SHA512 1be0254455f6046f1d28bf4377d17e0fb943b4b0db09e933c114f587f3d917877b23ee1610cf83a6330b406bb9ae66fe79dea31a6bf75c0b9c2b79a88d07e753
 DIST pyfakefs-3.4.3.tar.gz 156896 BLAKE2B 2450cb67dbb25d2029a113dd95c3d51e60ef66c6683a5898ea73800ce1269d628af9f8daa85195d5b473f18b7c3262f2f26fc9c17caf80ce2f5159c247ebea5b SHA512 aafcad5d801f625273239221c56e46229ff8ab622cfb474d92f8555cfff90279ad9a092c20878279454c59033ad23d53cfe877023ac5d20c5a67a610b62ba7f1
 DIST pyfakefs-3.5.8.tar.gz 171519 BLAKE2B 18eb784cf62108c3363b3b5fa137ec4ce830583d263dcecc6f007e6cdeb8a8eefcc4f9eecfba4a9b5b485508749f6dc75a47ff67bc8f5e77f2c0abae2cdd1778 SHA512 e72042dc80545d4a8602bf90bc832298184040389c8fd182df1ef33712061b4937623ca98d70e59b4a388677626f861ff096de939b5caa372849ee10fc3dd8bb
-EBUILD pyfakefs-3.3.ebuild 706 BLAKE2B 194f957a15cd50e054ae98c08d9408452cbe2ca9ec5a545f2fd4ea7cc501677e1e18ac0792befc7c84c2f82d893649bcc4fc89b84d594dcf558944aafd949d72 SHA512 8cef48aec6f558ab513aa84560e5a68f36e3787a7d0a7251da75609468e481a44677427b24400a8ff23ffc531b46b5655df25fe3a7faec13b1eba1449796f426
-EBUILD pyfakefs-3.4.1.ebuild 709 BLAKE2B 2a46a3ae89a1ba39e7e336ae049a4059d4fd79e3eea344d00fa4abe228d468c1f754e704cbe5ddfe205285370c465b561186ff3480d6ebb589b0265e2f4cb231 SHA512 de026d62f12362235f25bb88c9aba62ef3fa563d670a95ee3853ae7fa781f3c5ccf66c858bfb09ded699e34f7b68f61995a0a70bac91b7272f63797b5a1f92b4
+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 854 BLAKE2B e05fabf45881167b7e0cd089886ce68db5070f8fa94226f660d365171017043c54ed7263104ea3fb294f1a66de756189641479e9674639066443412912a69a75 SHA512 bf55d3ad92243f8d9143664e30b72ca455fd66c15c0e8bb5cb914f8a385a0eab21b0e23aeeea5593dfda727fc908ea83c177aa3deadb8dc6c74d83fc8c9edd56
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/files/pyfakefs-3.3-sandbox-tests.patch b/dev-python/pyfakefs/files/pyfakefs-3.3-sandbox-tests.patch
deleted file mode 100644
index 58f24fc89bb0..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-3.3-sandbox-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix sandbox issues with non-existent file tests.
-
---- pyfakefs-3.3/fake_filesystem_test.py
-+++ pyfakefs-3.3/fake_filesystem_test.py
-@@ -1418,7 +1418,6 @@
-         self.os.chdir(directory)
-         self.assertRaisesOSError(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assertRaisesOSError(errno.ENOENT, self.os.remove, '/plugh')
- 
-     def testRemoveDirLinux(self):
-         self.checkLinuxOnly()
-@@ -2811,8 +2810,8 @@
-         # trying to create a link from a non-existent file should fail
-         self.skipIfSymlinkNotSupported()
-         self.assertRaisesOSError(errno.ENOENT,
--                                 self.os.link, '/nonexistent_source',
--                                 '/link_dest')
-+                                 self.os.link, 'nonexistent_source',
-+                                 'link_dest')
- 
-     def testLinkDelete(self):
-         self.skipIfSymlinkNotSupported()
-@@ -3158,7 +3157,6 @@
-         self.os.chdir(directory)
-         self.assertRaisesOSError(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assertRaisesOSError(errno.ENOENT, self.os.remove, '/Plugh')
- 
-     def testRemoveDirMacOs(self):
-         self.checkMacOsOnly()
diff --git a/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch b/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch
deleted file mode 100644
index d893a3adcb7a..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Drop checks that fail due to sandboxing and skip failing tell check.
-
---- pyfakefs-3.4.1/tests/fake_os_test.py
-+++ pyfakefs-3.4.1/tests/fake_os_test.py
-@@ -449,7 +449,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()
-@@ -963,6 +962,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()
-         self.check_linux_and_windows()
-         tell_result = 5 if self.is_python2 else 7
-         self.check_append_mode_tell_after_truncate(tell_result)
-@@ -1885,8 +1886,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()
-@@ -2233,7 +2234,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.4.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
deleted file mode 100644
index c4d151cc93a6..000000000000
--- a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 )
-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="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_test() {
-	"${PYTHON}" tests/all_tests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-3.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
index 0305b6844914..b611cb0e0d0c 100644
--- a/dev-python/pyfakefs/pyfakefs-3.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.1.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 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/${P}-sandbox-tests.patch )
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	"${PYTHON}" all_tests.py || die "tests failed under ${EPYTHON}"
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
 }