From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- dev-python/pygal/Manifest | 4 -- .../pygal/files/pygal-2.4.0-fix-py3.10.patch | 39 ------------------- dev-python/pygal/files/pygal-2.4.0-fix-tests.patch | 17 -------- dev-python/pygal/pygal-2.4.0-r2.ebuild | 45 ---------------------- 4 files changed, 105 deletions(-) delete mode 100644 dev-python/pygal/files/pygal-2.4.0-fix-py3.10.patch delete mode 100644 dev-python/pygal/files/pygal-2.4.0-fix-tests.patch delete mode 100644 dev-python/pygal/pygal-2.4.0-r2.ebuild (limited to 'dev-python/pygal') diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest index 9aa1b547b781..f1d4de053dba 100644 --- a/dev-python/pygal/Manifest +++ b/dev-python/pygal/Manifest @@ -1,7 +1,3 @@ -AUX pygal-2.4.0-fix-py3.10.patch 1190 BLAKE2B 01e362ca7ce209a1eb1c47e020279ef9efd5f26f0019c12e65cc707160749e3b0794bebe075cf4b65432a1dce429b8ba6ff1ce6584dd1726293e7b9465b12846 SHA512 e2dc856539aeacad335fcbd55c062a1fc0428eb4a4874a1c8f3058bae04281152e8d8bde7be6e3eceb62276272c02d5535bc7dc328425a3c9a094334d5058429 -AUX pygal-2.4.0-fix-tests.patch 645 BLAKE2B 92158d2350eedca67e2706fdc1ca38902bf7b23abd6ecdc1778c0ddc3ba60bb6830b86a850c2cca6eaf49e35c5ea0644af2aafd3cc00195d78af5e1bda245402 SHA512 b16881cea59eae7c354e36f06b1d6e7e76062a3a83a740700e4b1c964a51315dcb9ab729763172f237a132ce900d2f76c74e0e16ee6bc0fe2d50bf104153279c -DIST pygal-2.4.0.tar.gz 4554802 BLAKE2B 9627558e734420bfb3137989d0cc1978a0a06a597d3d5d071e13653876a4bb3266f12f1a8a358076619d997998754c29ee75058356ba66da64b112a24c2cbe2a SHA512 d69fbcff3792cb0b952addc3bfbaea76628d5546482c291ef217c592a820a73a65b1eb522c5d7877e7a794d19b74636126d99a4ff280e8467ab07a95000ba823 DIST pygal-3.0.0.tar.gz 3575455 BLAKE2B 9b64cf441aeb25b0a0b9834f07e5892fe163f28a5da796d37083f8f3a10d8737a69bad39e503d722e6a36f2de4367b4fd2bdc3a06c5bc30bce66a370690d9c88 SHA512 71ac9f197d711c8cf5bb47caef128754f81b1cb0ba98c4cc67de78b68fca5d40baae9fbb5c978f6abaed4c73b8edfea2de07de2fda1aa7c15e0d81387518cc49 -EBUILD pygal-2.4.0-r2.ebuild 1192 BLAKE2B d4dde60a86d4fbc9eb38c6076c0704911e278b284d34f54a0ece6f019895262a0510ed773474dd2d09facb1a3a38ce0277bcec304bcc9198630131385568935a SHA512 1d65a551e67a94d954fe30e748405c8586ebb4975bea99673c40745ce81d282aeb9fcd107b27c816ee6fe8b162d5660dfeb33ca56434f644682328a5ca9537d7 EBUILD pygal-3.0.0.ebuild 909 BLAKE2B e25937aa0570290e59d3f61ba9b2cf33cd65303099e9430c0ac36c29360767e73b52ce2d45f103692d9a90f5a6197f78ab1b5a86f8c99141c302dc36e9585e3d SHA512 a7dd8e3a3feb97fde0074c8b31473316f5fc73eed558115f658976a9a981c255a598e6943cdcc4d1df2ff82b921d264b50a933b1cafaf537e198f2b1145b0b89 MISC metadata.xml 458 BLAKE2B 70473091a8343d255501ff6d306cbf376b57c42ba842e36a3948649f30ffa3f29ff502254cf265512b024878b8faa7d77b4164b5cf70ae6f851a5d2d51a3997c SHA512 3bcd119c30b25e2f821c10d1b2c58efc109d8049a446acb4960b47ddef18d3c1ed4efc6bb4dc551abbb42f17828c4898acdad3172523b7576a6a548e43a8e8b9 diff --git a/dev-python/pygal/files/pygal-2.4.0-fix-py3.10.patch b/dev-python/pygal/files/pygal-2.4.0-fix-py3.10.patch deleted file mode 100644 index ded4ad2ef338..000000000000 --- a/dev-python/pygal/files/pygal-2.4.0-fix-py3.10.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1525f5e7c18032b34b1be282341d60641161194d Mon Sep 17 00:00:00 2001 -From: Dooley_labs -Date: Sat, 28 Dec 2019 02:29:38 -0500 -Subject: [PATCH] Python 3 compatibility patches - ---- - pygal/_compat.py | 5 ++++- - pygal/util.py | 2 +- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pygal/_compat.py b/pygal/_compat.py -index 07ab8846..815585f1 100644 ---- a/pygal/_compat.py -+++ b/pygal/_compat.py -@@ -20,7 +20,10 @@ - from __future__ import division - - import sys --from collections import Iterable -+try: -+ from collections.abc import Iterable -+except ImportError: -+ from collections import Iterable - from datetime import datetime, timedelta, tzinfo - - if sys.version_info[0] == 3: -diff --git a/pygal/util.py b/pygal/util.py -index 65236173..cca29dbf 100644 ---- a/pygal/util.py -+++ b/pygal/util.py -@@ -275,7 +275,7 @@ def minify_css(css): - # Inspired by slimmer by Peter Bengtsson - remove_next_comment = 1 - for css_comment in css_comments.findall(css): -- if css_comment[-3:] == '\*/': -+ if css_comment[-3:] == r'\*/': - remove_next_comment = 0 - continue - if remove_next_comment: diff --git a/dev-python/pygal/files/pygal-2.4.0-fix-tests.patch b/dev-python/pygal/files/pygal-2.4.0-fix-tests.patch deleted file mode 100644 index 6ae07df3427b..000000000000 --- a/dev-python/pygal/files/pygal-2.4.0-fix-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/pygal/test/conftest.py b/pygal/test/conftest.py -index ea36010..6fe40cb 100644 ---- a/pygal/test/conftest.py -+++ b/pygal/test/conftest.py -@@ -48,9 +48,9 @@ def pytest_generate_tests(metafunc): - if hasattr(sys, 'pypy_version_info'): - etree.to_etree() - -- if "Chart" in metafunc.funcargnames: -+ if "Chart" in metafunc.fixturenames: - metafunc.parametrize("Chart", pygal.CHARTS) -- if "datas" in metafunc.funcargnames: -+ if "datas" in metafunc.fixturenames: - metafunc.parametrize( - "datas", [[("Serie %d" % i, get_data(i)) for i in range(s)] - for s in (5, 1, 0)] --- diff --git a/dev-python/pygal/pygal-2.4.0-r2.ebuild b/dev-python/pygal/pygal-2.4.0-r2.ebuild deleted file mode 100644 index dad973603437..000000000000 --- a/dev-python/pygal/pygal-2.4.0-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="A python SVG charts generator" -HOMEPAGE="https://github.com/Kozea/pygal/" -# PyPI tarballs do not contain docs -# https://github.com/Kozea/pygal/pull/428 -SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-python/lxml[${PYTHON_USEDEP}] - media-gfx/cairosvg[${PYTHON_USEDEP}]" - -BDEPEND=" - test? ( dev-python/pyquery[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${P}-fix-tests.patch" - "${FILESDIR}/${P}-fix-py3.10.patch" -) - -# CHANGELOG is a symlink to docs/changelog.rst -DOCS=( docs/changelog.rst README.md ) - -distutils_enable_sphinx docs -distutils_enable_tests pytest - -python_prepare_all() { - # Not actually required unless we want to do setup.py test - # https://github.com/Kozea/pygal/issues/430 - sed -i -e "/setup_requires/d" setup.py || die - # [pytest] section in setup.cfg files is no longer supported - sed -i -e 's@\[pytest\]@[tool:pytest]@' setup.cfg || die - distutils-r1_python_prepare_all -} -- cgit v1.2.3