[gentoo-commits] repo/gentoo:master commit in: dev-python/dnspython/files/, dev-python/dnspython/

[Michał Górny]

commit:     49c88a839919fbe4837412bb6abf7fae8ce481ec
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri May 14 15:12:21 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 15 11:51:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c88a83

dev-python/dnspython: bump revision of 1.16.0 to r2 for python 3.10

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...nspython-1.16.0-r1.ebuild => dnspython-1.16.0-r2.ebuild} |  9 +++++++--
 dev-python/dnspython/files/dnspython-1.16.0-py310.patch     | 13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r2.ebuild
similarity index 84%
rename from dev-python/dnspython/dnspython-1.16.0-r1.ebuild
rename to dev-python/dnspython/dnspython-1.16.0-r2.ebuild
index 5296e0e643f..82f4762eb6f 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r2.ebuild
@@ -1,9 +1,9 @@
-# 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,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -23,6 +23,11 @@ RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
 	!dev-python/dnspython:py2
 	!dev-python/dnspython:py3"
 
+PATCHES=(
+	# Mutable mapping was moved to a different module in 3.10 and removed from the old one
+	"${FILESDIR}"/${P}-py310.patch
+)
+
 src_prepare() {
 	sed -i -e '/network_avail/s:True:False:' \
 		tests/test_resolver.py || die

diff --git a/dev-python/dnspython/files/dnspython-1.16.0-py310.patch b/dev-python/dnspython/files/dnspython-1.16.0-py310.patch
new file mode 100644
index 00000000000..ad6fa929e5e
--- /dev/null
+++ b/dev-python/dnspython/files/dnspython-1.16.0-py310.patch
@@ -0,0 +1,13 @@
+diff --git a/dns/namedict.py b/dns/namedict.py
+index 37a1310..7d52668 100644
+--- a/dns/namedict.py
++++ b/dns/namedict.py
+@@ -32,7 +32,7 @@ import dns.name
+ from ._compat import xrange
+ 
+ 
+-class NameDict(collections.MutableMapping):
++class NameDict(collections.abc.MutableMapping):
+     """A dictionary whose keys are dns.name.Name objects.
+ 
+     In addition to being like a regular Python dictionary, this