gentoo auto-resync : 04:11:2022 - 21:16:37

3 files changed, 2 insertions, 87 deletions

diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index ab3c9ab23d21..5b6c148c6ec9 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,5 +1,3 @@
-DIST pyftpdlib-1.5.6.tar.gz 188099 BLAKE2B 508e94da6b27b4b1f15306df2916c176f07ca31944398e9ac580fca8d2cdc72ca0ee8e7db282de6745e2e401b23b1fa8cb8de400dc2ba998b93ac45772c78157 SHA512 a3c3c1cac221a8a3c090ee208c03134bb1b8de58099a23ca6ee422f06fb97a0ed561c96e62c62b21fa112dd0b3458651b9fc0c55d72dc0bed79d0583b319a50d
 DIST pyftpdlib-1.5.7.tar.gz 196076 BLAKE2B 9400fb9ff5d8c0e904f07dabef72a07528bc43a5332ad26544f0e512c457a919e887e9f9af18b75cb7853f2e0b70993bc5a858438924320e738d4bc9e2e17090 SHA512 66ad5a1ab8fde26233250351f553cdc411303616d717c416cdce059f93c64e6ef64c7707103644583249b6aba22a9841994b38e731edc7997e95e266dbdbdc22
-EBUILD pyftpdlib-1.5.6-r1.ebuild 3141 BLAKE2B 639e5fac19f4d3a9c20a86e389c8e0163f6861a7de23b5627a720b3f8d7248cd576196f5327056161e3e90ccdd9e8c6ddc9494be621de238ab8408aee5ae5c5f SHA512 584205689b351e73a968b11a6e79258467927024cfb88ec8f5368d2f965f6acfee67b2b67804677260c33e08b03a846a1ffcdb7289c9ad7a2dd604436e25529f
-EBUILD pyftpdlib-1.5.7.ebuild 3191 BLAKE2B c8fc790deab5e948860f9ab1da760181acdd48efdca802b64a9353ffcfe1af1965cb977dd3258cfb8dc11154ba2d555e9cbb92e47b85b862905e8edae2dbd05f SHA512 872948f1f3ec6676c1fbe5fc53400999aedb7a37fcdf45a1a966852e7cd34afbb8ee0f5e71ec36c34924613089fe09caf1f0be5053e7be9756c307c0221716ff
+EBUILD pyftpdlib-1.5.7.ebuild 3184 BLAKE2B 8697b59c19f2f762132445059ae25f03fd2052e03a66000d34a2e630ce9291f2910bf4f84bcfb916da686079959d3e7f8c581639f08e3932ac4f436fba48e462 SHA512 f05e5af5efbecabd92b1977511d3ae6d5f821c5099f4dfe8349745be664e3e0e2b0de282a049191027fe42a3ea6e3191a608ef7859fb0e0a7464f724847c20bf
 MISC metadata.xml 463 BLAKE2B ad4e4d5a1717e55743061f2cb4baaa7ea8ce73f4caf0c8d62535aaf73daf12339584bf75c82c35b425223f478094bb37518b43d34694fb4bc6aef6f11033fa8e SHA512 98bb4e647da164a8676f9162d1109d1f6d1ff9279ba8d26207f2ed793537af27de11b40296bacfb478e87b6479c9d31bb24f56bc1acf2a0bc228b2d00a733e1d
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
deleted file mode 100644
index 15015919c5d6..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples ssl"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-
-	# These tests fail when passing additional options to pytest
-	# so we need to run them separately and not pass any args to pytest
-	pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# Those tests are run separately
-		pyftpdlib/test/test_misc.py
-		# https://github.com/giampaolo/pyftpdlib/issues/471
-		# https://bugs.gentoo.org/636410
-		pyftpdlib/test/test_functional.py::TestCallbacks::test_on_incomplete_file_received
-		# https://github.com/giampaolo/pyftpdlib/issues/512
-		# https://bugs.gentoo.org/701146
-		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_rest_on_stor
-		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_stor_ascii
-		# https://github.com/giampaolo/pyftpdlib/issues/513
-		# https://bugs.gentoo.org/676232
-		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_anon_auth
-		# https://github.com/giampaolo/pyftpdlib/issues/513
-		# https://bugs.gentoo.org/702578
-		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed
-		# https://github.com/giampaolo/pyftpdlib/issues/543
-		# https://bugs.gentoo.org/758686
-		pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_idle_timeout
-		pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_stou_max_tries
-		# https://github.com/giampaolo/pyftpdlib/issues/550
-		# https://bugs.gentoo.org/759040
-		pyftpdlib/test/test_functional.py::TestConfigurableOptions::test_masquerade_address
-		pyftpdlib/test/test_functional.py::TestConfigurableOptions::test_masquerade_address_map
-		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptions::test_masquerade_address
-		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptions::test_masquerade_address_map
-		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptionsTLSMixin::test_masquerade_address
-		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptionsTLSMixin::test_masquerade_address_map
-	)
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	local -x TZ=UTC+1
-	# Skips some shoddy tests plus increases timeouts
-	local -x TRAVIS=1
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild
index df79fd45d97e..dbe2129128a5 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="examples ssl"
 
 RDEPEND="