gentoo auto-resync : 11:08:2023 - 21:35:53

3 files changed, 2 insertions, 86 deletions

diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 298f01657a03..a0779a6932ba 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,4 +1,3 @@
 DIST pyftpdlib-1.5.7.tar.gz 196076 BLAKE2B 9400fb9ff5d8c0e904f07dabef72a07528bc43a5332ad26544f0e512c457a919e887e9f9af18b75cb7853f2e0b70993bc5a858438924320e738d4bc9e2e17090 SHA512 66ad5a1ab8fde26233250351f553cdc411303616d717c416cdce059f93c64e6ef64c7707103644583249b6aba22a9841994b38e731edc7997e95e266dbdbdc22
-EBUILD pyftpdlib-1.5.7-r1.ebuild 1468 BLAKE2B 9e19bd82f4f5b891e91f56334bcc2be250ffc5e4068b1560695cdd51758ff0624bccd1c10545c2a6db069c8582b8c383cdd6d104fac6738793093b77d69b38e8 SHA512 c97d760893d9b3779953b16163c451e5af91f42ee636cecf88276475dee1d6fa5f934deeff9fb38d838a730cc5156d68df136ab28b9530489d1557228cef6ebd
-EBUILD pyftpdlib-1.5.7.ebuild 3122 BLAKE2B a3b276987776a4617dd5d24e990974a83fc0071cc04571a2415d6f00ec86b245174e22289728d3d1c286368c22107ec2412cb754cd9568310e0aa1d2a6c0b851 SHA512 30f7fa9b61b144000646a76e859a69dbcba9c3e6f3e3a69b834e21ca030c0c59c995ec2be5e56a21ad6d9bf20c67953c3b3d77e22c927b221b3f72b3528650dd
+EBUILD pyftpdlib-1.5.7-r1.ebuild 1461 BLAKE2B eb2cc44e7f770fac195823f52f8b12e2ecbf981822000e923cf996433b60cc6714cfaf5ccd061a891ae74cf4fd648f2f118a880f4e7ac52a1c6325cbb47b6eac SHA512 8ef35b01552dec67cbb6e306ffcf7737612d9b265f0577700637fe72314d1af1a126e3927cd92b145d3036db8872a1caff2897a506ec4dd59bb7698ba60d2a0f
 MISC metadata.xml 463 BLAKE2B ad4e4d5a1717e55743061f2cb4baaa7ea8ce73f4caf0c8d62535aaf73daf12339584bf75c82c35b425223f478094bb37518b43d34694fb4bc6aef6f11033fa8e SHA512 98bb4e647da164a8676f9162d1109d1f6d1ff9279ba8d26207f2ed793537af27de11b40296bacfb478e87b6479c9d31bb24f56bc1acf2a0bc228b2d00a733e1d
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild
index c5dcd0b8478b..c760be58dc1a 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild
deleted file mode 100644
index 660a383e2d9c..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-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
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=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
-}