gentoo resync : 12.05.2022

6 files changed, 4 insertions, 176 deletions

diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 68bf5b8a6d0f..f0d6eb2be9bc 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,9 +1,5 @@
-AUX black-21.12_beta0-support-tomli-2.patch 1530 BLAKE2B 2b378a2da1e067b6e2a562556423f1359122934bf946468bda1eeb556064eff9de59837d5375df5bea846175ff32e6ed3a98e86ffd485f07c2e947c2d9b1d069 SHA512 d8302a9febff804e9ee81820c00c6caa3c975349244f22136a086428dc47c259b969caafd83983cfaa1d26b13c0d42bd38c2df477b9c574e545ef36915668c0c
-DIST black-21.12b0.tar.gz 1200305 BLAKE2B cd019b230d2ba1fab88075a5e14cb5de88a4ee283b53d869564f071a104d2810ca31c04db09310b99a1610bdace7d5b9b360b2a3a4810822322a4eacc8998ad8 SHA512 1f6e4eeafd653fa9db608585110f5c5067942031b2d67e630befa899d7fca3c35f52cbde8fc91c2697fb294fb16525254756ebce16e556fc139b621f738bfa22
 DIST black-22.1.0.tar.gz 1161720 BLAKE2B d74cbdd39dc1576583cee57089cb6d75a338f2d6640697adda79d38d02eeb51664049dca934d5014761d0fd4080ca2f40a3ea10c30e40bde9fe6af6c178b202c SHA512 9b97a3b32ecebebeb61ea581784a9b2215540c20533097fe87d5ef3c046dbe7c2ab8f2f21d1884cbe0ddd458434f17eb9b540764f955385873e6fdef86c3014c
 DIST black-22.3.0.tar.gz 1154456 BLAKE2B c89b43722839748dff0ce60debb684cd8eeae5ef5fb7e080f6b0031412381d7be121ce62ad252a67fa7930726243680a4bf183417611617be5af39722164289d SHA512 fc44576b93a6e158f625ad5444247f6a59a1ebcc7f0c73ed40d557a9a865457b297eabd492f01999e51ee3e5c3fa83f3d6e3c10937ecaa8c1d36f7541736d2e4
