gentoo resync : 15.12.2019

3 files changed, 14 insertions, 19 deletions

diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 4e109643ce53..406e4db37dde 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -2,6 +2,6 @@ AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556d
 AUX paramiko-2.6.0-tests.patch 1193 BLAKE2B 86063ffd478f5772e2aacbbd6e6a74262ebaa1e67126af598eb589e49484efc15b581df0bbc796c0790a5ca80d6b5a72cbd07782c7790a9782e66f857e9c2336 SHA512 5b5de9c209d6aee83dc57f2f04d1d43f7106ed135fc12427d9237cf63932408c6385f878d02ef5dbb3d09476ee516148208d0390caa21f82a113bf6ed5a8176e
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
 DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a SHA512 1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2
-EBUILD paramiko-2.4.2.ebuild 1503 BLAKE2B 2cce9eb3134a7bd8ec022ab9d590b683c12464e27bbed321471d602a598fc8d954827b3c0b46a78cf4e9f721f0f4d796587f16a63cb6c6c89086f3b16e850710 SHA512 332b6beca4aaf485ead45b59651728d3b19457ab4ab7a5676aa2741deb13abd23608a9efba2477c0c02d4123011a2ee17ec0e94b4acdc75c0c89fcb53bfe54f8
-EBUILD paramiko-2.6.0.ebuild 1645 BLAKE2B 05759cdd0ef9cfae2a545009d28f95a5d2cc6937058b85d17cdd9c393db1302e92e6b22b16a2e9bdc9e8e2dcf4bb048dfe30ef3465d4f8b98b816f0696aa5b8c SHA512 d11a4351c148120b156392c92ff06ee300382a3b75797405bba5042107570e49ae875c8a308f294222a907acdd16cf470fce4ba77925b9ad4d2e0455b7759b36
+EBUILD paramiko-2.4.2.ebuild 1494 BLAKE2B fabb448af23b231105975f393b16c5e81cd39fe5e3838ad7e1298e4b06ba0567e95a4842803c39049f01d1ec7b6df570427c11f5ee9c95b028525f669e0e7870 SHA512 1c8b1663a261fa52b8f582a9f3040e451abbe45f68bbeadc723637bd59c55791c7a20a2619b1bb8f7b1024765b7e11366365b65e07d20880c88b596dd15913ef
+EBUILD paramiko-2.6.0.ebuild 1506 BLAKE2B 5c3d9487209d7bff99de46c78dd292721935a514c02bec232bbef5786f5fea5c5c184c4f6ff051766cfe038a526a4ed1aec400ec787ca813f044b14f598119f6 SHA512 c18f2d11b016b2b2c8e3658faa7b8ca859d66e1525b0b0de770d4c07a9abc5ca1075798c7fc83dd0c90e85c4071b2d87f3e5676054a2152c4d6be616ed7fd111
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index 1cb412f91403..751e6e4b1f19 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -18,6 +18,8 @@ LICENSE="LGPL-2.1"
 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 ~m68k-mint ~sparc-solaris"
 IUSE="doc examples server test"
+# Depends on pytest-relaxed which is broken
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
@@ -30,9 +32,6 @@ BDEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
-# Depends on pytest-relaxed which is broken.
-RESTRICT="test"
-
 src_prepare() {
 	if ! use server; then
 		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
@@ -50,7 +49,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demos/*
+		docinto examples
+		dodoc -r demos/*
 	fi
 }
diff --git a/dev-python/paramiko/paramiko-2.6.0.ebuild b/dev-python/paramiko/paramiko-2.6.0.ebuild
index 4b8d6e39f845..5587e75a3c8f 100644
--- a/dev-python/paramiko/paramiko-2.6.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.6.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
 DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
 # pypi tarballs are missing test data
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +17,8 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 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 ~m68k-mint ~sparc-solaris"
-IUSE="doc examples server test"
+IUSE="examples server test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
@@ -27,13 +28,14 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
+distutils_enable_sphinx sites/docs
+
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-tests.patch
 
@@ -44,21 +46,15 @@ src_prepare() {
 	eapply_user
 }
 
-python_compile_all() {
-	use doc && esetup.py build_sphinx -s sites/docs
-}
-
 python_test() {
 	py.test -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-
 	distutils-r1_python_install_all
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demos/*
+		docinto examples
+		dodoc -r demos/*
 	fi
 }