gentoo resync : 29.12.2022

6 files changed, 83 insertions, 122 deletions

diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 972ef1777f2c..a957b3f82de7 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,7 +1,6 @@
+AUX paramiko-2.11.0-invoke-tests.patch 1175 BLAKE2B 1ac310c2721b2366db7d5b2bdfa77058ebe820fba7f0c0faeb6a5ceb97621a1d2c1207109053f7b9d5a17b8b2084908afd9a3ab2ef0c6e76fd7bb94d5b439eed SHA512 bb3c7781aaa4b201d9c2f963f54aac0c76d7918c782f48981a108de7173d1db77dc42c24806bdde12b378186887922cad02504a7695b83f3cb25e9ff84ab9cd1
+AUX paramiko-2.11.0-pytest-relaxed.patch 3354 BLAKE2B 19326d3dbf4c3870dcdaeff0d9827a09894a44be2941a23f6ca7e3d8c05560b1ffa150d38e44301d9722948135a4b82a76cea16d5cfb8f8e3bcaa41bc842561c SHA512 98d508334f6d0ca3aae94a24bcc95bb9f3cfbf895b0f647896298f85ccb14e0868f948610d5e40a738d17d26fababe26a296d6acd3678c21e9351431ca3d6790
 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.10.3.tar.gz 347738 BLAKE2B ccc66a7e0fe3f777e74b94374ed59435eda440fe0aeab3871e68a132610193d2fadca1fd200db3d194566b8a2a8d6ff889d71594fed69a01fb97ca43b967e957 SHA512 e1fce2ad33ee2942b519458d53497671e66d4777c23877954b135cf9bb8ec43357156147c7e012956ccf6198de800835a617b541a4b0faf54df00f936128514b