-EBUILD black-21.12_beta0-r1.ebuild 1859 BLAKE2B 55de6d5698665e5e9dbaced8e5a8f3b38399899e5bd03d74b86281b6b8f0c2704181612a0aec3c062f4444618311bb2995a1ff631ca38a5d11e57d0683f284b7 SHA512 1a098b1dbe13f26f40e628e26e7115cb7d3aaa36e74d041b66fc348a7bf5b7e3fcc917e2be0ca0c2816584e618748c8c06604455b10e67498fcd1b57a837ddd9
-EBUILD black-21.12_beta0.ebuild 1742 BLAKE2B f141ef150cb63b6878ca9cf3be3782f83443cdd545b53a23c55c3df164cf53d601d773043acc52035d98f80f707df8d55eab387f48757ed52342e00a6d094275 SHA512 d5590abc3f486285ad92f01aca47df729cea9c292cd2c4f1958b687d396b51ba825c2497fc9896f824387485930b6d97d66c74fef580b00cda0173f481b1f101
-EBUILD black-22.1.0.ebuild 1398 BLAKE2B 706c43bd99730f9aa01c50a1910192e0f09070287d4447e581d4b4259c3a5a4a822ba6691124fea1f89f92085004079de619af68239d42a68ea526dce524ed39 SHA512 6a9653a3978d61494662dee26969bd4628010a024f42c860e79b83603c7d7568d1f4eb2d885009fbd1fd2ae203b56bb83a8294ce5d559254bb1cde72f99e352a
-EBUILD black-22.3.0.ebuild 1398 BLAKE2B 706c43bd99730f9aa01c50a1910192e0f09070287d4447e581d4b4259c3a5a4a822ba6691124fea1f89f92085004079de619af68239d42a68ea526dce524ed39 SHA512 6a9653a3978d61494662dee26969bd4628010a024f42c860e79b83603c7d7568d1f4eb2d885009fbd1fd2ae203b56bb83a8294ce5d559254bb1cde72f99e352a
+EBUILD black-22.1.0.ebuild 1397 BLAKE2B 89116657e56fb1f9a08ebdfe35de2d5d9761f43c5dff5a2ecfb0c8cf5d68581223dada3d0accb3261bbaabf4c26861dec3e35c482c7afdd8279ee8ab3422418d SHA512 0ec829dc329fab2b7c892405d195e34be8d8e1dd0850940c3727bdec6cd520b4a8d977f6b1a13e97b4622b2d853f9f372a515f457d2161e0412ed6be843f06a3
+EBUILD black-22.3.0.ebuild 1417 BLAKE2B ac11791cabf7d046f6a9a632174ff214c42983a5d152d9be29e8653b192bd8b72ea8f399d2a43bc64ec7c65590ba284082783db81685508e055a9d476f3abc80 SHA512 08f7e446dedbbf21a62b55e10828761c1e3962ce48c2009fe8a7846364386d8b206489eec09c91fb515c83fc54ee2efad5ae13d66427670659b6bad6a3911966
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-21.12_beta0-r1.ebuild b/dev-python/black/black-21.12_beta0-r1.ebuild
deleted file mode 100644
index 140a9e45a8a2..000000000000
--- a/dev-python/black/black-21.12_beta0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	<dev-python/tomli-3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_{8,9})
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Merged in master
-	"${FILESDIR}/${P}-support-tomli-2.patch"
-)
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-src_prepare() {
-	# remove unnecessary bind that worked around broken 6.1.0/6.2.0 releases
-	sed -i -e '/setuptools_scm/s:~=:>=:' \
-		-e 's/setuptools_scm\[toml\]>=[0-9.]*/setuptools_scm[toml]/' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json \
-		"${BUILD_DIR}"/lib/black_primer/primer.json || die
-	distutils_install_for_testing
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-21.12_beta0.ebuild b/dev-python/black/black-21.12_beta0.ebuild
deleted file mode 100644
index 92783419ca96..000000000000
--- a/dev-python/black/black-21.12_beta0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	<dev-python/tomli-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_{8,9})
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-src_prepare() {
-	# remove unnecessary bind that worked around broken 6.1.0/6.2.0 releases
-	sed -i -e '/setuptools_scm/s:~=:>=:' \
-		-e 's/setuptools_scm\[toml\]>=[0-9.]*/setuptools_scm[toml]/' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json \
-		"${BUILD_DIR}"/lib/black_primer/primer.json || die
-	distutils_install_for_testing
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-22.1.0.ebuild b/dev-python/black/black-22.1.0.ebuild
index 5af8bdaa4f15..a70984f43bf9 100644
--- a/dev-python/black/black-22.1.0.ebuild
+++ b/dev-python/black/black-22.1.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/black/black-22.3.0.ebuild b/dev-python/black/black-22.3.0.ebuild
index 5af8bdaa4f15..f77d494b3379 100644
--- a/dev-python/black/black-22.3.0.ebuild
+++ b/dev-python/black/black-22.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/black/files/black-21.12_beta0-support-tomli-2.patch b/dev-python/black/files/black-21.12_beta0-support-tomli-2.patch
deleted file mode 100644
index 5374dc6e82a9..000000000000
--- a/dev-python/black/files/black-21.12_beta0-support-tomli-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 389e9c23a9e622ee6090d902cc5f56c5f76cdee9 Mon Sep 17 00:00:00 2001
-From: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com>
-Date: Tue, 21 Dec 2021 18:03:07 +0200
-Subject: [PATCH] Disable universal newlines when reading TOML (#2408)
-
---- a/Pipfile
-+++ b/Pipfile
-@@ -42,7 +42,7 @@ platformdirs= ">=2"
- click = ">=8.0.0"
- mypy_extensions = ">=0.4.3"
- pathspec = ">=0.8.1"
--tomli = ">=0.2.6, <2.0.0"
-+tomli = ">=1.1.0, <3.0.0"
- typed-ast = "==1.4.3"
- typing_extensions = {markers = "python_version < '3.10'", version = ">=3.10.0.0"}
- black = {editable = true,extras = ["d"],path = "."}
---- a/setup.py
-+++ b/setup.py
-@@ -99,7 +99,7 @@ def find_python_files(base: Path) -> List[Path]:
-     install_requires=[
-         "click>=7.1.2",
-         "platformdirs>=2",
--        "tomli>=0.2.6,<2.0.0",
-+        "tomli>=1.1.0,<3.0.0",
-         "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",
-         "pathspec>=0.9.0, <1",
-         "dataclasses>=0.6; python_version < '3.7'",
---- a/src/black/files.py
-+++ b/src/black/files.py
-@@ -95,8 +95,8 @@ def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
- 
-     If parsing fails, will raise a tomli.TOMLDecodeError
-     """
--    with open(path_config, encoding="utf8") as f:
--        pyproject_toml = tomli.loads(f.read())
-+    with open(path_config, "rb") as f:
-+        pyproject_toml = tomli.load(f)
-     config = pyproject_toml.get("tool", {}).get("black", {})
-     return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}
-