gentoo resync : 20.03.2022

5 files changed, 9 insertions, 74 deletions

diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index d320f3192c8d..cc959afbb764 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,8 +1,5 @@
-AUX dnspython-1.16.0-py310.patch 408 BLAKE2B 7379d0ea280c9ca07e1d3d47dbb21cf1f1a0752f59ca3f30aaa26ef677d3a041f04b23ac0c244fdbca7661c5bbaf44cd30258410f92ab48330a236d92d78f668 SHA512 9e121f33ed148923a6aec919a8aac1f68e84a007f0ddc7daa550275681b1ecf5a47aca82bbbb7e27ced93752d4e76f4614bb10e379fec482e8f6bd730a5dc2b6
-DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
 DIST dnspython-2.2.0.tar.gz 303844 BLAKE2B 5a99a06d1c7e8f29e44ddc99fed11d772d83d962d7abde61befb3189c6faa2796b239e9c0ec05a453360986ff4bbbcea929f62017eb3bab2bafa517ae4c02a3b SHA512 0a93bde1ca1081c92b9fb5a02644c4920813f2d0dbe4de1dae736262d53afe41327f3fdd38a10f74ec78f54dd7c7570e37d0adb2b21ab18f9b5cc099fcc6bb85
-EBUILD dnspython-1.16.0-r2.ebuild 1342 BLAKE2B 9257168f49a3ef6276e98526941b30c224f4681920d6f2eeef3c1f5bd05a2b448b3c9dd2bd23f7e68371b5932e7ca6e22e21354a7f1cf269543bbf340f2e3fde SHA512 4f4affac4f149e9740daf5e4df45ae4ab0ef8c7c3f551daaf4d013e7a5807fd992948cfa463e77ad512baf56fa18c8cf4a5cf45952d32967b0e594d416af3d71
-EBUILD dnspython-2.1.0.ebuild 963 BLAKE2B ab8c56acf116eb2f83d49fad515bfdc3a837de3144ca75d028cfadef811c7845d7f726375a09ce403167b99de7e73d967d93b76c1f4a4634e875a73b43768d5a SHA512 8251a9b2350d041d388ef3a55ba9dd39426eedd71b55685e02ddc615b853a60428d92ea1c19900adf7ae7700b9ae142201483a9c6a04230b1317b8b46b2fe4a6
-EBUILD dnspython-2.2.0.ebuild 1072 BLAKE2B 561e23944da794d9fe6654b714bc7252d62a29a18f5b8bdf2bed3da8fe1b5c6f3f672fa76b99d9f4b0f738834d6bd10095742a8fdd2f4dab52357e5bb09c2f8e SHA512 ac738fe25fbd40beb64a055a0950f3ef50c01370009c7f226e682a2891a826aa88e3641159a3222017d33d6d0569fdfb6c02a2699843c8f2d3da095b06747d17
+DIST dnspython-2.2.1.tar.gz 304861 BLAKE2B e6446b91579c6ec0a7266a354ceb58e2f881b55b7376648770ebc2c6104fd815214497516d305b75802e9211703d47a70d66745d872a43afb72f41e55a617652 SHA512 ec545468f604d6131f07259ca154c4f71d445d12c336ac1da0d2f025d6478ada76320a7235119312fed85da071ef309d2531e541d3c2340a50deaf3f4dd7b4eb
+EBUILD dnspython-2.2.0.ebuild 1064 BLAKE2B 320840fb04982e6fc6f6754110e4363d17959a3c4f4f94447d08098b3a363742166144eff1f84e529174059ea207fb651e40673479e30979072e30a928e6b738 SHA512 0916652f9648b66b0fc5511d5bb5dc79f6aae09f376300d3cdfdfb0b41b7a4d0002f3ad7f09925dfe7700ab33d4d0fa1312071a10ca181ffbe63289cdda99e53
+EBUILD dnspython-2.2.1.ebuild 997 BLAKE2B 0a2d451c67f37867c69059390df2443fd4b8ff801c10c4b2ef223722f889180cd74072e5dc142dd62fb9c4f2e3c82e9168eb9f017046eb4bfcc13e8f091e32c4 SHA512 126856a2e64cdd1fb130c1e4c37c1cc0bc4c4a68618f47dab69bd54027943f7eb55ff369a62b50988fede6e07f0638203c6ad4b1a660f1e5a4d136bf5f007f35
 MISC metadata.xml 1483 BLAKE2B c8506d4cb41157307b98f6976d05f6a504a89c3c0924e5135e060018bcd401589b4fbd932b1c61eb34d2823168170281fcee75f8fedda4053207b3844fae336d SHA512 e2b0132864d9a338193e9eed11e85981e48825c194fc35d8e17f9a72b19e04368140556c37a37061059451aaf1c6143030a54f43fb65ab734d2e9636e7e641d3
diff --git a/dev-python/dnspython/dnspython-1.16.0-r2.ebuild b/dev-python/dnspython/dnspython-1.16.0-r2.ebuild
deleted file mode 100644
index 770b895f5fce..000000000000
--- a/dev-python/dnspython/dnspython-1.16.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
-SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples"
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' -2)
-	!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
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-2.2.0.ebuild b/dev-python/dnspython/dnspython-2.2.0.ebuild
index 483c1c5cc3dc..97d64d01ead6 100644
--- a/dev-python/dnspython/dnspython-2.2.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/dnspython/dnspython-2.1.0.ebuild b/dev-python/dnspython/dnspython-2.2.1.ebuild
index 33fdfda8ca91..10b72b9da4d7 100644
--- a/dev-python/dnspython/dnspython-2.1.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
 inherit distutils-r1
 
 DESCRIPTION="DNS toolkit for Python"
@@ -14,12 +14,12 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]"
+	<dev-python/idna-4.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/dnspython/files/dnspython-1.16.0-py310.patch b/dev-python/dnspython/files/dnspython-1.16.0-py310.patch
deleted file mode 100644
index ad6fa929e5e2..000000000000
--- a/dev-python/dnspython/files/dnspython-1.16.0-py310.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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