-DIST paramiko-2.10.4.tar.gz 348637 BLAKE2B 8ce0d34418b6a1dc1d98fc180d2b2f0fb4333b7e1c52fcf7edabc3b0fc096f1b644dbc21a5b37f9001f046969c3d513ad5f6d7261339a71fa3ec922161cd7be7 SHA512 df39958e647dd6519929f68c4870228a61f54e763751e6b1d07b5e802786c85dfc34af39588009e729c4d189ca17d3aa09a58d4242403a1a1a53d36f6cd313b1
-EBUILD paramiko-2.10.3.ebuild 1328 BLAKE2B 027affeae6b512f11a8a0099964ee47b87da3e9fe9b7f11ec2c356c1329805e6ae1f20f8906446d5fd94b8f346a3ba2fb3020d8c6ece93fc20a350f91add9f73 SHA512 274d7704847af9b1e070449d865aa81c004c522f7b01fe7ec9e31626b8cc6defeebb214e301360f3fdc933fd6285c21c20e9255281aa5e31987706f93efd7e49
-EBUILD paramiko-2.10.4.ebuild 1335 BLAKE2B a00ca07b71567c67f89e2dcffc20fd22a708d0f95862d2e524cc5226bf84e1a3c4065c1dffe4c2f7c8cbbd0bb47a6504acf9865162a55f0881834c0cf3676ad6 SHA512 ab7f4680357ba5e20002609685ba56a963b838e62d420a4a6c94777b3a62e236dcc4dc369d3969c0c24ced9e88ecdec659724787877f967dfdf6a422c1e548ce
-MISC metadata.xml 1332 BLAKE2B 2254eb59425633af43d092c6cc5ff99de6da52918692f6c23c31627587c956fa4b2cd2117ad899a423d93bb1d321581891f3380301a6b44a498978aa9a710094 SHA512 dcbd15823763fd67164a4d77995a7aa16486cbbd747276991cc805a9e6fa28752c273d373a85b3f52eab10f809cf9af60a3afc1ed7bf1ac3121eebeb071e3e23
+DIST paramiko-2.11.0.tar.gz 350793 BLAKE2B 86358e08407f8a820a9b33a60e771ac3adb8f3e003ccbc4704ba69a52bd427f38a9c49a20e6a07220d07c25dbcc35a472b2091fa9f7bc1447bab0d7a1ce16b35 SHA512 59e439bd54d83938f91d6c9888f2278bafa4ca48582939580bdabc6207dbe6dc856f6006ad26b7ec91b9d39e92ca70dc6270c6b5d4f77a5e1fa0ec8bd084d4b5
+EBUILD paramiko-2.11.0.ebuild 1367 BLAKE2B 09833fc4293b0065c9339798e84e27ba3b97b25fe0eff3a2485d811c776f5c39f51eff34aac21bf3bfa3c6d8939a2bded9889c903476f5b91ed55d4e66e29164 SHA512 ca5481ab2b72f6af4464d6fb3acb478331b899817af54c5eeee369fb47cbef68e508374d1875fe04caf75a17747751cc8075c84eabb55074bbac2289b2034ddf
+MISC metadata.xml 1218 BLAKE2B 9173c01a0d0b5a37d3fb79568d9a4bd3dd6eb03d33ef7a03442761a106991f033f71d68ffb1cd3902519060a627ef7f80f998e7499fd8f2a97ced9330a7c7311 SHA512 d53cbc8f43218893f7cf8bd0d2b05dff76ce1a0a17b54e9ad8e43d12b4f6b64f3d3874ac848b0d46c3460b3c57b2197c78b4c9ee41a88e29ef224d76b376cb26
diff --git a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
new file mode 100644
index 000000000000..80fe876ef8e3
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
@@ -0,0 +1,40 @@
+From 529558cc20e448e45e24dc7b7609cd62300838b8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 16 Apr 2020 09:46:39 +0200
+Subject: [PATCH] Skip tests requiring invoke if it's not installed
+
+Since invoke is an optional dependency and only one group of tests
+require it, skip them gracefully rather than failing if it's not
+present.
+---
+ tests/test_config.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_config.py b/tests/test_config.py
+index 45fb262d..017d4bbf 100644
+--- a/tests/test_config.py
++++ b/tests/test_config.py
+@@ -6,7 +6,11 @@ from socket import gaierror
+ 
+ from paramiko.py3compat import string_types
+ 
+-from invoke import Result
++try:
++    from invoke import Result
++except ImportError:
++    Result = None
++
+ from mock import patch
+ from pytest import raises, mark, fixture
+ 
+@@ -742,6 +746,7 @@ def _expect(success_on):
+     return inner
+ 
+ 
++@mark.skipif(Result is None, reason="requires invoke package")
+ class TestMatchExec(object):
+     @patch("paramiko.config.invoke", new=None)
+     @patch("paramiko.config.invoke_import_error", new=ImportError("meh"))
+-- 
+2.35.1
+
diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
index a25b7c24ef27..6e746aff1863 100644
--- a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
+++ b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
@@ -1,7 +1,7 @@
-From e91cac80d679dfe16897988b0c14c1293a93c805 Mon Sep 17 00:00:00 2001
+From 03741e48c83856e53fc3f1487d660165cb718c11 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 16 Apr 2020 09:22:59 +0200
-Subject: [PATCH 1/2] Replace pytest-relaxed with plain pytest.raises
+Date: Tue, 17 May 2022 07:26:36 +0200
+Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises
 
 There is really no technical reason to bring pytest-relaxed to call
 @raises as a decorator while plain pytest works just fine.  Plus,
@@ -11,24 +11,36 @@ pytest-relaxed causes humongous breakage to other packages
 on the system.  It has been banned from Gentoo for this reason.
 ---
  dev-requirements.txt |  1 -
- setup.cfg            |  3 ---
+ pytest.ini           |  3 ---
  tests/test_client.py | 20 ++++++++++----------
  3 files changed, 10 insertions(+), 14 deletions(-)
 
 diff --git a/dev-requirements.txt b/dev-requirements.txt
-index f4f84748..b1b0cdf5 100644
+index 3ed9eb40..e90f3373 100644
 --- a/dev-requirements.txt
 +++ b/dev-requirements.txt
 @@ -2,7 +2,6 @@
- invoke>=1.0,<2.0
- invocations>=1.2.0,<2.0
+ invoke==1.6.0
+ invocations==2.6.0
  pytest==4.4.2
 -pytest-relaxed==1.1.5
  # pytest-xdist for test dir watching and the inv guard task
  pytest-xdist==1.28.0
  mock==2.0.0
+diff --git a/pytest.ini b/pytest.ini
+index be207cd8..5a506bcd 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,7 +1,4 @@
+ [pytest]
+-# We use pytest-relaxed just for its utils at the moment, so disable it at the
+-# plugin level until we adapt test organization to really use it.
+-addopts = -p no:relaxed
+ # Loop on failure
+ looponfailroots = tests paramiko
+ # Ignore some warnings we cannot easily handle.
 diff --git a/tests/test_client.py b/tests/test_client.py
-index 60ad310c..88fd1d53 100644
+index fdf19c45..e4af71df 100644
 --- a/tests/test_client.py
 +++ b/tests/test_client.py
 @@ -33,7 +33,7 @@ import warnings
