* [gentoo-commits] repo/gentoo:master commit in: media-gfx/cairosvg/, media-gfx/cairosvg/files/
@ 2021-01-06 23:33 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2021-01-06 23:33 UTC (permalink / raw
To: gentoo-commits
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@gentoo.org>
+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
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/cairosvg/, media-gfx/cairosvg/files/
@ 2023-03-20 5:36 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2023-03-20 5:36 UTC (permalink / raw
To: gentoo-commits
commit: ffefcdce487dd0ddc40ef6b6c1918c15b766c5b6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 05:20:57 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 05:36:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffefcdce
media-gfx/cairosvg: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-gfx/cairosvg/Manifest | 1 -
media-gfx/cairosvg/cairosvg-2.5.2.ebuild | 45 ----------------------
.../cairosvg/files/cairosvg-2.5.1-no-ref.patch | 30 ---------------
3 files changed, 76 deletions(-)
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index c31ae596f401..db1a46b0a071 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,2 +1 @@
-DIST CairoSVG-2.5.2.tar.gz 8397659 BLAKE2B f2f45aa01015f5ccebe3dede303b6a701c0183b7b53f0d69c8756d5f0e6c0898826939f0b5bcc9e00e4185c83ff507d6fa886a020ad0b63c80a565a181807f58 SHA512 070fbb549614401a7d8290497b0eb7702330ee264c5f625cd1e7aac4aea7d71ee7d2d8899297212e1a3c11c93903b191c0c699336d9000796318b11f4e075576
DIST CairoSVG-2.6.0.tar.gz 8398114 BLAKE2B d4aca284fe3756c40c62dfb2b29e4670c947df13dd76e5104a13cb963bbdf6aa1f7fd242748d6fd0ca524aa03578c3449fa8ea6d86b9a8ce4a64976c32e96627 SHA512 dc504233a8f3fccfc8d4082328bfc0f06a4ebe0249801f764b9aed6b3bad5f953786352930ab199b10b301d0f44a8c2ef2e79eeea198c9094e697fdaa4db48d5
diff --git a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
deleted file mode 100644
index a3ac032b17b3..000000000000
--- a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="https://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
- dev-python/cairocffi[${PYTHON_USEDEP}]
- dev-python/cssselect2[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # junk deps
- sed -e '/pytest-runner/d' \
- -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}"/cairosvg-2.5.1-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
deleted file mode 100644
index 1b2ff0eb7209..000000000000
--- a/media-gfx/cairosvg/files/cairosvg-2.5.1-no-ref.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f79fce1d3703f2985c543575d5eb15ffb0eb7bb6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-20 5:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-06 23:33 [gentoo-commits] repo/gentoo:master commit in: media-gfx/cairosvg/, media-gfx/cairosvg/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-03-20 5:36 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox