gentoo resync : 15.06.2021

3 files changed, 40 insertions, 1 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 1fe170f6fe5a..c9ad7b78ff18 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,6 @@
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
 AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19ebd952ef1d5e10f6c702962cb20a83fec48cce5fb0cc35a8da47df2370e85879bf01b9e95f4c271d2d3241f9ea9545 SHA512 f1d2270644e43dfc2ff31ed900456c5707ea19a83447ab80a4d3013e44db36f726676917156930385547f8a75bdbc8835d46d7e6f3301fd51f187c281a5425b0
+AUX pytest-6.2.4-py310.patch 1288 BLAKE2B 7fc0054de8a991f71fec041372839b8df52da5e1d5ac88b9e813f8456892839e3bbd63d6f8593989d7912b24bc552fe5f3a83c1cdee5161333721531b1e9d3c2 SHA512 715318d9b6520e31df6399957d14c7bba608288152359101a84b20b139d289be584f7b87856bbdef4eb4b2c85415ae679a6c018caeab4f9d228a4f1cf3a8d2ef
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
@@ -9,5 +10,5 @@ EBUILD pytest-4.6.11-r1.ebuild 2471 BLAKE2B 159e689c5597088979d0d1d0e9be37b0128f
 EBUILD pytest-5.4.3.ebuild 1938 BLAKE2B e40cc338970d931c7cd51b5a6377f5d73cae21789fcea2a6f2b401f92fb9dbe6e12c45b3357a10b76c0d6bc11708f35b8fc65a3b7084328b5664c0ad2baa6c77 SHA512 dbfc71f4a77d366a1eb55d38a1c8f209f6e6d42fe22d0604a5695d8e99faae05883b82fec45b7192399ccbc7bddc25997291fca9638edc01d961b292190d25e1
 EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B dddcee1dba302a810b80dd9832edc6af6f044ab728497498b5b4b762dfbe383d7255fce15b0615c37c3857ee2353546de2ee6b7093b01651f43ad4df7cbbfaf6 SHA512 e9ba570887b4ff0889abc2db20b3de2e634be5ba5ba60679f45c466006d3f7626c329c65f427b1cc6ede1942d2786ef4da44528a82d8be09752e1e028dcad2f6
 EBUILD pytest-6.2.2.ebuild 1680 BLAKE2B e415039d858be4f81b542b7c82d1781c61cad61c52575b145d9781057af6d12490c45a85d583add9dcf1555b0932a1db30beea6ecee45f9b7bcfcfcc2b62875b SHA512 0e4d8dfe3eed27af6c5ba337928ee417776b64dbaeb0dc8e8f163f6c7b3c62ddd0906f4a94250b21651bcaa088f865a7a485907123fe45a2a39b98b018e5c3af
-EBUILD pytest-6.2.4.ebuild 1676 BLAKE2B 8b03406d6b7dc0867d5e6fbbafbd8cb99efc69a1cd53001b5bf611d5416fc2cf5cfe2f472619ff4ffe9c06a9a8f80767ddcf6272c33355cd0b653229611002c3 SHA512 38b1e5cd8918f256b6ba6b9df8202c0a4dfdbdd9f3d2082aa6553b516d59e735a196b4e556373efd61466d2c22d930b91a77f23dec48807178bbab4acec6b63a
+EBUILD pytest-6.2.4-r1.ebuild 1721 BLAKE2B 930d9090a3cd0c3e33d0b55bfc73711721c49fefa217d554be5d029966e00275c6b1694853cd5ec3832331e4df9ade9f0ba4a0539f3b053ed4519b4d5dee40f2 SHA512 ddf8d993ef02a0df97989c478896284a587653d57b0002b9747785aaf96e2c16502a7cf54c96ab1e9b5f9da15182d34d7bbe133a52f28fc263305d8e6ab4e2f3
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/files/pytest-6.2.4-py310.patch b/dev-python/pytest/files/pytest-6.2.4-py310.patch
new file mode 100644
index 000000000000..88c8f703f08a
--- /dev/null
+++ b/dev-python/pytest/files/pytest-6.2.4-py310.patch
@@ -0,0 +1,34 @@
+From 78fb97105f38dc286353bbc331a243b6e753fe3c Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <encukou@gmail.com>
+Date: Wed, 6 Jan 2021 13:33:33 +0100
+Subject: [PATCH] Make code.FormattedExcinfo.get_source more defensive
+
+When line_index was a large negative number, get_source failed
+on `source.lines[line_index]`.
+Use the same dummy Source as with a large positive line_index.
+---
+ src/_pytest/_code/code.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
+index b85217560..af3bdf056 100644
+--- a/src/_pytest/_code/code.py
++++ b/src/_pytest/_code/code.py
+@@ -721,11 +721,11 @@ class FormattedExcinfo:
+     ) -> List[str]:
+         """Return formatted and marked up source lines."""
+         lines = []
+-        if source is None or line_index >= len(source.lines):
++        if source is not None and line_index < 0:
++            line_index += len(source.lines)
++        if source is None or line_index >= len(source.lines) or line_index < 0:
+             source = Source("???")
+             line_index = 0
+-        if line_index < 0:
+-            line_index += len(source)
+         space_prefix = "    "
+         if short:
+             lines.append(space_prefix + source.lines[line_index].strip())
+-- 
+2.31.1
+
diff --git a/dev-python/pytest/pytest-6.2.4.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild
index 267da87475fd..ced1fbce5e57 100644
--- a/dev-python/pytest/pytest-6.2.4.ebuild
+++ b/dev-python/pytest/pytest-6.2.4-r1.ebuild
@@ -43,6 +43,10 @@ BDEPEND="
 		' python3_{7..9} pypy3)
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
+
 src_test() {
 	# workaround new readline defaults
 	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die