gentoo auto-resync : 14:10:2023 - 23:35:45

4 files changed, 2 insertions, 132 deletions

diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 9c0b63f2b3b6..ee092efba0a1 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,7 +1,3 @@
-DIST pyftpdlib-1.5.7.tar.gz 196076 BLAKE2B 9400fb9ff5d8c0e904f07dabef72a07528bc43a5332ad26544f0e512c457a919e887e9f9af18b75cb7853f2e0b70993bc5a858438924320e738d4bc9e2e17090 SHA512 66ad5a1ab8fde26233250351f553cdc411303616d717c416cdce059f93c64e6ef64c7707103644583249b6aba22a9841994b38e731edc7997e95e266dbdbdc22
-DIST pyftpdlib-1.5.7_p20230828.gh.tar.gz 257359 BLAKE2B 043f4be70b38b409548dd13739e9bcade7f489e9ce1a2e87ee4c631b76f484a0fa72b3ec45e7978cb38168823cdfc020adddc056a135644948415c5baab5ef33 SHA512 b0626559d2942abe63cf45a593f8da98d07124fca19e33c66bf86a9f24bffa842941cd419ad14f43b7ae337bdecb6628ce3184af991d3e87767a11f37eccdd63
 DIST pyftpdlib-1.5.8.tar.gz 201963 BLAKE2B 5a957c207dcdc7c8d66d6ed4176cd12db019cf3d5247233db057b5c266a4fbda5e6e1c0b8ccdf33b4c154400d5d7a5e9a62ab9244f7c74c03c2f912a2ac0eb2f SHA512 2d4c4beb40d604d41eeed51f690b805377e84e594bdbb5d67135f50e5696824ba24aa9ae53aecced9f6c1b7eb3ec7727d31b883f9bbb0d2c43802277b2ef2aa6
-EBUILD pyftpdlib-1.5.7-r1.ebuild 1461 BLAKE2B eb2cc44e7f770fac195823f52f8b12e2ecbf981822000e923cf996433b60cc6714cfaf5ccd061a891ae74cf4fd648f2f118a880f4e7ac52a1c6325cbb47b6eac SHA512 8ef35b01552dec67cbb6e306ffcf7737612d9b265f0577700637fe72314d1af1a126e3927cd92b145d3036db8872a1caff2897a506ec4dd59bb7698ba60d2a0f
-EBUILD pyftpdlib-1.5.7_p20230828.ebuild 1635 BLAKE2B b43081a04a8ee701ab36f1c03723423c1e5c5377aeaf30de36050c713e62e77158919ac1237773a472256a6973a81f97646132864598ecb3ffff8a8ec3767f8a SHA512 a40470b29d26460679ba7950c21b3ed313ead3e05edaac2e48eeb7f0b531da16ea56caca1ad3a2151cfc1a8f862b5de8663f2953ac9e61ed21d714a8b634d448
-EBUILD pyftpdlib-1.5.8.ebuild 1468 BLAKE2B d2966b45b1832b1f6822c0d831aa0204c9d8956f5a6e594c2cc7018b1a2ff7cc3d1df6b394ad481049220acb658cb01705f2910b75d1ae999c603e5ddc4ba94e SHA512 2187acb96a75bc1fbe8ca7ecacbe6567f5870dc5ab3f463f57eaf0541898e7a3a0c8c886accf824e9b3bfc25461c89eb507f081aa5cbabac1abb514723c31c95
+EBUILD pyftpdlib-1.5.8.ebuild 1461 BLAKE2B 5959b6d5674617857d8f7f66e5010cc9fba123e3bb3c4d01d3b81ee1101dee1c534b56138cc58a44799ae12d903a5f81b2ae8506301ad241be484ef2371c2ea0 SHA512 80f23999152160d759eb71d52d6c646d0e3b69acc0272ad76c1e52eb96201a0256ef9c25e09bea1fce786870647f56cdf3e743515e0e1036f6da12cab1052777
 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
deleted file mode 100644
index c760be58dc1a..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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() {
-	rm -rf pyftpdlib || die
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# fail because they process sys.argv and expect program args
-		# rather than pytest args, sigh
-		test/test_misc.py
-		# TODO
-		test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
-	)
-	# 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 --pyargs pyftpdlib
-}
-
-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_p20230828.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.7_p20230828.ebuild
deleted file mode 100644
index f118face5c55..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.7_p20230828.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT=ec1f095910846c11fe3a7f8513de771afc7c8afd
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-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="https://github.com/giampaolo/pyftpdlib/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-
-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
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_test() {
-	rm -rf pyftpdlib || die
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# fail because they process sys.argv and expect program args
-		# rather than pytest args, sigh
-		test/test_misc.py
-		# TODO
-		test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
-	)
-	# 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 --pyargs pyftpdlib
-}
-
-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.8.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.8.ebuild
index afb20a57db76..275a6c59bbf5 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.8.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.8.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="