gentoo resync : 02.02.2022

4 files changed, 3 insertions, 116 deletions

diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 7c2727cc5afd..5aed7abd0c05 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,11 +1,7 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.7.1-tests.patch 4119 BLAKE2B 516417ae1b3ee7a5d189defaf37a397045ed0172948adf1a09534a697606a2ea1636e849d6d2989f29a287bc307a33530a7fb8135a57040da915047fba1f1d31 SHA512 ecd247dc00898c577b9b1cea0316b29c1be0c5e46865bf4f4508392fc2ca6e2d4c2a1938aa74f07dbe94bfbfa37f80129226ef1f1688a7449fc29ca99264c829
-DIST paramiko-2.8.0.tar.gz 332217 BLAKE2B fcd691159b0306204064806881f8a42e7310fe23daf22c5de5ce8124d1496d48606247ab03c7657ff01560f801121a35011e0e615c5e142c41d191568f5b2300 SHA512 15f6e1cab9afdf3285804ce09b3af6c20ffc1f8e50d2549272f0ea545d1fdc858e72c7cba085db85c69aad2033655ae2f025e8ed2bd0dff574bcc03156bdb6ed
-DIST paramiko-2.9.0.tar.gz 344160 BLAKE2B b3436934143971b8a16f6100b6d1633b8ce37303d9be16fd228d7c8c83849e3ef8875cb5d3a3cfa8f08e9e72822ed1dfd310782f1fea0b32051758030b7a1f70 SHA512 3385f837ad36131f4508021b4ee0f073f293c0c1005768071becdfa0b9897dc7dd05467009329160f1eee709d32da72fe9e45fb6d61ea099f64748b00cffce14
 DIST paramiko-2.9.1.tar.gz 344470 BLAKE2B b750cf27d3a1324193f4c9bb39cbf773a4ad859dd3af3065da82d35177b2be9561c5175e15e9dcf4612a109849b5cfeea0d6a5f08098d3a6f3e529310ea8abc8 SHA512 d86824451be417322e0cdd073b31c103e737663af89f31abb1de21b5fbb9bdaa4b2e49505d2bc599114173df2457dcea308eb5c445fc5191248eb13e4c1eb500
 DIST paramiko-2.9.2.tar.gz 345088 BLAKE2B b3b95ec222ac5386fba311c2f0878a44a92bfd0d6edd45c928e2c681fccaf66f2bcfb185cf3eafd37361dc119127623d2c690a981e9f30bfe280eb4c1a0f66e6 SHA512 5b0810358376e4a42ba38ffa4a713f104b122fd77d463a80937dd6dc529da70825d6741fec16f93071aefe4bbfa6f0dbdb2eabd125663c19ba4d35ac06ecfa90
-EBUILD paramiko-2.8.0.ebuild 1321 BLAKE2B ac97798cf13221023a18f0dc6d26ea29abf2af40bbc480d997d6884897dcf72a2f6956fc2b6e3ce8c41f4688a6331227da276aefbc4d7a06dfd5ab5e30acfb9f SHA512 2f3f0b8258ad5ce654a5c73c33109464b60e20cabfb514e4664281db1fe36de17b2e3f8318d01dc7b6384c956f1a64fa766c14acd7662b53e12391114bb45993
-EBUILD paramiko-2.9.0.ebuild 1360 BLAKE2B 73594d93299e034820e48c9d541b833b8db2a77f26834bb890f9e2bb039e6f975b66d19f094315307dae19ec1830fb05d901daada43fa055e05f0f07958eb03d SHA512 51e54a7c706579542c5ed291bb83b148be5b681eb9261bc6037693d6bd3a44ff0d76f3b608e5418042c4b961f3bfbf542d3373bce851bcd61427bfa3044fb8e5
-EBUILD paramiko-2.9.1.ebuild 1360 BLAKE2B 73594d93299e034820e48c9d541b833b8db2a77f26834bb890f9e2bb039e6f975b66d19f094315307dae19ec1830fb05d901daada43fa055e05f0f07958eb03d SHA512 51e54a7c706579542c5ed291bb83b148be5b681eb9261bc6037693d6bd3a44ff0d76f3b608e5418042c4b961f3bfbf542d3373bce851bcd61427bfa3044fb8e5
+EBUILD paramiko-2.9.1.ebuild 1353 BLAKE2B ec3a57888541f39ec0f490564c6f8b973d0ffade3351e0a387445d12c694aff31d7b5388ba1a9f3eb9317012938ca4dac87119832a5405d36a4eff44ccc04002 SHA512 9eff7bfe3d022eb6475242f1376fd375704a46516559b77e1b57063b02e196e94ccbe826f30d8bfc7271b8cfec5198e1cef2986fee004c8a21661ae69858b484
 EBUILD paramiko-2.9.2.ebuild 1360 BLAKE2B 2c50f435c4f3b4cf9ac5bb3bd81960010fd390b4c31744d1b81b2b4787345003d492a247f43532412ae3829e0175243615fec5b08cca269ad16275800894e511 SHA512 3e7521aa1d0f266aabf489e078cb47667627055658d8bea2fdaf9cefe8eb5e376b3d976b0f06670d021ad6ab838d2f5591ea53bb25830387f52028051aeae879
 MISC metadata.xml 1332 BLAKE2B 2254eb59425633af43d092c6cc5ff99de6da52918692f6c23c31627587c956fa4b2cd2117ad899a423d93bb1d321581891f3380301a6b44a498978aa9a710094 SHA512 dcbd15823763fd67164a4d77995a7aa16486cbbd747276991cc805a9e6fa28752c273d373a85b3f52eab10f809cf9af60a3afc1ed7bf1ac3121eebeb071e3e23
diff --git a/dev-python/paramiko/paramiko-2.8.0.ebuild b/dev-python/paramiko/paramiko-2.8.0.ebuild
deleted file mode 100644
index 306d7b0ac2a2..000000000000
--- a/dev-python/paramiko/paramiko-2.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples server"
-
-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="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx sites/docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.7.1-tests.patch"
-
-	if ! use server; then
-		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
-	fi
-
-	eapply_user
-}
-
-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.9.0.ebuild b/dev-python/paramiko/paramiko-2.9.0.ebuild
deleted file mode 100644
index 2e493ae04c6f..000000000000
--- a/dev-python/paramiko/paramiko-2.9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples server"
-
-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="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx sites/docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-2.7.1-tests.patch"
-	)
-
-	if ! use server; then
-		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
-	fi
-	distutils-r1_src_prepare
-}
-
-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.9.1.ebuild b/dev-python/paramiko/paramiko-2.9.1.ebuild
index 2e493ae04c6f..5075c241b284 100644
--- a/dev-python/paramiko/paramiko-2.9.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="examples server"
 
 RDEPEND="