gentoo resync : 11.08.2021

4 files changed, 70 insertions, 3 deletions

diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index d19d6a42eb11..74625e9915cf 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,3 +1,6 @@
+AUX pretty-yaml-20.4.0-fix-py3.10.patch 1074 BLAKE2B fdef49b60127997bda3824b2e663ce01e516cf2e5fe433c9842f0fedec7058a2e84e0edc731e563f8b629d1d006d65e593edfc001e8b436d707d9c9e5619b723 SHA512 77e88f8ab11b1223c3e39f2e41c3847912364f7ab4b23c1509d5889d1a035a82724cb8da76651a8fd9f596fcb515b540f6be05225fcb19892ead486e516467c9
 DIST pyaml-20.4.0.tar.gz 21176 BLAKE2B 0aac0250d610d7b2ef042e251142de4520e7db96073d46bde0dcb37ad43d9c278cbdfc7ab247b4d41c7c30e893306aa47b25a584a2aa4c157d66203b8e140895 SHA512 432fd215e034beafc07270a6aa8b726d5a16ef8946a95c1db9a34b4f492bbe2089dffbb1ce856d3e8153ec18ac943973a23e3aa9283d53ee0b2e7ba5dcd3d317
-EBUILD pretty-yaml-20.4.0.ebuild 722 BLAKE2B 38fd66ad487d6bc37e9aaa187455feda4f51360d6bb3d654f3f161325084ad8e631da74b6aeeb273102d2186ee3816898743511ef97fb5d9ea35689cfeda8634 SHA512 d22ff4d0550c1a3798d4d9b9307f01c540530f1bccbe31abe9d94a3136f11c14965d9fb0db1d66820eb09bc98d0a3fe2b418eb11e65f27266c9fcaa0def95873
+DIST pyaml-21.8.3.tar.gz 20269 BLAKE2B 8b829ce374efe13007bb924393a8cde26914cc443999906b7bb4db610b614964170a80b8dd381eeaa9137026c60d98140b3b0d601a6af816c32d1ce9708e33be SHA512 69b1181511f7d3ac1263b710fa49b18a162e096e28414d83300bc2e9038222363cef995a0d3248387560e7066973736f9cee06b67042ee957427b4790c269653
+EBUILD pretty-yaml-20.4.0.ebuild 821 BLAKE2B 9efeae3d9c0642e95b282bb4a9fc81c54958b6d2cf9785207f7269130d5fbf81743d91af82cd4f0cf93ba6251eb3bb3ff45141c867cbddad469b780915b7bfb0 SHA512 e940f1e08f7f21c8ae8559d516e8a7392a3217566cf0918c05d7ad11deade9057d2fa715caeb4dce4d17fb21c2640452cf68d6ac2a4a4c1fd696501eaf971468
+EBUILD pretty-yaml-21.8.3.ebuild 724 BLAKE2B 808b12315cd44b569b5acb985a07129e6093285d8fc3da54b042dd247bd999f30dfe97af43865b576fcaabc3a78a3845781c472d440faff0ee4e16f0787e735d SHA512 b4347b04edcc39a74550cb910be5e1217dcf6d95752e64cf90210601d9d764be0efe6e1a198fcf3f5cdc75775b7f94b16d8545ca6f274721bc61e76fc7bfb107
 MISC metadata.xml 469 BLAKE2B 9a5eb78ddd20825b189c9d6e95c35dd9ef7772a42f5a68d48fd2ee5ff54c906dd0268e03e33ffbd0c77eccc188538597d61445c648de9408813093405f2f063a SHA512 45ce0035cfd63132fd0eb7f7684b4099216d6f6d9ab9101c66c5a031e51d4a80013ed3bcb7e95654e3cd6046a97e3db41bf09ad209e45f2034b5d9ff02d6ed43
diff --git a/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch b/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch
new file mode 100644
index 000000000000..c2cd44152d1b
--- /dev/null
+++ b/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch
@@ -0,0 +1,28 @@
+From 707e14bd714e91dc53295393e2c8eea257aced5a Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sun, 8 Aug 2021 13:44:52 +0200
+Subject: [PATCH] Fix tests for Python 3.10: abstract base classes have moved
+
+As mentioned in the documentation:
+"Deprecated since version 3.3, will be removed in version 3.10: Moved
+Collections Abstract Base Classes to the collections.abc module. For
+backwards compatibility, they continue to be visible in this module through
+Python 3.9."
+---
+ pyaml/tests/dump.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyaml/tests/dump.py b/pyaml/tests/dump.py
+index 882a8e8..e1a93ba 100644
+--- a/pyaml/tests/dump.py
++++ b/pyaml/tests/dump.py
+@@ -2,7 +2,8 @@
+ from __future__ import unicode_literals, print_function
+ 
+ import itertools as it, operator as op, functools as ft
+-from collections import Mapping, OrderedDict, namedtuple
++from collections import OrderedDict, namedtuple
++from collections.abc import Mapping
+ import os, sys, io, yaml, unittest
+ 
+ if sys.version_info.major > 2: unicode = str
diff --git a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild b/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
index 13be942b0187..f592bf0fbdac 100644
--- a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -25,6 +25,11 @@ BDEPEND="
 		dev-python/unidecode[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	# https://github.com/mk-fg/pretty-yaml/pull/38
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 python_test() {
 	"${EPYTHON}" pyaml/tests/dump.py -v ||
 		die "tests failed under ${EPYTHON}"
diff --git a/dev-python/pretty-yaml/pretty-yaml-21.8.3.ebuild b/dev-python/pretty-yaml/pretty-yaml-21.8.3.ebuild
new file mode 100644
index 000000000000..1a6b58996d2e
--- /dev/null
+++ b/dev-python/pretty-yaml/pretty-yaml-21.8.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=pyaml-${PV}
+DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
+HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_P%-*}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/unidecode[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" pyaml/tests/dump.py -v ||
+		die "tests failed under ${EPYTHON}"
+}