gentoo resync : 07.08.2021

5 files changed, 38 insertions, 50 deletions

diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index b93336acf444..23271fc2799d 100644
--- a/dev-python/python-xmlsec/Manifest
+++ b/dev-python/python-xmlsec/Manifest
@@ -1,5 +1,4 @@
+AUX python-xmlsec-1.3.11-fix-xml-testfail.patch 879 BLAKE2B 3d655b40a67b44a4abd65188c6d719e12063e857942fdb112b47da38977864252e3d250e0bbaf5c86f4688bb7701aae89df444c4fef0e3f0eaffc98fe5b6b856 SHA512 8c8f9af415dc9207e5c0599ee958dff6558618f94a9cb3c583b1c9eb6d1de251d714edf1afdee581cb33c7543f88c54d36af9b6f903fe31994a86f1b602e4c75
 DIST python-xmlsec-1.3.11.tar.gz 75023 BLAKE2B 87fe4b47a9df6bc2fb2f1a459fa20240d9d5c92e0f7fa9bfc466e1fbfc0e3f12d90d01f5c7a6eac1389ea3252b8267a545203edf34c30117573bada9a7f5481a SHA512 fe0144d67edcad366b1d0f4615983f5630afd8f22aa056f46d1e6564f1c3114c0a469675e64a06591540515b0d12b5bf9304845f5138b24e15acaf4e5b861961
-DIST python-xmlsec-1.3.9.tar.gz 75465 BLAKE2B 32aa8bcc2a17e1164fab6ebf37b47ad64bf8164a5d5cc5929571c32715e37d22143f996afc75c8a73a08e0a0a07d74ce1f8e405731260c1bcdb26c7ccb5faf25 SHA512 3c212c409430297a85316e0c4f7f704be112dfda323fd0300b7d70de812d90dd4681c6a5a3cc0314d1937ebc4f8e012fac7f787bccdfb2dc699d5d6f17316b38
-EBUILD python-xmlsec-1.3.11.ebuild 900 BLAKE2B c9349e0e28ed592fe1730ed17602d08b7a5db7dcc65f40836ef92269f724c819b1c1bf8e276e3f37ddf2ce79f078811dce52d8a0e99ef899329352f564da7ece SHA512 1e0cadca1655874b204dda456b54e53b7b6af51462416a687c94ae64e5a0eebfea0ce1aba30f59ffed566ee891a0c1244ea3957c10edf92fa5d622c264fb7e05
-EBUILD python-xmlsec-1.3.9.ebuild 900 BLAKE2B 732c28c6233267dfc04033c300b0b6966c0e69833317e966d47d0fbf8734246389f33c8bbc119e8e9e7f569fa893aac5d5137b7812c2836485ace4f5512c33d3 SHA512 90f29b20a98a541ff3a849fd6cf64339284046e9bff72e1635c9e54057c0d45aebf356fd0fabc610b1f60f06204d53ecb777c57000e83f6d3f7c70680b171c09
-MISC metadata.xml 318 BLAKE2B 1e735a969ef22076ee423f1b4a02cc1fd7207d3ecf99065b970dca3a5e335c261bad5ff081edec59e19f5600f516eb79e9759b8677ffd3204afb688ff43f4d17 SHA512 9eeb6edafad382e54d31fcdd02da868cfd0efcb95aefe7f89e7fa59d9b4031d06895219dc331badc2319dd3fa57764a640ffe9dabbc3b70f6d686901ed391a74
+EBUILD python-xmlsec-1.3.11.ebuild 901 BLAKE2B 77245e435fbb4741bc130aba61316959bbf93fb86c653e5ac2a4fb033110234da53dbd77d82f6daa462895e3f7a8fd4725b56521f2827051ffbba03a647a0c70 SHA512 13491d16a271099ed556ce155e9080d58df08a89bf9be6fbb67180ce479096088db3e5a7a88944f10da7eb5a2d2616a96969121afa19afa7a77d9411af9f2190
+MISC metadata.xml 419 BLAKE2B 1ee41309bea90a61f4b702e42e022c17861d70a309db059a27666514a678ca179770b68a8598589677126ae84950bacdca3d07aac7741b9c96b4ab5a82a27921 SHA512 39dc93ff456cc9e5436ba27035a2c8a296cd2e1235e2ded63a83a3003b0b2d152f6d7f13a12734065326f4b0652934e1138ee6d0a0f4c8b47b397bfab892ee68
diff --git a/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch b/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
new file mode 100644
index 000000000000..3e7ab8829c2f
--- /dev/null
+++ b/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
@@ -0,0 +1,23 @@
+Taken from: https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116
+diff --git a/tests/base.py b/tests/base.py
+index b05de1d..5ec356f 100644
+--- a/tests/base.py
++++ b/tests/base.py
+@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase):
+ 
+     def load_xml(self, name, xpath=None):
+         """returns xml.etree"""
++        etree.set_default_parser(parser=etree.XMLParser())
+         root = etree.parse(self.path(name)).getroot()
+         if xpath is None:
+             return root
+diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py
+index 2fc490f..53d2377 100644
+--- a/tests/test_doc_examples.py
++++ b/tests/test_doc_examples.py
+@@ -42,3 +42,5 @@ def test_doc_example(example):
+     """
+     with cd(example.parent):
+         runpy.run_path(str(example))
++    from lxml import etree
++    etree.set_default_parser(parser=etree.XMLParser())
diff --git a/dev-python/python-xmlsec/metadata.xml b/dev-python/python-xmlsec/metadata.xml
index e5523976e0c6..23c0e46965f2 100644
--- a/dev-python/python-xmlsec/metadata.xml
+++ b/dev-python/python-xmlsec/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">xmlsec</remote-id>
 	</upstream>
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
index 2cdbbac944bb..a43d02473ec7 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the XML Security Library"
@@ -23,11 +23,13 @@ RDEPEND="${DEPEND}
 BDEPEND="${RDEPEND}
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
-"
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
 
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
+PATCHES=(
+	"${FILESDIR}/${P}-fix-xml-testfail.patch"
+)
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild
deleted file mode 100644
index 0a857cf27929..000000000000
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the XML Security Library"
-HOMEPAGE="https://github.com/mehcode/python-xmlsec"
-SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/xmlsec:=
-"
-RDEPEND="${DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s:use_scm_version=.*:version='${PV}',:" \
-		-e "/setup_requires/ d" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}