gentoo resync : 16.01.2021

5 files changed, 3 insertions, 69 deletions

diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 46269e62e132..7ffd67ae07b7 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,7 +1,3 @@
-AUX colorclass-2.2.0-fix-py3.10.patch 1141 BLAKE2B 3ee06d510c39af677977203af1e1ac8f7de50ec93afc9540de45ae62e6ac480b5d0a58407845b92edb193ef014f42fa8132a141a8698bf5499fce4e71e9dca67 SHA512 70d7e9cfdc6647c77ca0e36407cea51f7ead276edf9e41201ca307a282ac36acf0d5bb622e2e76f76e58ec52d2e91c201b1b2490565e3698aff42852a9520acc
-AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2
-DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
 DIST colorclass-2.2.2.gh.tar.gz 490884 BLAKE2B e03c1a7091c133cea67c595363029121083d9a9d70a27f5803b20bb810b105ea9cb95aa68114ba98526b8a3b0e8365eadd7b375443215a5e0b636f0bd4cce632 SHA512 c38b58d4122e794654a8ac71adb2be0fb679eb10bd70c9d8f5dee06b3c978c1530bb3fb8fd6530d88aa35311a46a2590b709e4dcc6e3a81d14b90bf8cb74ebc1
-EBUILD colorclass-2.2.0-r1.ebuild 594 BLAKE2B 84541c2864698d0df1a5fba5cbbd810c9f0d7fbbc52cf57d87ba9d2983839a8a34df6d590351cc2d954f4be1c415c6948f971bf86a368ff72b1a2a00c6c293d7 SHA512 591c3ee088ffb41f135bb1962af3435b8da17d0ed8606a6e2a6c3c0440fb4f3d33c8216f4399aec330cfc81ce44ffdcb865d592b53f1cf7ee0ea1b1e68791766
-EBUILD colorclass-2.2.2.ebuild 862 BLAKE2B f128d8c96aba7ef51705664b6639b6e9be0a975a50d2bd380dd21c9775b96dd3b64fa5d3b238e3f706a46862f8d66c6574b95a98a482e5de9aa7cafbd84d8b87 SHA512 bde99f9f06db103e81c28e1c92d0bdafacf5f6a18bc3dd89392d3edbb991b5a7240e4e36464e8cb79ca58bbe533861a4b2d318fcdb56bd5bf449f6ed0f095f47
+EBUILD colorclass-2.2.2.ebuild 860 BLAKE2B 605f71727ab689a7b0782dcf67029be4e462042202b3e785fcfcb7bfdc1d32445c3c3a738a596d95995cf0bf0af3a98cf299e51ef3db5f38a1f7aa313bca3982 SHA512 78e0f449b5f3bf344b71132b8537ffb98994dce6187c28f5cf1a002271bb1477741a4a79582a555993a4ff35f4b41ce41a85a645860fac551000ba42f431ecae
 MISC metadata.xml 375 BLAKE2B 80d8bedbdd9260ff3c0113c3ea75df61ddc166fbc36033289531d0a9e704c04582ca1defa3107ee5f0d5c1bf0510b8739b19b28d00cba655988486c45bbfbce9 SHA512 27ad28c11c7b5114d0eadffe08ba4378bdd0e756dd3193e331e66dc4974c9543640b5530c4e344c263b5028bcde7ff87339a1627b87b9c715649bb6755e12d7c
diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
deleted file mode 100644
index fde6c8c536af..000000000000
--- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Colorful worry-free console applications for multiple platforms"
-HOMEPAGE="https://pypi.org/project/colorclass/ https://github.com/Robpol86/colorclass"
-SRC_URI="https://github.com/Robpol86/colorclass/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/colorclass/colorclass-2.2.2.ebuild b/dev-python/colorclass/colorclass-2.2.2.ebuild
index 31cca6e7e360..b771b682bbc2 100644
--- a/dev-python/colorclass/colorclass-2.2.2.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch b/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
deleted file mode 100644
index ee67d6d40bb3..000000000000
--- a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8bbe9fdcff1d97b1d0e5dcb94680923cc43a507 Mon Sep 17 00:00:00 2001
-From: Ralph Broenink <ralph@ralphbroenink.net>
-Date: Mon, 24 Aug 2020 14:49:24 +0200
-Subject: [PATCH] Make code forwards-compatible with Python 3.9
-
-Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working
----
- colorclass/codes.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/colorclass/codes.py b/colorclass/codes.py
-index b0ecb03..8b6085d 100644
---- a/colorclass/codes.py
-+++ b/colorclass/codes.py
-@@ -1,7 +1,12 @@
- """Handles mapping between color names and ANSI codes and determining auto color codes."""
- 
- import sys
--from collections import Mapping
-+try:
-+    # Using or importing the ABCs from 'collections' instead of from 'collections.abc' is 
-+    # deprecated since Python 3.3, and in 3.9 it will stop working
-+    from collections.abc import Mapping
-+except ImportError:
-+    from collections import Mapping
- 
- BASE_CODES = {
-     '/all': 0, 'b': 1, 'f': 2, 'i': 3, 'u': 4, 'flash': 5, 'outline': 6, 'negative': 7, 'invis': 8, 'strike': 9,
diff --git a/dev-python/colorclass/files/colorclass-2.2.0-tests.patch b/dev-python/colorclass/files/colorclass-2.2.0-tests.patch
deleted file mode 100644
index f25dd0440aa7..000000000000
--- a/dev-python/colorclass/files/colorclass-2.2.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/test_example.py b/tests/test_example.py
-index 7ee8c05..3516460 100644
---- a/tests/test_example.py
-+++ b/tests/test_example.py
-@@ -10,6 +10,7 @@ from tests.conftest import PROJECT_ROOT
- from tests.screenshot import RunNewConsole, screenshot_until_match
- 
- 
-+@pytest.mark.skip(reason="test fails on all platforms")
- @pytest.mark.parametrize('colors', [True, False, None])
- @pytest.mark.parametrize('light_bg', [True, False, None])
- def test_piped(colors, light_bg):