gentoo resync : 11.08.2021

5 files changed, 49 insertions, 5 deletions

diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index cfd2a8ed46fb..b78111d21fcb 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,4 +1,5 @@
-AUX 2.4.0-fix-tests.patch 645 BLAKE2B 92158d2350eedca67e2706fdc1ca38902bf7b23abd6ecdc1778c0ddc3ba60bb6830b86a850c2cca6eaf49e35c5ea0644af2aafd3cc00195d78af5e1bda245402 SHA512 b16881cea59eae7c354e36f06b1d6e7e76062a3a83a740700e4b1c964a51315dcb9ab729763172f237a132ce900d2f76c74e0e16ee6bc0fe2d50bf104153279c
+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
-EBUILD pygal-2.4.0-r2.ebuild 1154 BLAKE2B 3aea0bf24f37d195888abd88a6695148fc08f5cc6959598c193a064f0a7b540369be18afe9b203a9fe6a3051019218247c6a7713738e42154f812a249d3b838c SHA512 074bc67b94683d445fc3126cab8fd740a089504ece23c6c31dea56ca5eea2b2034f9f499b14ceafb4b12b8748845e39f0871a33c2f222aadc35e26df454be112
-MISC metadata.xml 432 BLAKE2B 935ce59a5a29aecbe4015fc52312fb03be02821a20863d20171378a68ced0aadfb43f7d1898fe52b8159cc0cd5a78ae0daedb97b730fd864de39abf3a617cd92 SHA512 1d2e68e4622a235b6df15390271b1f331b366a2ad1432740de81de20b494ccfc9e5f0e94f8b63acee67679e10267c0f21c66b58514e72f32d0fa3b5b262640d3
+EBUILD pygal-2.4.0-r2.ebuild 1192 BLAKE2B d4dde60a86d4fbc9eb38c6076c0704911e278b284d34f54a0ece6f019895262a0510ed773474dd2d09facb1a3a38ce0277bcec304bcc9198630131385568935a SHA512 1d65a551e67a94d954fe30e748405c8586ebb4975bea99673c40745ce81d282aeb9fcd107b27c816ee6fe8b162d5660dfeb33ca56434f644682328a5ca9537d7
+MISC metadata.xml 457 BLAKE2B e9271b65906d878c662189b0867774f39018e89a1d51d61c12c9acf9aeba92e153feba275006123a0ca74322d7e123b99039b73ddc4f1ec9977281608f61ec8b SHA512 98b7460912cc0ddc233672a36026685171f96d1fb81d7e5c8045392045656b0424f4abbf2a352f0879323841e16f10d43217c300122a7088b2bd05eb30a9b785
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
new file mode 100644
index 000000000000..ded4ad2ef338
--- /dev/null
+++ b/dev-python/pygal/files/pygal-2.4.0-fix-py3.10.patch
@@ -0,0 +1,39 @@
+From 1525f5e7c18032b34b1be282341d60641161194d Mon Sep 17 00:00:00 2001
+From: Dooley_labs <elderlabs@users.noreply.github.com>
+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/2.4.0-fix-tests.patch b/dev-python/pygal/files/pygal-2.4.0-fix-tests.patch
index 6ae07df3427b..6ae07df3427b 100644
--- a/dev-python/pygal/files/2.4.0-fix-tests.patch
+++ b/dev-python/pygal/files/pygal-2.4.0-fix-tests.patch
diff --git a/dev-python/pygal/metadata.xml b/dev-python/pygal/metadata.xml
index a670a65e1441..827e5a1f8abf 100644
--- a/dev-python/pygal/metadata.xml
+++ b/dev-python/pygal/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pygal</remote-id>
     <remote-id type="github">Kozea/pygal</remote-id>
diff --git a/dev-python/pygal/pygal-2.4.0-r2.ebuild b/dev-python/pygal/pygal-2.4.0-r2.ebuild
index c67f4dee8145..dad973603437 100644
--- a/dev-python/pygal/pygal-2.4.0-r2.ebuild
+++ b/dev-python/pygal/pygal-2.4.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -24,7 +24,10 @@ RDEPEND="
 BDEPEND="
 	test? ( dev-python/pyquery[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}/${PV}-fix-tests.patch" )
+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 )