gentoo Easter resync : 12.04.2020

5 files changed, 4 insertions, 122 deletions

diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index d7cc44a9c416..7693d8595b80 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,10 +1,6 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.6.0-tests.patch 1193 BLAKE2B 86063ffd478f5772e2aacbbd6e6a74262ebaa1e67126af598eb589e49484efc15b581df0bbc796c0790a5ca80d6b5a72cbd07782c7790a9782e66f857e9c2336 SHA512 5b5de9c209d6aee83dc57f2f04d1d43f7106ed135fc12427d9237cf63932408c6385f878d02ef5dbb3d09476ee516148208d0390caa21f82a113bf6ed5a8176e
 AUX paramiko-2.7.1-tests.patch 2370 BLAKE2B 9d63e9e96a3bc4a1ecc7762ff0b7663c13ae82b6f4d2b46343847059b03bd91ad3b16ddb2e2204f15cf8c6eb14310857ff7c0af7ad420f27d2ef11f500057414 SHA512 4c9dbe97d9c2957f26838b46897d776c08ea20040c452b9dea8466288271811e51f491277c8c5e544c0b47e1eb50fdb5baacce1e6254c7f2cf2f45de6ab20a19
-DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
-DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a SHA512 1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2
 DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
-EBUILD paramiko-2.4.2.ebuild 1493 BLAKE2B 183fdbc5e27fc3edf73402168e8f732c7df56e0c17cbe9e6969f66b191c1de926f260f7f9c0747a7045e31d91f60a0abf2418ee70007b6c058b3a81e6bc6143d SHA512 f279678f9df21a5ce89b996e21b2c492d021d92670671cb3f2e6a7ae22d6181ef66371776d406f61b51dec8816d2235a5352ab37015e69bfb6dcbd8f64a54f7e
-EBUILD paramiko-2.6.0.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3
-EBUILD paramiko-2.7.1.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3
-MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
+EBUILD paramiko-2.7.1.ebuild 1492 BLAKE2B 1b097faec002d14dced8eb1ab42bb09fe638c30016c6d65d8295bacbcbbc9c3c3d3c421ef6d026151d4740ea2ec7c67af4f9b6b54933b138f7a44eaa647cb34b SHA512 8c255efb737f85c46656ec9a10c770f158015274661eaaf566c6af0ea298133414275da1885d83f30ec159c0ccf14b854876806c0df7938294dc8b32a950b822
+MISC metadata.xml 1331 BLAKE2B 4e53a314a1a86c488328a89170e03932bab1944bb133cd8551333da5a4cb80600e1bd5238b858bdc3565334cbc7251782979f4a770b43d064a9bb5096fdec7d7 SHA512 14cad597d85d0778ee8b2ce5c7cdda768e8f3cfb8de084189e7d0b422b77c73c2410448c8c013c1f03864e7b4365a87c1bba16fe49081f728c3bfef3d0ba455a
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
index 3624b8442687..0665653c36dc 100644
--- a/dev-python/paramiko/metadata.xml
+++ b/dev-python/paramiko/metadata.xml
@@ -21,6 +21,7 @@ are supported. SFTP client mode is now supported too.
 用している所です。有名なCipherとHash処理の全てがサポートされています。SFTPクライ
 アントもサポートされています。
 </longdescription>
+  <stabilize-allarches/>
   <use>
     <flag name="server">Enable server feature</flag>
   </use>
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
deleted file mode 100644
index 5353f2a07fcd..000000000000
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-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/"
-# 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"
-
-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}]
-	>=dev-python/cryptography-1.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	if ! use server; then
-		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
-	fi
-	eapply_user
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -s sites/docs
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		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
deleted file mode 100644
index 694ab7ad7eee..000000000000
--- a/dev-python/paramiko/paramiko-2.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-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"
-
-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="examples server test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${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
-
-	if ! use server; then
-		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
-	fi
-
-	eapply_user
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.7.1.ebuild b/dev-python/paramiko/paramiko-2.7.1.ebuild
index 694ab7ad7eee..654fb81112a4 100644
--- a/dev-python/paramiko/paramiko-2.7.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.1.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="examples server test"
 RESTRICT="!test? ( test )"