From 677b7ba5c317778df2ad7e70df94b9b7eec4adbc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 10 Sep 2021 04:21:55 +0100
Subject: gentoo resync : 10.09.2021

---
 dev-python/PyUtilib/Manifest              |  4 ++--
 dev-python/PyUtilib/PyUtilib-6.0.0.ebuild | 13 +++++++++++--
 dev-python/PyUtilib/metadata.xml          |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'dev-python/PyUtilib')

diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index 393ed919a27e..f71e3e064883 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -3,5 +3,5 @@ AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58
 DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
 DIST PyUtilib-6.0.0.tar.gz 1569916 BLAKE2B ee4085b597e928c5d6602b647f122c562f2e05dcaf300217cea9c5bc652f6acb5dbe5a075cbbbc1b81497987ab5c658f86cc3e44e16cae02a37d546b2e925a9b SHA512 7841a84ee8d66d2d7af3db810e4d787030acbd8e3e81c3f61251ea160931feddeab6f4d205977a411964359f1cb7e7e59e846593c113093e01c48b81784f7477
 EBUILD PyUtilib-5.7.2.ebuild 1222 BLAKE2B e0e4ade52f636257729c1af0bc91cb7867409654e81177e63a9a337e7bd39f8d13b57c1a2061f07f5d64a42c06226493d2c937dcf371ce304dbdf8bc7f463a03 SHA512 64d5a8cbd2d7433a460931e32f3d592a12b3aa1610706f4c6267491f46d5839202b887684b02f0b82f697806a97af9f997da01ea72a3e6a49e70f18e15325ea5
-EBUILD PyUtilib-6.0.0.ebuild 806 BLAKE2B c4090cb1994ec31b915ab78f87042621ab99b8e75edcfe2ef21fc244f0b9b64022dd10917ae09154a107d23015186c7cbc6dc98eaa9685b8036ceb8a26429cf1 SHA512 0159aedc047724be7f65ecf648d3c51bb0b8aeff34f450509600d7747c798572f82fceec2cf0e4cea187446cabc31250a80fd992cb7ed52cd17fd0604ac7f540
-MISC metadata.xml 399 BLAKE2B 035eaf4d0580b3df7e40a804be2ea3627872a6547d4bd47e6be414df760fa910c9689dae45a161cef4908969c61f4caf63175c3b45fb94bf78000e89085697ed SHA512 673f97cb37989a8526680d11f38dca84de990d3cf18c2cbe68ab1567146a2b03784c40e228f336096b1c45e86434b5b42b92a18ac09df88e423de999d316ce86
+EBUILD PyUtilib-6.0.0.ebuild 1131 BLAKE2B d4f542aa1b38f5d15482a49c9d6f03f95f939d5fc37813cdef0b44d8fc8435ae0f99b8204b2bb00a98e1424b121f6db0e652c1735fde72dc41e16652ae40b4a4 SHA512 b579ef976d91508f6a63a4fbbdf60d60594c1f911bcce638b5749a180c98392ae2e163fb55994e8c302de8e6db8c8178f77fcaaab900776cd1d429444566c8fe
+MISC metadata.xml 423 BLAKE2B 19de505086785e89cf2f795cf90172e8ce406bc83b1f861c34cec4687f8f5ba534de78d3e663f4630f904e1ded15c83ba58248d470b7e60fe4f759d7da39640c SHA512 dc0fbade7f9dca91291c89f6f68ad8f625125c2b3d7aeaaa3186d7d975c03bccb79f98d4525f67f88f07ee1deeff21bfb1ad198d7bba143a7ee8903ed7ab16d0
diff --git a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
index d0f3e6c38855..fe1c027f23da 100644
--- a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
@@ -18,6 +17,9 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
 PATCHES=(
 	"${FILESDIR}/PyUtilib-6.0.0-tests.patch"
 )
@@ -36,5 +38,12 @@ python_test() {
 	local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
 		COLUMNS=80
 
+	if [[ ${EPYTHON} == python3.10 ]]; then
+		# Fix for very small output change of expected output in new version
+		sed -e 's/optional arguments/options/' -i \
+			"${BUILD_DIR}/../doc/workflow/examples/"*.txt \
+			pyutilib/misc/tests/test_config.py || die
+	fi
+
 	eunittest
 }
diff --git a/dev-python/PyUtilib/metadata.xml b/dev-python/PyUtilib/metadata.xml
index bebb51bfe316..25dc41d142ce 100644
--- a/dev-python/PyUtilib/metadata.xml
+++ b/dev-python/PyUtilib/metadata.xml
@@ -8,6 +8,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">PyUtilib</remote-id>
 	</upstream>
-- 
cgit v1.2.3