gentoo resync : 30.05.2020

3 files changed, 705 insertions, 0 deletions

diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 412ee5b92a58..3cd31fd54ea2 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,6 +1,9 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 AUX lxml-4.4.2-tests-pypy.patch 17078 BLAKE2B 2dc3bc4f8b1de65f3b287d921880e2632cf3268b0e944846cd641903b382a0065d820093448069fbea318a3bf181b375a441dbf8aa903f0ee71f2ae819358adf SHA512 9a5c021b8cc2cd6cd4a609adb858e582172675aa5bc106ce03f88da95c71d7b2afc04394728e8297b316f6312d338f170a87b4937cda78d78c56e80a3308e3f5
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
+AUX lxml-4.5.1-py39.patch 17992 BLAKE2B 17855768819d42b0b67f9a66c5cb1661b71385fb5f28ee275a018497fb55c5da9ae8f8284f38635ac8322ec5ac071ea7dfe496f30dcabde2293e7a6703b3147d SHA512 9c2ea59c526f0ab0a0feaed86d9fca7253582ca8bd09b7ccc6e9638100ab53b5ba716a1c61c311019d13b25cfe72fa28be5cf38eecda1d33e77315f0a7fb166d
 DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
+DIST lxml-4.5.1.tar.gz 942377 BLAKE2B 3b7434b50d7f81628f17adf0c65e38c826304674495160a216c3051d86ddd9924f2854cf35453ba8270ca461c4c5429698a002853642f9e52206de1443c6b6f0 SHA512 0f16cdcb8aa7f8c98d3fb625d6713b422c14f0d4e7348cda38eb0776f0cfa637faaabc14dc63f8052f2741c908de6f71cfcb6471d5286c09780816b46cbfb439
 EBUILD lxml-4.5.0.ebuild 2288 BLAKE2B d0757aff6f274f389a9c2356077581583e740ef177136f0e18dda34a8835c6e003d5537462d9a33caed61fa4c5223bd618d767d004175e5fa7c3a9a1231b9a27 SHA512 bc668896bdf781245d9ffdb51e98e47a15a816e1abb188c519473f5c920f3630c1a6e9b72eb5c7bec232864cfd12b0d47f8876dc01f3a793271b4561f7981502
