gentoo auto-resync : 05:04:2023 - 05:24:13

3 files changed, 93 insertions, 1 deletions

diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index f58bc7b367e8..4bf4e443975a 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,6 +1,7 @@
 AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79
 AUX cffi-1.15.1-hppa.patch 2097 BLAKE2B 2cd3a1b155b71bcb3d70e3659950c45c36959f0c2090fe560d47bf60e53aa8a2df50dc3b713602c589e6bccecdef27230ee6cb800259bf275dbd052beff03da3 SHA512 ba320e8cb56b58066a44162c8a176d167b4a05a760451a0e0821969cd2ad8fff50e54d54ec8f8c4f93ee1a2e3e71467c7c2d6d94c593ec21892e7d03fdf7c50d
+AUX cffi-1.15.1-python3.11-tests.patch 3023 BLAKE2B e25bd9d22b81187b0eab65073930980a2975eec3086462396cfc4796fd5273edab9af2324884c2e55880825ddd046b7ebc5054adfe57574ee691f0fa2145dcd2 SHA512 4d202f8c943bf33ea359f47aa3e53e007bc3dbeb3320a6efa302b1b1ec309b2dde72f6cfe1a591c594f3321ed5c65d61e9f79a03ba3107cd7008699686719497
 DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
-EBUILD cffi-1.15.1-r1.ebuild 1560 BLAKE2B 2b7d2e7a0861bbbcd45c0b0b3e5d879e7c1e4e7bd16aae0f98a0c6e61b76ccfb98b932e4ec8da51d5500e9cab6bc1f480c6a1e4df251bb1829e810b5c72172b8 SHA512 1e3ebcd9233c2ce0a4b8ea4ff25c7c48e52b7d8f0491b704791d184048437857e09a28214735f0946c35cc7f49a3af4a5b1d4177dc7f8509be3bc8cb9d1e1beb
+EBUILD cffi-1.15.1-r1.ebuild 1603 BLAKE2B 19042aa0cc31809ac17a1dc4054a6fe91a479ddf98220f94e662c56395be2208269b8d90f0b6862e9e465077c94e6cafbe6f39b4d1cce410a0a0341358171958 SHA512 e7cbdc6a83829f09d0b43137345ae7e362e8003012d6a03fc93d2ba84ec7b1901eea97c3e6a4bb7c84a2c70708e059bf20356ef079cbf6dbf3cc60e1cf9ee0f7
 EBUILD cffi-1.15.1.ebuild 1521 BLAKE2B 53a54cc90257d8c11f9f72fd1b68c839ea7faa16a395a7a479ca19dfbb6f252e74bafdb97ac710de5c1807545bf89d381f8265e9103b132f51a85ab3bf75f36f SHA512 d5a0c25b2a443dfca09fa34cfe8f1a0228e47d025a7ae5a7421ed26be2ba6243b6068f9a13412277d94d273b60cc3c1c852adaa4f469472179b328180ef85f8d
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.1-r1.ebuild b/dev-python/cffi/cffi-1.15.1-r1.ebuild
index fc58f4f7e3fb..192186933382 100644
--- a/dev-python/cffi/cffi-1.15.1-r1.ebuild
+++ b/dev-python/cffi/cffi-1.15.1-r1.ebuild
@@ -39,6 +39,7 @@ distutils_enable_tests pytest
 PATCHES=(
 	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
 	"${FILESDIR}"/${P}-hppa.patch
+	"${FILESDIR}"/${P}-python3.11-tests.patch
 )
 
 src_prepare() {
diff --git a/dev-python/cffi/files/cffi-1.15.1-python3.11-tests.patch b/dev-python/cffi/files/cffi-1.15.1-python3.11-tests.patch
new file mode 100644
index 000000000000..e3be1c247877
--- /dev/null
+++ b/dev-python/cffi/files/cffi-1.15.1-python3.11-tests.patch
@@ -0,0 +1,90 @@
+https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816d789639b49d3ae867213393ed7abdff
+
+From 8a3c2c816d789639b49d3ae867213393ed7abdff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Fri, 15 Jul 2022 16:11:37 +0200
+Subject: [PATCH] Adjust tests for a last minute Python 3.11 change in the
+ traceback format
+
+See https://github.com/python/cpython/issues/93883
+and https://github.com/python/cpython/pull/93994
+
+--HG--
+branch : python3.11.0b4
+--- a/c/test_c.py
++++ b/c/test_c.py
+@@ -1342,11 +1342,11 @@ def test_callback_exception():
+     except ImportError:
+         import io as cStringIO    # Python 3
+     import linecache
+-    def matches(istr, ipattern, ipattern38, ipattern311):
++    def matches(istr, ipattern, ipattern38, ipattern311=None):
+         if sys.version_info >= (3, 8):
+             ipattern = ipattern38
+         if sys.version_info >= (3, 11):
+-            ipattern = ipattern311
++            ipattern = ipattern311 or ipattern38
+         str, pattern = istr, ipattern
+         while '$' in pattern:
+             i = pattern.index('$')
+@@ -1400,16 +1400,6 @@ Traceback (most recent call last):
+   File "$", line $, in check_value
+     $
+ ValueError: 42
+-""", """\
+-Exception ignored from cffi callback <function$Zcb1 at 0x$>:
+-Traceback (most recent call last):
+-  File "$", line $, in Zcb1
+-    $
+-    $
+-  File "$", line $, in check_value
+-    $
+-    $
+-ValueError: 42
+ """)
+         sys.stderr = cStringIO.StringIO()
+         bigvalue = 20000
+@@ -1424,13 +1414,6 @@ Traceback (most recent call last):
+   File "$", line $, in test_callback_exception
+     $
+ OverflowError: integer 60000 does not fit 'short'
+-""", """\
+-Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert the result back to C:
+-Traceback (most recent call last):
+-  File "$", line $, in test_callback_exception
+-    $
+-    $
+-OverflowError: integer 60000 does not fit 'short'
+ """)
+         sys.stderr = cStringIO.StringIO()
+         bigvalue = 20000
+@@ -1479,19 +1462,6 @@ Traceback (most recent call last):
+   File "$", line $, in test_callback_exception
+     $
+ TypeError: $integer$
+-""", """\
+-Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert the result back to C:
+-Traceback (most recent call last):
+-  File "$", line $, in test_callback_exception
+-    $
+-    $
+-OverflowError: integer 60000 does not fit 'short'
+-Exception ignored during handling of the above exception by 'onerror':
+-Traceback (most recent call last):
+-  File "$", line $, in test_callback_exception
+-    $
+-    $
+-TypeError: $integer$
+ """)
+         #
+         sys.stderr = cStringIO.StringIO()
+@@ -1526,7 +1496,6 @@ Exception ignored from cffi callback <function$Zcb1 at 0x$>, trying to convert t
+ Traceback (most recent call last):
+   File "$", line $, in test_callback_exception
+     $
+-    $
+ OverflowError: integer 60000 does not fit 'short'
+ Exception ignored during handling of the above exception by 'onerror':
+ Traceback (most recent call last):
+-- 
+GitLab