gentoo Easter resync : 12.04.2020

4 files changed, 48 insertions, 29 deletions

diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index 813d1ff14b8a..640a37cabdee 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,5 +1,4 @@
-DIST svgwrite-1.1.12.tar.gz 202920 BLAKE2B a2b60f3c3829203342919bc75d01f64515f13ba305f357fa788c3754679451e21a7ab97eb517413d4e882e7271d063e7034a10bb70a1946d84734e23e838bdd1 SHA512 326fcc0dd0749925c0c35793a91ffdb25be1fd724d7d87bd6491a6396a6ab65fce073a387faac4f3d034ceadcf24ef73e3838cd249c4e1c19e20b1e82769cf1a
-DIST svgwrite-1.2.1.tar.gz 207371 BLAKE2B 8d6198dbfbc9230eb1592651bde3daaf3f14570aa57fb5b0a3e0989b36b76181bfeac9ee96ee7dcf0ad6e53d1e4ec7035e66d2d1f45ef92de59fa0305f391923 SHA512 8874a25ce5418dc86b0f7034555aca46619c415ec6c51243d713f168f9255ddec8d17ecde13cbfe1a4ffcfbad5b160db62d226b5b0106725dd263763d43abdc2
-EBUILD svgwrite-1.1.12.ebuild 485 BLAKE2B 4a955c32f477ae8d70250c2cdba6190d6252055aa6e3fe1172c0203f1aa2b4bfb39874a0af28777e6630c7da3f16a4737abcc49531c64ecc03bbb1319d390249 SHA512 16aabcc5b8445858882bf7d69582cb3b612bcb311b21cf278e23e75bcc6aa47b62e6ea4bd6c80e6721075a130f45acc08f22d3c5a5fd815e52df039ec4aff5e2
-EBUILD svgwrite-1.2.1.ebuild 661 BLAKE2B 49bb7d727736f7c1dcceb1fff8c4453326ea6f411fdf888eb026bfaeab0295ad84c53858594e1b079be7975e378e6024db5676ff01f70d5a059adfae696031b5 SHA512 3acbe5fcc6448012e6e2e547836d6d1f11b1298ac52eb5eddd2f789f42115ee379ef4dc96cae1b44b7707568e608673b78b6e6e04414e270f132a6797150888d
+AUX svgwrite-1.3.1-fix-tests-py38.patch 1284 BLAKE2B ba8a877f48bce1dd814b4a8602d102dc2cd84569258d23ef9f4a0a202fbac3029b03bda1fd3edb37e32da47a8e577ecbfea6eae29165c38727bec661356fc8be SHA512 18340e2fb9cdd84a3e04d127871f55da4ec2890a9e9d03b95db85470754833d4849cb27d68bd66da9abf3a7389198c922f880f8969f3821d8351eee9892cccc1
+DIST svgwrite-1.3.1.tar.gz 249712 BLAKE2B 3f03f841d4e1bdf3e8d3d47c86301bcc22f205d71d265902f0ccb5a78710815521f34589ce261a463d7e80c6eeaac60d2090895ae1157ab6f20c0f5c21f5e2e2 SHA512 a4d2db34194923055c6e92c0af5540eef767cf8481d7c991b357f5bc77fd1874bba65220e7a7ff3a4da4bd30a49663b6ac514adb2b41cb4b087a7bb64053ac0a
+EBUILD svgwrite-1.3.1.ebuild 638 BLAKE2B 32dc0f666922cae2707ce09fcec43ae78b800bd0702d27e0840237620ec028266815945547a33a05722c4549f9905d577c9c280cbb0e4ff4b31eaed4283f55f0 SHA512 ee5bdfc5f1d3a1acea7f5e06a91443135addb8f545efdd2fc1f63702bc318e6630f136f70bc572efea92d0c784e880e5792e55e0c177464fd4b3fcafb73d54b9
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/svgwrite/files/svgwrite-1.3.1-fix-tests-py38.patch b/dev-python/svgwrite/files/svgwrite-1.3.1-fix-tests-py38.patch
new file mode 100644
index 000000000000..872a113a2a3d
--- /dev/null
+++ b/dev-python/svgwrite/files/svgwrite-1.3.1-fix-tests-py38.patch
@@ -0,0 +1,39 @@
+From 36ec11ccf3275c6ab9156625d322def9c324e090 Mon Sep 17 00:00:00 2001
+From: mozman <me@mozman.at>
+Date: Wed, 6 Nov 2019 05:24:45 +0100
+Subject: [PATCH] ignore svg tag at pretty print testing
+
+Order of svg attribute of the svg tag has changed in Python 3.8,
+ignoring this tag is the easiest way to solve this problem.
+---
+ tests/test_pretty_xml.py | 3 ++-
+ tox.ini                  | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_pretty_xml.py b/tests/test_pretty_xml.py
+index c004626..14a826e 100644
+--- a/tests/test_pretty_xml.py
++++ b/tests/test_pretty_xml.py
+@@ -16,7 +16,8 @@ class TestPrettyXML(unittest.TestCase):
+     def test_pretty_print(self):
+         result = pretty_xml(XML_UGLY).split('\n')
+         expect = XML_PRETTY.split('\n')
+-        for e, r in zip(expect, result):
++        # skip svg tag, order of attributes changes often by new Python releases
++        for e, r in zip(expect[1:], result[1:]):
+             self.assertEqual(e, r)
+ 
+     def test_empty_string(self):
+diff --git a/tox.ini b/tox.ini
+index 55de9ce..fe450be 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -4,7 +4,7 @@
+ # and then run "tox" from this directory.
+ 
+ [tox]
+-envlist = py36, py37, pypy
++envlist = py36, py37, py38, pypy
+ 
+ [testenv]
+ commands = pytest tests
diff --git a/dev-python/svgwrite/svgwrite-1.1.12.ebuild b/dev-python/svgwrite/svgwrite-1.1.12.ebuild
deleted file mode 100644
index d5f466c98e98..000000000000
--- a/dev-python/svgwrite/svgwrite-1.1.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python Package to write SVG files"
-HOMEPAGE="https://github.com/mozman/svgwrite"
-SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/svgwrite/svgwrite-1.2.1.ebuild b/dev-python/svgwrite/svgwrite-1.3.1.ebuild
index e64807ce89b1..77b8babdc570 100644
--- a/dev-python/svgwrite/svgwrite-1.2.1.ebuild
+++ b/dev-python/svgwrite/svgwrite-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python Package to write SVG files"
@@ -18,9 +18,10 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-tests-py38.patch
+)
+
+distutils_enable_tests pytest