gentoo resync : 24.06.2021

3 files changed, 42 insertions, 3 deletions

diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 60de562ade24..7c37ec132f9f 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,5 +1,6 @@
+AUX traitlets-5.0.5-python3_10.patch 1221 BLAKE2B a3f8617f09ae6a5def19d319d2e4886f95f3935a3165d9b88395273235b510ccf0853520634abfb05385167f8c4fdbcadf258b9b3fbdf4847eefe7b6932453af SHA512 6885806a75d8c64bd4a88d665c09291b13871a2009b381569782240d0c9a10552e4f988c92775b3f83b1977c13094afd96c14b9f88a1744b11792dba688bb028
 DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
 DIST traitlets-5.0.5.tar.gz 128856 BLAKE2B ad3e5d6dbdf3f118a86be0106e0243146ff833c40300c5fd4c5704db323fcfa4b30d87a88e66608e3a54672c9a7cd6ce07bd9596827fa7ce08625626c9610f7e SHA512 ec5901bab493949f656269a6f7a9211f919a29510d22a6ed440f1e3577dfcb73a6aeca8a0e7d2a6e23192b9ab4844beef1012a847ef08180e64cfb1e2cd40bfa
 EBUILD traitlets-4.3.3.ebuild 623 BLAKE2B e54fc9f3aadf2e16e61f0cab8639bee2202492eda146f39a76c8575a0b4a7656aab292c50d0f728697fa146c1db60c9baa0baa57902a05557213dd7cc1f516aa SHA512 7cd01dff3e9e707475a77f6018f71d1a20010820b46e9aa1e27c80bfb9d3bbd5bfe6fa3dbc1cb3049571722404281882ad135dd1202af4e85c1ca1e93fbd652f
-EBUILD traitlets-5.0.5.ebuild 594 BLAKE2B 07afaae29264eaa710e19a10ff44d3af2da5dc90bc7a5cc84774fbc4a6b9561a3e8d82eae8505c35616a184dbaaf0f11ed602aa52c1d06601f574ee9f3183344 SHA512 93ad1fec965f747c30efb4f3cbac10500924b61a4b3e48e427500ae16ea59816856623cce8715282d58faa576d47a618c7407cde567c23c129b5fbdeee5a18bd
+EBUILD traitlets-5.0.5.ebuild 672 BLAKE2B 720d551bb8ad27d2b55df71d590e4dd310517b159d7995f18fb47655e47126427d8377a7621940a5d89e62561abdf95eb767032a59031a91624049e7825ca07c SHA512 365486105e057e9f667824a6a533c236d4ceeb78d2afba30e94b4a5d0fbb50c1617a5d728c98cb1ece4e551698642a294141187d04c5dd0a77839cd0fe55c014
 MISC metadata.xml 736 BLAKE2B 4b61d7d9106717f7233fb7e4ad676efe0d543a0585ec99165d2253d75128e99be4336fcf8a473f0bb161d41d479b458b4470efb1ec2dfa6820d4a82939f8723f SHA512 5261fe54741b898efc3290f3b939fefd03a6686b2be0d43e8a9eb0bd5e506e7df4ef04bfcd6079f69e83e4c88aa6d035e572a9d6a577f1f4e8b56e01c49b0b89
diff --git a/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch b/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch
new file mode 100644
index 000000000000..53ade693a3ad
--- /dev/null
+++ b/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch
@@ -0,0 +1,33 @@
+From dbb604946745ed90c6e9f6ed17f2bde253042d52 Mon Sep 17 00:00:00 2001
+From: Olga <olgamatoula@gmail.com>
+Date: Fri, 7 May 2021 17:27:09 +0100
+Subject: [PATCH] Fix string assertion for python3.10
+
+---
+ traitlets/tests/test_traitlets_enum.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/traitlets/tests/test_traitlets_enum.py b/traitlets/tests/test_traitlets_enum.py
+index 769e830b..a87dd705 100644
+--- a/traitlets/tests/test_traitlets_enum.py
++++ b/traitlets/tests/test_traitlets_enum.py
+@@ -5,6 +5,7 @@
+ 
+ import unittest
+ import enum
++import sys
+ from traitlets import HasTraits, TraitError, Enum, UseEnum, CaselessStrEnum, FuzzyEnum
+ 
+ 
+@@ -87,7 +88,10 @@ def test_assign_scoped_enum_value_name(self):
+             example = self.Example()
+             example.color = value
+             self.assertIsInstance(example.color, Color)
+-            self.assertEqual(str(example.color), value)
++            if sys.version_info < (3, 10):
++                self.assertEqual(str(example.color), value)
++            else:
++                self.assertEqual(repr(example.color), value)
+ 
+     def test_assign_bad_enum_value_name__raises_error(self):
+         # -- CONVERT: string => Enum value (item)
diff --git a/dev-python/traitlets/traitlets-5.0.5.ebuild b/dev-python/traitlets/traitlets-5.0.5.ebuild
index 75a741049c58..d1bd74f7d5f2 100644
--- a/dev-python/traitlets/traitlets-5.0.5.ebuild
+++ b/dev-python/traitlets/traitlets-5.0.5.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
@@ -17,7 +18,11 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	"
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3_10.patch"
+)
 
 distutils_enable_sphinx docs/source \
 	dev-python/ipython_genutils \