@@ -40,11 +52,12 @@ index 60ad310c..88fd1d53 100644
  from mock import patch, Mock
  
  import paramiko
-@@ -684,10 +684,10 @@ class PasswordPassphraseTests(ClientTest):
+@@ -733,11 +733,11 @@ class PasswordPassphraseTests(ClientTest):
  
      # TODO: more granular exception pending #387; should be signaling "no auth
      # methods available" because no key and no password
 -    @raises(SSHException)
+     @requires_sha1_signing
      def test_passphrase_kwarg_not_used_for_password_auth(self):
 -        # Using the "right" password in the "wrong" field shouldn't work.
 -        self._test_connection(passphrase="pygmalion")
@@ -52,13 +65,14 @@ index 60ad310c..88fd1d53 100644
 +            # Using the "right" password in the "wrong" field shouldn't work.
 +            self._test_connection(passphrase="pygmalion")
  
+     @requires_sha1_signing
      def test_passphrase_kwarg_used_for_key_passphrase(self):
-         # Straightforward again, with new passphrase kwarg.
-@@ -705,14 +705,14 @@ class PasswordPassphraseTests(ClientTest):
+@@ -757,15 +757,15 @@ class PasswordPassphraseTests(ClientTest):
              password="television",
          )
  
 -    @raises(AuthenticationException)  # TODO: more granular
+     @requires_sha1_signing
      def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
          self
      ):
@@ -76,45 +90,5 @@ index 60ad310c..88fd1d53 100644
 +                passphrase="wat? lol no",
 +            )
 -- 
-2.26.1
-
-From af228a2d950654ccdd4a5d665da0018bd976c108 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 16 Apr 2020 09:46:39 +0200
-Subject: [PATCH 2/2] Skip tests requiring invoke if it's not installed
-
-Since invoke is an optional dependency and only one group of tests
-require it, skip them gracefully rather than failing if it's not
-present.
----
- tests/test_config.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_config.py b/tests/test_config.py
-index 5e9aa059..5eeaeac3 100644
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -6,7 +6,11 @@ from socket import gaierror
- 
- from paramiko.py3compat import string_types
- 
--from invoke import Result
-+try:
-+    from invoke import Result
-+except ImportError:
-+    Result = None
-+
- from mock import patch
- from pytest import raises, mark, fixture
- 
-@@ -705,6 +709,7 @@ def _expect(success_on):
-     return inner
- 
- 
-+@mark.skipif(Result is None, reason='requires invoke package')
- class TestMatchExec(object):
-     @patch("paramiko.config.invoke", new=None)
-     @patch("paramiko.config.invoke_import_error", new=ImportError("meh"))
--- 
-2.26.1
+2.35.1
 
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
index 7c7d0ca7ee68..05fe0aaee56e 100644
--- a/dev-python/paramiko/metadata.xml
+++ b/dev-python/paramiko/metadata.xml
@@ -5,10 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="person">
-    <email>alicef@gentoo.org</email>
-    <name>Alice Ferrazzi</name>
-  </maintainer>
   <longdescription>
 This is a library for making SSH2 connections (client or server).
 Emphasis is on using SSH2 as an alternative to SSL for making secure
diff --git a/dev-python/paramiko/paramiko-2.10.4.ebuild b/dev-python/paramiko/paramiko-2.10.4.ebuild
deleted file mode 100644
index 6f8a297919b6..000000000000
--- a/dev-python/paramiko/paramiko-2.10.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/"
-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}]
-	dev-python/six[${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.10.3.ebuild b/dev-python/paramiko/paramiko-2.11.0.ebuild
index 01fc4e263788..88f1f1aa6d93 100644
--- a/dev-python/paramiko/paramiko-2.10.3.ebuild
+++ b/dev-python/paramiko/paramiko-2.11.0.ebuild
@@ -4,14 +4,21 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 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/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://www.paramiko.org/
+	https://github.com/paramiko/paramiko/
+	https://pypi.org/project/paramiko/
+"
+SRC_URI="
+	https://github.com/paramiko/paramiko/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -31,12 +38,12 @@ BDEPEND="
 	)
 "
 
-distutils_enable_sphinx sites/docs
 distutils_enable_tests pytest
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}/${PN}-2.7.1-tests.patch"
+		"${FILESDIR}/${PN}-2.11.0-pytest-relaxed.patch"
+		"${FILESDIR}/${PN}-2.11.0-invoke-tests.patch"
 	)
 
 	if ! use server; then