gentoo auto-resync : 14:10:2022 - 19:44:42

4 files changed, 65 insertions, 4 deletions

diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index ec77301c8235..a8c9062b3596 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,7 +1,8 @@
 AUX autopep8-1.6.0-lib2to3-deprecation-pytest.patch 1094 BLAKE2B fbca6a4c342f525cf20487551133d9a0279a00ed0de4439d3fe73736afaa70c4ae3d3ba2c2960d87423d2b6b98fb08f6c3604e17c9078dc9880f91cf090509fc SHA512 7f4204495c5ca0acfb3cf411c17cf4cdf6e340d84ff4a8a494ff33494923813e73b8bf55db975bd4f6c0fed1abb7669bb77c89be1512e9d8629cbb5898999440
+AUX autopep8-1.7.0-tomli.patch 1798 BLAKE2B a9742baf1be7720d2d7db36e9af40f0408203fdfdd1e6f771981dd52b0d9ddb3458edad4ebe1825a5534bbb3498f6a1ceb8f48a0bacb6bb82d1e6f1dbd4f343d SHA512 dc8257f7bad16396cbfd731eb1e00226ae874fbb88a95992ef1e974ceff60303cf098ad572cf37d1bf38c3b597c7b220cdc4c3cf6392eb5f4d26f6203f389b0f
 DIST autopep8-1.6.0.tar.gz 122165 BLAKE2B 606ccf7ab51b52db95287384f9b19fd0f72da9e8fb4537bf395651622a95f88d782679550e61816d60dd3faa2fa096c979575d60cbd95476fa1cd7cf2c4f4180 SHA512 f4ffd564ceb48ff1f37d0a051aa8fefc60595a68709045c13561d8ab73de48dce99cc12acf40559e587ba4f6fddd4727dd2b40691ce43c991d60dda2c8b0d617
 DIST autopep8-1.7.0.tar.gz 117055 BLAKE2B 36e2789551eb671b0bc7481742d9edf25aa622bd3f605fb2491195c45f7630378116e4b0bffb536cf7596b3b1c5ea695796259b944a886d55f05c9891e280d0c SHA512 e93ddf90ff989af71790f70f7e7101f7cc60890c8a976552a097c13b0a0e10c16dfd8770214b19d7fabd59403e6d87a9a37d75a2c6f3ed27f8c82a7d8da95dad
 EBUILD autopep8-1.6.0.ebuild 836 BLAKE2B 2a5c20f3034ffa486ed52cd08520c30d8dabdc764660d86e5d307bc180338a4c8c03ae74af8fb379708f777e2f9b8f3e6aafb526024de208b5f125f1a00b58b7 SHA512 782735f07b1a4a73c1fb9ec2bd9677d372069cf878756568507cd946a4c8ea44298a1669b2732127bbcbebb57fe902b9fdc980601899d04bc12eb05d75947257
-EBUILD autopep8-1.7.0.ebuild 950 BLAKE2B 086de99551a18e855733e24d854d5b9afc6b8bdeea2f18c1fd4927dc9c13a6f1bfabf189c2b6b88818b761864cd17d94144e4ab63641f0ee95ebe3e736d680a7 SHA512 f5717728d3a1b3f83debdeb71874e789ef2b52f64ccddc0ff18ae6d0239b49144f539f53f76235fccf87f62b1ac28085c17bdc3b97feaf294490d2340e49cc32
-EBUILD autopep8-9999.ebuild 796 BLAKE2B f268b10e32865c7e92de9b22d929c5f0a632044a9311d3a6cba736c00b9b65906b30afa0b30cf8e70fc756b60093146777b99b1486119537cdb77a37be5011e6 SHA512 96d829614ed05ae8574369d8dac5146a8e20e20eacfa4d50a580aae54a99369eb21b7f5d92862007fbe423379ae9a224b33dfdde5cd669918395ca235f5d99aa
+EBUILD autopep8-1.7.0-r1.ebuild 984 BLAKE2B c2fafa3466fb72223bfda311195321039736e33de5a7fbab67c784f4f37238cae554ff830a4e5416b2ed9027453827f344f2670ed120dbcb71a33271746efef7 SHA512 e5d302d557634d57a0bbde7347426cbd2534784c10737baed58692f957de6d0f64bc521a2a397822592cd3a8f86269a7ace09ae87f3d7a0a7dd422cfae4681d4
+EBUILD autopep8-9999.ebuild 798 BLAKE2B 9bcad3f6102dbf1dbb8ea65fae6abaec30c44d666548771337729ec4b216f3f265f57f908fb785424eeec2e24c8687fdad93121f2a46299edad3fcfd1df24149 SHA512 42c0a97810816fe6f99c31b41da913a6b233118c437dbb32d9b7bebbb9d3d70248bba57b91d5ab6957b198c1cae3ded524205dec3b1c0400700485b69d2f415a
 MISC metadata.xml 404 BLAKE2B e9442968d195e1605d55b880cf29f4a2945f67c57c0d7d0325e19c0ccf60cac0ac3e68115a0285f87068482163f537abc1d75bddfdc6ae860c8c52c375147fdc SHA512 3e0b8a6ee869086166bb670a73189ca681729276cc7897666127b7e25b3a252aa2e80da5fd4dbb43d101a439d12f146ba0ba61bebf30a87a97f1030325f1aeab