+EBUILD lxml-4.5.1.ebuild 2289 BLAKE2B 93c41c346ba66dece63e747c7db8232ac4d60bdb5ea473d19cbb6c0de6bcb725518757387829a8ebc9ad931c2b45efeeaf0cb5c4f6f97af58bf01dab499b8032 SHA512 66d3d913164f1a5818f05d9218c51247646d46aacef6b73107c300a492bfc65f313be62560bb10826c0a795dd3d9cbbdd85d98630e14bb4efb99ae6ce4b60fb5
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/files/lxml-4.5.1-py39.patch b/dev-python/lxml/files/lxml-4.5.1-py39.patch
new file mode 100644
index 000000000000..3032e5379272
--- /dev/null
+++ b/dev-python/lxml/files/lxml-4.5.1-py39.patch
@@ -0,0 +1,620 @@
+From e5c5cd22d918cd3b196e109a7829dad02d9ef42e Mon Sep 17 00:00:00 2001
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Tue, 26 May 2020 11:20:18 +0200
+Subject: [PATCH 1/2] Move some ElementTree compatibility tests over to the
+ etree-only tests since the features were removed in Py3.9.
+
+---
+ src/lxml/tests/test_elementtree.py | 254 +----------------------------
+ src/lxml/tests/test_etree.py       | 246 ++++++++++++++++++++++++++++
+ 2 files changed, 252 insertions(+), 248 deletions(-)
+
+diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
+index 78d8964d..ec765ee0 100644
+--- a/src/lxml/tests/test_elementtree.py
++++ b/src/lxml/tests/test_elementtree.py
+@@ -130,7 +130,8 @@ class _ETreeTestCaseBase(HelperTestCase):
+         check_method(element.extend)
+         check_method(element.insert)
+         check_method(element.remove)
+-        check_method(element.getchildren)
++        # Removed in Py3.9
++        #check_method(element.getchildren)
+         check_method(element.find)
+         check_method(element.iterfind)
+         check_method(element.findall)
+@@ -142,7 +143,8 @@ class _ETreeTestCaseBase(HelperTestCase):
+         check_method(element.items)
+         check_method(element.iter)
+         check_method(element.itertext)
+-        check_method(element.getiterator)
++        # Removed in Py3.9
++        #check_method(element.getiterator)
+ 
+         # These methods return an iterable. See bug 6472.
+ 
+@@ -1933,28 +1935,6 @@ class _ETreeTestCaseBase(HelperTestCase):
+             a.remove(el)
+         self.assertLess(len(a), 3)
+ 
+-    def test_getchildren(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        c = SubElement(a, 'c')
+-        d = SubElement(b, 'd')
+-        e = SubElement(c, 'e')
+-        self.assertXML(
+-            _bytes('<a><b><d></d></b><c><e></e></c></a>'),
+-            a)
+-        self.assertEqual(
+-            [b, c],
+-            a.getchildren())
+-        self.assertEqual(
+-            [d],
+-            b.getchildren())
+-        self.assertEqual(
+-            [],
+-            d.getchildren())
+-
+     def test_makeelement(self):
+         Element = self.etree.Element
+ 
+@@ -2010,184 +1990,6 @@ class _ETreeTestCaseBase(HelperTestCase):
+             [None] * 5,
+             [el.tail for el in a.iter()])
+ 
+-    def test_getiterator(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        c = SubElement(a, 'c')
+-        d = SubElement(b, 'd')
+-        e = SubElement(c, 'e')
+-
+-        self.assertEqual(
+-            [a, b, d, c, e],
+-            list(a.getiterator()))
+-        self.assertEqual(
+-            [d],
+-            list(d.getiterator()))
+-
+-    def test_getiterator_empty(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        c = SubElement(a, 'c')
+-        d = SubElement(b, 'd')
+-        e = SubElement(c, 'e')
+-
+-        self.assertEqual(
+-            [],
+-            list(a.getiterator('none')))
+-        self.assertEqual(
+-            [],
+-            list(e.getiterator('none')))
+-        self.assertEqual(
+-            [e],
+-            list(e.getiterator()))
+-
+-    def test_getiterator_filter(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        c = SubElement(a, 'c')
+-        d = SubElement(b, 'd')
+-        e = SubElement(c, 'e')
+-
+-        self.assertEqual(
+-            [a],
+-            list(a.getiterator('a')))
+-        a2 = SubElement(e, 'a')
+-        self.assertEqual(
+-            [a, a2],
+-            list(a.getiterator('a')))
+-        self.assertEqual(
+-            [a2],
+-            list(c.getiterator('a')))
+-
+-    def test_getiterator_filter_all(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        c = SubElement(a, 'c')
+-        d = SubElement(b, 'd')
+-        e = SubElement(c, 'e')
+-
+-        self.assertEqual(
+-            [a, b, d, c, e],
+-            list(a.getiterator('*')))
+-
+-    def test_getiterator_filter_comment(self):
+-        Element = self.etree.Element
+-        Comment = self.etree.Comment
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        comment_b = Comment("TEST-b")
+-        b.append(comment_b)
+-
+-        self.assertEqual(
+-            [comment_b],
+-            list(a.getiterator(Comment)))
+-
+-        comment_a = Comment("TEST-a")
+-        a.append(comment_a)
+-
+-        self.assertEqual(
+-            [comment_b, comment_a],
+-            list(a.getiterator(Comment)))
+-
+-        self.assertEqual(
+-            [comment_b],
+-            list(b.getiterator(Comment)))
+-
+-    def test_getiterator_filter_pi(self):
+-        Element = self.etree.Element
+-        PI = self.etree.ProcessingInstruction
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        pi_b = PI("TEST-b")
+-        b.append(pi_b)
+-
+-        self.assertEqual(
+-            [pi_b],
+-            list(a.getiterator(PI)))
+-
+-        pi_a = PI("TEST-a")
+-        a.append(pi_a)
+-
+-        self.assertEqual(
+-            [pi_b, pi_a],
+-            list(a.getiterator(PI)))
+-
+-        self.assertEqual(
+-            [pi_b],
+-            list(b.getiterator(PI)))
+-
+-    def test_getiterator_with_text(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        a.text = 'a'
+-        b = SubElement(a, 'b')
+-        b.text = 'b'
+-        b.tail = 'b1'
+-        c = SubElement(a, 'c')
+-        c.text = 'c'
+-        c.tail = 'c1'
+-        d = SubElement(b, 'd')
+-        d.text = 'd'
+-        d.tail = 'd1'
+-        e = SubElement(c, 'e')
+-        e.text = 'e'
+-        e.tail = 'e1'
+-
+-        self.assertEqual(
+-            [a, b, d, c, e],
+-            list(a.getiterator()))
+-        #self.assertEqual(
+-        #    [d],
+-        #    list(d.getiterator()))
+-
+-    def test_getiterator_filter_with_text(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-
+-        a = Element('a')
+-        a.text = 'a'
+-        b = SubElement(a, 'b')
+-        b.text = 'b'
+-        b.tail = 'b1'
+-        c = SubElement(a, 'c')
+-        c.text = 'c'
+-        c.tail = 'c1'
+-        d = SubElement(b, 'd')
+-        d.text = 'd'
+-        d.tail = 'd1'
+-        e = SubElement(c, 'e')
+-        e.text = 'e'
+-        e.tail = 'e1'
+-
+-        self.assertEqual(
+-            [a],
+-            list(a.getiterator('a')))
+-        a2 = SubElement(e, 'a')
+-        self.assertEqual(
+-            [a, a2],
+-            list(a.getiterator('a')))   
+-        self.assertEqual(
+-            [a2],
+-            list(e.getiterator('a')))
+-
+     def test_getslice(self):
+         Element = self.etree.Element
+         SubElement = self.etree.SubElement
+@@ -2710,41 +2512,6 @@ class _ETreeTestCaseBase(HelperTestCase):
+         self.assertEqual('A2',
+                           a.tail)
+ 
+-    def test_elementtree_getiterator(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-        ElementTree = self.etree.ElementTree
+-
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        c = SubElement(a, 'c')
+-        d = SubElement(b, 'd')
+-        e = SubElement(c, 'e')
+-        t = ElementTree(element=a)
+-
+-        self.assertEqual(
+-            [a, b, d, c, e],
+-            list(t.getiterator()))
+-
+-    def test_elementtree_getiterator_filter(self):
+-        Element = self.etree.Element
+-        SubElement = self.etree.SubElement
+-        ElementTree = self.etree.ElementTree
+-        a = Element('a')
+-        b = SubElement(a, 'b')
+-        c = SubElement(a, 'c')
+-        d = SubElement(b, 'd')
+-        e = SubElement(c, 'e')
+-        t = ElementTree(element=a)
+-
+-        self.assertEqual(
+-            [a],
+-            list(t.getiterator('a')))
+-        a2 = SubElement(e, 'a')
+-        self.assertEqual(
+-            [a, a2],
+-            list(t.getiterator('a')))
+-
+     def test_ns_access(self):
+         ElementTree = self.etree.ElementTree
+         ns = 'http://xml.infrae.com/1'
+@@ -3180,17 +2947,6 @@ class _ETreeTestCaseBase(HelperTestCase):
+             'value',
+             root[0].get(attr_name))
+ 
+-    def test_iterparse_getiterator(self):
+-        iterparse = self.etree.iterparse
+-        f = BytesIO('<a><b><d/></b><c/></a>')
+-
+-        counts = []
+-        for event, elem in iterparse(f):
+-            counts.append(len(list(elem.getiterator())))
+-        self.assertEqual(
+-            [1,2,1,4],
+-            counts)
+-
+     def test_iterparse_move_elements(self):
+         iterparse = self.etree.iterparse
+         f = BytesIO('<a><b><d/></b><c/></a>')
+@@ -5119,6 +4875,8 @@ if ElementTree:
+ 
+         @classmethod
+         def setUpClass(cls):
++            if sys.version_info >= (3, 9):
++                return
+             import warnings
+             # ElementTree warns about getiterator() in recent Pythons
+             warnings.filterwarnings(
+diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
+index 3d8dee1c..56d38e75 100644
+--- a/src/lxml/tests/test_etree.py
++++ b/src/lxml/tests/test_etree.py
+@@ -674,6 +674,17 @@ class ETreeOnlyTestCase(HelperTestCase):
+         parse = self.etree.parse
+         self.assertRaises(TypeError, parse, 'notthere.xml', object())
+ 
++    def test_iterparse_getiterator(self):
++        iterparse = self.etree.iterparse
++        f = BytesIO('<a><b><d/></b><c/></a>')
++
++        counts = []
++        for event, elem in iterparse(f):
++            counts.append(len(list(elem.getiterator())))
++        self.assertEqual(
++            [1,2,1,4],
++            counts)
++
+     def test_iterparse_tree_comments(self):
+         # ET removes comments
+         iterparse = self.etree.iterparse
+@@ -3027,6 +3038,206 @@ class ETreeOnlyTestCase(HelperTestCase):
+         el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
+         self.assertEqual({'hha': None}, el.nsmap)
+ 
++    def test_getchildren(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        b = SubElement(a, 'b')
++        c = SubElement(a, 'c')
++        d = SubElement(b, 'd')
++        e = SubElement(c, 'e')
++        self.assertXML(
++            _bytes('<a><b><d></d></b><c><e></e></c></a>'),
++            a)
++        self.assertEqual(
++            [b, c],
++            a.getchildren())
++        self.assertEqual(
++            [d],
++            b.getchildren())
++        self.assertEqual(
++            [],
++            d.getchildren())
++
++    def test_getiterator(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        b = SubElement(a, 'b')
++        c = SubElement(a, 'c')
++        d = SubElement(b, 'd')
++        e = SubElement(c, 'e')
++
++        self.assertEqual(
++            [a, b, d, c, e],
++            list(a.getiterator()))
++        self.assertEqual(
++            [d],
++            list(d.getiterator()))
++
++    def test_getiterator_empty(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        b = SubElement(a, 'b')
++        c = SubElement(a, 'c')
++        d = SubElement(b, 'd')
++        e = SubElement(c, 'e')
++
++        self.assertEqual(
++            [],
++            list(a.getiterator('none')))
++        self.assertEqual(
++            [],
++            list(e.getiterator('none')))
++        self.assertEqual(
++            [e],
++            list(e.getiterator()))
++
++    def test_getiterator_filter(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        b = SubElement(a, 'b')
++        c = SubElement(a, 'c')
++        d = SubElement(b, 'd')
++        e = SubElement(c, 'e')
++
++        self.assertEqual(
++            [a],
++            list(a.getiterator('a')))
++        a2 = SubElement(e, 'a')
++        self.assertEqual(
++            [a, a2],
++            list(a.getiterator('a')))
++        self.assertEqual(
++            [a2],
++            list(c.getiterator('a')))
++
++    def test_getiterator_filter_all(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        b = SubElement(a, 'b')
++        c = SubElement(a, 'c')
++        d = SubElement(b, 'd')
++        e = SubElement(c, 'e')
++
++        self.assertEqual(
++            [a, b, d, c, e],
++            list(a.getiterator('*')))
++
++    def test_getiterator_filter_comment(self):
++        Element = self.etree.Element
++        Comment = self.etree.Comment
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        b = SubElement(a, 'b')
++        comment_b = Comment("TEST-b")
++        b.append(comment_b)
++
++        self.assertEqual(
++            [comment_b],
++            list(a.getiterator(Comment)))
++
++        comment_a = Comment("TEST-a")
++        a.append(comment_a)
++
++        self.assertEqual(
++            [comment_b, comment_a],
++            list(a.getiterator(Comment)))
++
++        self.assertEqual(
++            [comment_b],
++            list(b.getiterator(Comment)))
++
++    def test_getiterator_filter_pi(self):
++        Element = self.etree.Element
++        PI = self.etree.ProcessingInstruction
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        b = SubElement(a, 'b')
++        pi_b = PI("TEST-b")
++        b.append(pi_b)
++
++        self.assertEqual(
++            [pi_b],
++            list(a.getiterator(PI)))
++
++        pi_a = PI("TEST-a")
++        a.append(pi_a)
++
++        self.assertEqual(
++            [pi_b, pi_a],
++            list(a.getiterator(PI)))
++
++        self.assertEqual(
++            [pi_b],
++            list(b.getiterator(PI)))
++
++    def test_getiterator_with_text(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        a.text = 'a'
++        b = SubElement(a, 'b')
++        b.text = 'b'
++        b.tail = 'b1'
++        c = SubElement(a, 'c')
++        c.text = 'c'
++        c.tail = 'c1'
++        d = SubElement(b, 'd')
++        d.text = 'd'
++        d.tail = 'd1'
++        e = SubElement(c, 'e')
++        e.text = 'e'
++        e.tail = 'e1'
++
++        self.assertEqual(
++            [a, b, d, c, e],
++            list(a.getiterator()))
++        #self.assertEqual(
++        #    [d],
++        #    list(d.getiterator()))
++
++    def test_getiterator_filter_with_text(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++
++        a = Element('a')
++        a.text = 'a'
++        b = SubElement(a, 'b')
++        b.text = 'b'
++        b.tail = 'b1'
++        c = SubElement(a, 'c')
++        c.text = 'c'
++        c.tail = 'c1'
++        d = SubElement(b, 'd')
++        d.text = 'd'
++        d.tail = 'd1'
++        e = SubElement(c, 'e')
++        e.text = 'e'
++        e.tail = 'e1'
++
++        self.assertEqual(
++            [a],
++            list(a.getiterator('a')))
++        a2 = SubElement(e, 'a')
++        self.assertEqual(
++            [a, a2],
++            list(a.getiterator('a')))
++        self.assertEqual(
++            [a2],
++            list(e.getiterator('a')))
++
+     def test_getiterator_filter_multiple(self):
+         Element = self.etree.Element
+         SubElement = self.etree.SubElement
+@@ -3203,6 +3414,41 @@ class ETreeOnlyTestCase(HelperTestCase):
+             [a, b, c],
+             list(a.getiterator('*')))
+ 
++    def test_elementtree_getiterator(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++        ElementTree = self.etree.ElementTree
++
++        a = Element('a')
++        b = SubElement(a, 'b')
++        c = SubElement(a, 'c')
++        d = SubElement(b, 'd')
++        e = SubElement(c, 'e')
++        t = ElementTree(element=a)
++
++        self.assertEqual(
++            [a, b, d, c, e],
++            list(t.getiterator()))
++
++    def test_elementtree_getiterator_filter(self):
++        Element = self.etree.Element
++        SubElement = self.etree.SubElement
++        ElementTree = self.etree.ElementTree
++        a = Element('a')
++        b = SubElement(a, 'b')
++        c = SubElement(a, 'c')
++        d = SubElement(b, 'd')
++        e = SubElement(c, 'e')
++        t = ElementTree(element=a)
++
++        self.assertEqual(
++            [a],
++            list(t.getiterator('a')))
++        a2 = SubElement(e, 'a')
++        self.assertEqual(
++            [a, a2],
++            list(t.getiterator('a')))
++
+     def test_elementtree_getelementpath(self):
+         a  = etree.Element("a")
+         b  = etree.SubElement(a, "b")
+-- 
+2.26.2
+
+From 56ddb10e50eba7a6352e397f259d9497b44f658d Mon Sep 17 00:00:00 2001
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Tue, 26 May 2020 11:30:45 +0200
+Subject: [PATCH 2/2] Fix a test after moving it to a different test module.
+
+---
+ src/lxml/tests/test_etree.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
+index 56d38e75..105c59b8 100644
+--- a/src/lxml/tests/test_etree.py
++++ b/src/lxml/tests/test_etree.py
+@@ -3047,9 +3047,9 @@ class ETreeOnlyTestCase(HelperTestCase):
+         c = SubElement(a, 'c')
+         d = SubElement(b, 'd')
+         e = SubElement(c, 'e')
+-        self.assertXML(
++        self.assertEqual(
+             _bytes('<a><b><d></d></b><c><e></e></c></a>'),
+-            a)
++            self.etree.tostring(a, method="c14n"))
+         self.assertEqual(
+             [b, c],
+             a.getchildren())
+-- 
+2.26.2
+
diff --git a/dev-python/lxml/lxml-4.5.1.ebuild b/dev-python/lxml/lxml-4.5.1.ebuild
new file mode 100644
index 000000000000..076c86886dde
--- /dev/null
+++ b/dev-python/lxml/lxml-4.5.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.5
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.0-tests-pypy.patch
+	"${FILESDIR}"/lxml-4.5.1-py39.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}