gentoo resync : 15.01.2020

5 files changed, 4 insertions, 209 deletions

diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 5c85fca214ab..4fbac4f03950 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,9 +1,3 @@
-DIST pyftpdlib-1.5.1.tar.gz 127582 BLAKE2B 00233ab4acf5aae4902384f514de0d6da9a55b7312b7744ce3f16fd222b5abeae0c65f0f9309ff40d0cbd960baee2c269a1fc6ba72ed8f700c7dbfd47e646a8a SHA512 81bb634aef7190d97b5939b998c8dd8caf1ce77c2ca66d085826880590a03e7fe4aeefb5eb67f30f25b984962eaae740c4c8c1d5900909029702e37c36bb2b9b
-DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0de07b52ea212589afea61abe63a2a61deed86bb133969c8dc99b826b7e23ddf071e0b28ac7b84a066f3fa7f31d90 SHA512 f0e56f170fa77e0866cbbead52ad52276ee45b6c3244557bc59cd2bf599934ae4414a684661d4d47f76098b3da19e23c1a037aaa07a6a81f8d1be14b90191517
-DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 DIST pyftpdlib-1.5.5.tar.gz 184314 BLAKE2B 2d02839c6809674c7b7c4dfd610610a9231799802cc53ad0a05bfabc8985e77c64d9b239628f13bdc22942460b3e923067f084c3c5ac2b7be7671279a08e0351 SHA512 27427154f893812f689adf3a9ceb4ec2d8f0ea7a4bf7b08671dc146c95f09ddd596a27c85e009d8d6647277def48c0bf0a8b76fb3fba5818eda3dfdc6c10795e
-EBUILD pyftpdlib-1.5.1.ebuild 1308 BLAKE2B 465973bea8105d650ca24253a656cb67224da65d90834c1ac29e2472632f71caa0034fde8d6d6aa15ce0896f5a033158214cece82b8af4c5fa91a66fda80f439 SHA512 d09644e533d258aea4bcb9d1c9d72b8aac57debddfee2f50ebe92790a9a3e3b0119a20bbb589f83f508078013258c657bda67ff100515ff389165aef913bc891
-EBUILD pyftpdlib-1.5.3.ebuild 1556 BLAKE2B fcb19b0a1c772aef4556ba5e221d1007098d5ee0059a743223cf680e52c32f9bd9093876221844aa244ef2c0190882117ea8fec4e2579c696cada3355dc1922f SHA512 e4cb5ceb3354bb0ff3c2e927c4d179a36211c0f09aeb4e4246cde5facf216843eda7bc3ec25ff8341eabf27936ba58d4fe4bc235b4ad0cc45ccc22059e849944
-EBUILD pyftpdlib-1.5.4.ebuild 2557 BLAKE2B 099f149f1cd35708b735a8130ba9bacec4321c7461232cb3f82496e5186207ea3262f766280b6c37c08ade856e681991af7f64db0a9dcca8414462322fd2a339 SHA512 cc2c586d71b50e6ddfec2f8de3d4a7de325baa38d0b51fbbbf80d70d24f20bf8d019f1ebc3b5d23e72aeb1f7e05fe5da05cfd83705f07c1b20d25b9f2809e8d3
-EBUILD pyftpdlib-1.5.5-r1.ebuild 3099 BLAKE2B 6ee1d19dfd00f46c358edd09926706178c49e17bfb1b48fb3c407803d16c1328f9dbb0b418724f6687841e2b71c690dbe6ae4693c0c8109cb50e7de07a28208b SHA512 993b73e1387410172574a10de1b39aecad3937417c324e8d453c2696eb09e6137695f6eaf00bcef397c7c9e7a45ca2bd19c9bc0eb3ca5f8ba202bab2a373139a
+EBUILD pyftpdlib-1.5.5-r1.ebuild 3096 BLAKE2B d2e90e44db5ab4bcfaad7f39cb6ba8eb4941bda1d954ef1dcf502d6f88facd205721a0ef361e8596dd25d2b2e37e61f095feda29513fe1f2dbbf9b5e48cea40c SHA512 fed1be4d590064ec1a67d8ef9efa654a51f0b2f7bd8f391d7d0bb70041ee8546b1cc9e26c10263a9762cc0688689559c8ec6bed3f95bb8479c6fbdf9044c01a3
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
deleted file mode 100644
index 10d6dfd7fd55..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-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="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}] )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
-"
-
-python_test() {
-	"${EPYTHON}" ${PN}/test/runner.py || die "Tests failed with ${EPYTHON}"
-}
-
-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
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
-		! has_version dev-python/pysendfile ; then
-		elog "dev-python/pysendfile is not installed"
-		elog "It can considerably speed up file transfers for Python 2"
-	fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
deleted file mode 100644
index 4ce37c1a29ec..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
-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="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" ${PN}/test/runner.py || die "Tests failed with ${EPYTHON}"
-}
-
-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
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
-		! has_version dev-python/pysendfile ; then
-		elog "dev-python/pysendfile is not installed"
-		elog "It can considerably speed up file transfers for Python 2"
-	fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
deleted file mode 100644
index e1af5de4a849..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-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="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pysendfile[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i "s/'sphinx.ext.intersphinx'//" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# These tests fail when passing additional options to py.test
-	# so we need to run them separately
-	py.test ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
-	# Some of these tests tend to fail
-	local skipped_tests=(
-		# https://github.com/giampaolo/pyftpdlib/issues/470
-		# https://bugs.gentoo.org/659108
-		test_idle_data_timeout2
-		# https://github.com/giampaolo/pyftpdlib/issues/471
-		# https://bugs.gentoo.org/636410
-		test_on_incomplete_file_received
-		# https://github.com/giampaolo/pyftpdlib/issues/466
-		# https://bugs.gentoo.org/659786
-		test_nlst
-	)
-	skipped_tests=${skipped_tests[@]/%/ or}
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	TZ=UTC+1 pytest -vv \
-		--ignore ${PN}/test/test_misc.py -k "not (${skipped_tests% or})" \
-			|| die "Tests failed with ${EPYTHON}"
-}
-
-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
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
-		! has_version dev-python/pysendfile ; then
-		elog "dev-python/pysendfile is not installed"
-		elog "It can considerably speed up file transfers for Python 2"
-	fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
index 9bd65b18de3d..759075bad823 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"