gentoo resync : 15.12.2019

5 files changed, 27 insertions, 27 deletions

diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 0a1d114ebb1b..5c85fca214ab 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -2,8 +2,8 @@ DIST pyftpdlib-1.5.1.tar.gz 127582 BLAKE2B 00233ab4acf5aae4902384f514de0d6da9a55
 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 1281 BLAKE2B 0bc375910125dcbdd1688ca0d66e967d875eb9b037ff6d7bf1f2d5f1e4ad57d0d24ea2873ec25147d2c99e1af7bc055f4d8f096e56f8d2dbf9c2556c14462e9f SHA512 38df978e8e06148c86d9d2a9d7e2c681030a34ce508afdf9603e81d2eb9cae56b196d39e1aab6d3db1286057005492e84f5d0d18df97e038dc1b28e0f5281727
-EBUILD pyftpdlib-1.5.3.ebuild 1529 BLAKE2B d968e376494de472de20c114e21b8803fdb2432fdc09aa51a7171620f23698134867603d3989b397a2468228a6bc1f17e13fdf61eec856e456935a88ae5e95ca SHA512 63c60bbeb499099f07b6e56b5266007676c4699eddf7bd3056c469cd66d9d4829e551d836eb1e1264ad18f65904ec0fd4e34c52f1fa4e8e28f6bffb173e0324c
-EBUILD pyftpdlib-1.5.4.ebuild 2530 BLAKE2B a5e4af31fe0ce8dab5f1fd4e81ba1d730e945a9d86fa1b2c551925e1d5ce28d0bbbeb2145befe384feca12fe02466ff23b95c5f574d12fb4e23145fe76f8e6c8 SHA512 4355337e73101ffe1dad0765913ff965f31ad3cae7a145b077ad3c02a48db6a45c8890271d6db9f8649afe0aa5c22d9e75977423dc0e3b0a09f3c6ab0a419348
-EBUILD pyftpdlib-1.5.5.ebuild 2568 BLAKE2B 29fba41c9d8240704ee39fb9301a709e11d4b953ade6ef0ad3015f1c705bbd2dc3920b811852dc895af2ae347093ae9ee0c3549abbe6e9b6d9090a76a79d0d05 SHA512 993231eacee4442e88b5468c9ac48db72a79124d08b21bee11b7e93f522f5204b5d858d258cfb553aba24c8812314fba9c5534ae43e2dec815a5b7ea22fb2cba
+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
 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
index f17905c6aa59..10d6dfd7fd55 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
@@ -15,6 +15,7 @@ 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}] )"
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
index 8110db6b371a..4ce37c1a29ec 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
@@ -15,6 +15,7 @@ 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}] )
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index 1b1df6a72372..e1af5de4a849 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -15,6 +15,7 @@ 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}] )
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.5.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
index 7d37efe8f962..9bd65b18de3d 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.5.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -13,8 +13,9 @@ 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"
+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}] )
@@ -22,10 +23,6 @@ RDEPEND="
 "
 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}]
@@ -35,17 +32,7 @@ DEPEND="
 	)
 "
 
-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
-}
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 
 python_test() {
 	# These tests fail when passing additional options to pytest
@@ -55,18 +42,28 @@ python_test() {
 	local skipped_tests=(
 		# https://github.com/giampaolo/pyftpdlib/issues/470
 		# https://bugs.gentoo.org/659108
-		test_idle_data_timeout2
+		pyftpdlib/test/test_functional_ssl.py::TestTimeouts::test_idle_data_timeout2
+		pyftpdlib/test/test_functional_ssl.py::TestTimeoutsTLSMixin::test_idle_data_timeout2
 		# https://github.com/giampaolo/pyftpdlib/issues/471
 		# https://bugs.gentoo.org/636410
-		test_on_incomplete_file_received
+		pyftpdlib/test/test_functional.py::TestCallbacks::test_on_incomplete_file_received
 		# https://github.com/giampaolo/pyftpdlib/issues/466
 		# https://bugs.gentoo.org/659786
-		test_nlst
+		pyftpdlib/test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
+		# 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
 	)
-	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})" \
+		--ignore ${PN}/test/test_misc.py ${skipped_tests[@]/#/--deselect } \
 			|| die "Tests failed with ${EPYTHON}"
 }