diff --git a/dev-python/autopep8/autopep8-1.7.0.ebuild b/dev-python/autopep8/autopep8-1.7.0-r1.ebuild
index 31163b3a63e5..58d653e49809 100644
--- a/dev-python/autopep8/autopep8-1.7.0.ebuild
+++ b/dev-python/autopep8/autopep8-1.7.0-r1.ebuild
@@ -23,7 +23,8 @@ SLOT="0"
 
 RDEPEND="
 	>=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
@@ -34,4 +35,5 @@ EPYTEST_DESELECT=(
 
 PATCHES=(
 	"${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
+	"${FILESDIR}"/${P}-tomli.patch
 )
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 91c5dbfceeba..bb50e6c643bd 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -24,6 +24,7 @@ SLOT="0"
 
 RDEPEND="
 	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests unittest
diff --git a/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch b/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch
new file mode 100644
index 000000000000..6a8dd147d474
--- /dev/null
+++ b/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch
@@ -0,0 +1,57 @@
+From d0836947df66a052a1d18925a64feb0374598f02 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 6 Apr 2022 18:30:11 +0200
+Subject: [PATCH] Use tomli in place of unmaintained toml package
+
+Use the modern `tomli` TOML parser instead of `toml`.  The latter
+package is no longer maintained and does not support TOML 1.0.
+---
+ autopep8.py | 10 +++++-----
+ setup.py    |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/autopep8.py b/autopep8.py
+index d856f711..ab1a88ac 100755
+--- a/autopep8.py
++++ b/autopep8.py
+@@ -4040,13 +4040,13 @@ def read_config(args, parser):
+ 
+ def read_pyproject_toml(args, parser):
+     """Read pyproject.toml and load configuration."""
+-    import toml
++    import tomli
+ 
+     config = None
+ 
+     if os.path.exists(args.global_config):
+-        with open(args.global_config) as fp:
+-            config = toml.load(fp)
++        with open(args.global_config, "rb") as fp:
++            config = tomli.load(fp)
+ 
+     if not args.ignore_local_config:
+         parent = tail = args.files and os.path.abspath(
+@@ -4054,8 +4054,8 @@ def read_pyproject_toml(args, parser):
+         while tail:
+             pyproject_toml = os.path.join(parent, "pyproject.toml")
+             if os.path.exists(pyproject_toml):
+-                with open(pyproject_toml) as fp:
+-                    config = toml.load(fp)
++                with open(pyproject_toml, "rb") as fp:
++                    config = tomli.load(fp)
+                     break
+             (parent, tail) = os.path.split(parent)
+ 
+diff --git a/setup.py b/setup.py
+index caa639bf..4849574a 100755
+--- a/setup.py
++++ b/setup.py
+@@ -10,7 +10,7 @@
+ 
+ 
+ INSTALL_REQUIRES = (
+-    ['pycodestyle >= 2.9.1', 'toml']
++    ['pycodestyle >= 2.9.1', 'tomli']
+ )
+ 
+