[gentoo-commits] repo/gentoo:master commit in: media-gfx/cairosvg/, media-gfx/cairosvg/files/

[Michał Górny]

commit:     7b1af08ab0060170042756f92a5ebee3eb13aa16
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 23:32:51 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 23:33:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1af08a

media-gfx/cairosvg: Bump to 2.5.1 (with working tests)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/cairosvg/cairosvg-2.5.1.ebuild           |  6 +++++
 .../cairosvg/files/cairosvg-2.5.1-no-ref.patch     | 30 ++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
index e795e2ab54e..f4c46a47454 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
@@ -36,5 +36,11 @@ src_prepare() {
 		-e '/--flake8/d' \
 		-e '/--isort/d' \
 		-i setup.cfg || die
+
+	# this test compares output against old version; this makes little
+	# sense for us and requires both distfiles around
+	rm test_non_regression/test_non_regression.py || die
+	eapply "${FILESDIR}"/${P}-no-ref.patch
+
 	distutils-r1_src_prepare
 }

diff --git a/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch b/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch
new file mode 100644
index 00000000000..1b2ff0eb720
--- /dev/null
+++ b/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch
@@ -0,0 +1,30 @@
+From f79fce1d3703f2985c543575d5eb15ffb0eb7bb6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
+Date: Thu, 7 Jan 2021 00:31:52 +0100
+Subject: [PATCH] Do not use reference_cairosvg
+
+---
+ test_non_regression/__init__.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/test_non_regression/__init__.py b/test_non_regression/__init__.py
+index 8876e11..4b2e29b 100644
+--- a/test_non_regression/__init__.py
++++ b/test_non_regression/__init__.py
+@@ -8,12 +8,7 @@ import os
+ 
+ import cairosvg
+ 
+-reference_cairosvg = imp.load_source(
+-    'cairosvg_reference', pathname=os.path.join(
+-        os.path.dirname(__file__), 'cairosvg_reference', 'cairosvg',
+-        '__init__.py'))
+-
+-cairosvg.features.LOCALE = reference_cairosvg.features.LOCALE = 'en_US'
++cairosvg.features.LOCALE = 'en_US'
+ 
+ TEST_FOLDER = os.path.join(os.path.dirname(__file__), 'svg')
+ 
+-- 
+2.30.0
+