gentoo resync : 29.12.2022

3 files changed, 4 insertions, 66 deletions

diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 6bbeb825adbc..a262ff58e321 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,5 +1,3 @@
 DIST fs-2.4.16.tar.gz 187441 BLAKE2B 5a59dd5bcaae19180a918ba0ceb99b598134d73e4c9ecad840b3cf3041613171367d878d147f045005a87636e8f2145451252d646dbffb8d0f3ae6ac254142ee SHA512 7d9a03b5a782cce048189a7ff527757e60ef6fbb99925713b0179dc9c483f63b54fb1911f39bf2230366c789c526a1b8927863ce93e13a0f71fd8734a7fdb9df
-DIST pyfilesystem2-2.4.15.tar.gz 181799 BLAKE2B 522d118dcee6aafe754d8eb571aa88f26cbbbafd7fedabbf7f4470e098dde01db42cb26b20ed28305daf8f32a22250da81c8a932d420ef4bdf825deb363a26a1 SHA512 7bb153dad5ea03eec7cb1af8d1b5a851845984e194f288687b0e737e1f32c74bf4c1a8d62a9105c8637cd5a29ab82810df9fc11055b894ab0df899cb20a4e1c1
-EBUILD fs-2.4.15.ebuild 1530 BLAKE2B 5fd1efa0be309ffdf72c582c1878d90f6c14bf4e1136cb210c1f1ea68139df9df9d834aeeba94c75bb9e057738c1fff880ac38f01d23cab830bb015882f49a91 SHA512 8ac60d1e7493f66a3d5694ead4835b19af02c8ad57b2d954272e8b98294f86bf3c9339fb13ce08a9626d84935c5cd8e329f1b8abbd968cbc8fc599f1c5dd6c02
-EBUILD fs-2.4.16.ebuild 1348 BLAKE2B 8281a0447a453ee7caf5b6fe0e2292f3e4d8193a49db99f3dc9a9c0c08fe555a84a91d036f2e390f57b7a5ea7bc26bae7f5d05df245b87ea7ef5fad70b465885 SHA512 fe765359b74892885f7fde111617714d4a4158f1a723d11cd1f23304037430b3aaf79371c5d44cecbb0324c496c6037de4b9a8aab86539376fa0241a255e0326
+EBUILD fs-2.4.16.ebuild 1364 BLAKE2B e01902c4c9172d9c2109463bd40b0092a2bd8869ac9ede63498bbe5e99b674eb5245d1b6f042c214aee76f155489a7a4fe0370a415ba136ade417785a9b0aed8 SHA512 8be8fec0a1aaa31ec7bb320137277caa301cb6565e7e342cb8c8339dde8946b85d01de6ef8a32a639b1b2d4f7744dd8eb53c2f2453d8c90383dfa767ac6d8da4
 MISC metadata.xml 581 BLAKE2B b3fa399e172b10606f13b3de4fb0afbe332e7234b3163ce198b30cea2d4c24967b0943d578085dfbaada503700f70015517d01e3f3a01ddcc4795e1821d1a5ce SHA512 3d3154db8e81f2764f99e2595a99a34061762a5cf16695926e25407859f20a59f4dbf60b0d8e18fb80d90c6342f70cc6a2c886841bf156ae06b17a670a4987c0
diff --git a/dev-python/fs/fs-2.4.15.ebuild b/dev-python/fs/fs-2.4.15.ebuild
deleted file mode 100644
index 21b560f51f43..000000000000
--- a/dev-python/fs/fs-2.4.15.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-MY_P=pyfilesystem2-${PV}
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/
-"
-# Tests from the PyPI tarball are broken
-# https://github.com/PyFilesystem/pyfilesystem2/issues/364
-SRC_URI="
-	https://github.com/PyFilesystem/pyfilesystem2/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-"
-# NB: we skip tests requiring pyftpdlib
-BDEPEND="
-	test? (
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# TODO: fails at teardown due to unfreed resources
-		tests/test_ftpfs.py
-	)
-
-	# pytest-xvfb causes test failures due to a zombie Xvfb process
-	epytest -p no:xvfb
-}
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/fs/fs-2.4.16.ebuild b/dev-python/fs/fs-2.4.16.ebuild
index 14eb402a18d9..780dc3deb94f 100644
--- a/dev-python/fs/fs-2.4.16.ebuild
+++ b/dev-python/fs/fs-2.4.16.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Filesystem abstraction layer"
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
@@ -33,7 +33,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/recommonmark
 distutils_enable_tests pytest
 
 python_test() {