gentoo resync : 07.08.2021

4 files changed, 57 insertions, 9 deletions

diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index d927473c3ea9..d3988bd1a750 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1,3 +1,4 @@
+AUX leather-0.3.3-fix-py3.10.patch 1235 BLAKE2B b71bb4d6b541ba55ca3cde388a331b69b8f93589d04e5c33c75033c9bfa63d718cfac16e1298df03ba024251618de72a0699687364daab87cfe1c9d5bbb94a42 SHA512 cfffdd293685cc0cd74b94ddef9458bdb5d63dfbfad976c097413111e336ac879c07e67226c27f5fdf4b121fe23005eb38f2de4f59d07a94c3930b01f7163eeb
 DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
-EBUILD leather-0.3.3-r2.ebuild 1208 BLAKE2B eb9fa86edff5d7fe5ccc36e5176a385348ea16e95ac9ae42bb6e9632a18052d9d82f0d983f76baaacc804336cbb49baf5b84755f8119f44623a67f0a470e03de SHA512 6ba0a36855f4dc039bfa90be8279e55bf1ac57ae27e8b8c129e953cfd2986ef18b697a6c7231c5aef94362b8509bae2413e1f48097564124b089c78a96ebe856
-MISC metadata.xml 493 BLAKE2B f8962c3c95f53a3b1f019a9f0b175700e2954f53cd79e8422a23bb7bd49bc93f402e1dc23a02466bda8a112e1e78e6a843379077e88937dd89efc47d433dd6f7 SHA512 62620c4b79244ca31054b496eff69208bf94aad7df682ed14436a254fb0f604442cd3242a29ab1e828ad902b8ee9348d7830c73a00985017d2a03acde4a757c5
+EBUILD leather-0.3.3-r2.ebuild 1240 BLAKE2B 387ecca42ff6558fbc3cbaf99b90850cb9565ad67ac937871f883915dcd633ed69e3a49998485b40080c2a9e9dc8a27d585a8eca3ddb93f598965acadd7fff1f SHA512 bf7064a146d7e5f0efacb420bd104a7f408cc1fa6b85f4cd889b873b2b8d657af59e8e2df7e41d563fc697b1c470b840d3db22002f2b93c58b07b4cafba64eeb
+MISC metadata.xml 517 BLAKE2B 77a0715582ef60670b54b95e1e2606d0e87edc1c179ba010b11f2cc2c96255733bd38b4fcdd227e2bf575dc35db537b5213d0b8b922bb1ed504594c2645be8aa SHA512 864b114041b0c2ea2884886d1a1953374c243af680e1042cf8f37a6c98e982a73589276c68d736189361db79142b64149817d60f8607b881d6ae4e1f2891eaa5
diff --git a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
new file mode 100644
index 000000000000..8ec9e1767a4f
--- /dev/null
+++ b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
@@ -0,0 +1,40 @@
+From 5dd1d3cc82d426388c66db8e3761ca2bf99a3991 Mon Sep 17 00:00:00 2001
+From: Brian <brian@quantrocket.com>
+Date: Fri, 27 Mar 2020 17:08:50 -0400
+Subject: [PATCH] import from collections.abc to suppress python 3.7 warning
+
+---
+ leather/series/base.py     | 5 ++++-
+ leather/series/category.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/leather/series/base.py b/leather/series/base.py
+index c5790e5..959e827 100644
+--- a/leather/series/base.py
++++ b/leather/series/base.py
+@@ -1,6 +1,9 @@
+ #!/usr/bin/env python
+ 
+-from collections import Iterable, Sequence, Mapping
++try:
++    from collections.abc import Iterable, Sequence, Mapping
++except ImportError:
++    from collections import Iterable, Sequence, Mapping
+ from functools import partial
+ 
+ import six
+diff --git a/leather/series/category.py b/leather/series/category.py
+index c575308..3678377 100644
+--- a/leather/series/category.py
++++ b/leather/series/category.py
+@@ -1,6 +1,9 @@
+ #!/usr/bin/env python
+ 
+-from collections import Iterable, Sequence, Mapping
++try:
++    from collections.abc import Iterable, Sequence, Mapping
++except ImportError:
++    from collections import Iterable, Sequence, Mapping
+ from functools import partial
+ 
+ import six
diff --git a/dev-python/leather/leather-0.3.3-r2.ebuild b/dev-python/leather/leather-0.3.3-r2.ebuild
index c792bf43f78a..e2397fc3ccf7 100644
--- a/dev-python/leather/leather-0.3.3-r2.ebuild
+++ b/dev-python/leather/leather-0.3.3-r2.ebuild
@@ -1,30 +1,36 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python charting for 80% of humans."
 HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
 SRC_URI="https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
 TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 RDEPEND="
 	${TEST_AGAINST_RDEPEND}
-	>=dev-python/cssselect-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 
 python_prepare_all() {
 	local requirements_files sed_args
diff --git a/dev-python/leather/metadata.xml b/dev-python/leather/metadata.xml
index 2b9e7e0da02b..a4cf6d4537d2 100644
--- a/dev-python/leather/metadata.xml
+++ b/dev-python/leather/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/leather/issues</bugs-to>
 		<changelog>https://github.com/wireservice/leather/commits/master</changelog>