gentoo resync : 13.11.2021

6 files changed, 7 insertions, 117 deletions

diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index d3ad809d636b..45d582a443ff 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,12 +1,8 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-DIST jsonschema-4.0.1.tar.gz 290999 BLAKE2B d693a33ef705a401187bdf603aacfd0336eab16afc0e38c5133ff6a74e4f0b323172d5abac0959163e40f546eedb75fe2b71f2ca53e7bbe1bf4f00ad977873b9 SHA512 50a2dd6423e8aca76e0a33e33a63bb7d1500abac891076426112c4577277d1f0322d06ec0ba5a9f47c65e5981f0cce768801e55e2f03ab6b0b6d2f884249b5fb
-DIST jsonschema-4.1.0.tar.gz 306755 BLAKE2B a98f1050943543ac51a2e0a7242a8bab909805d660a21e13909748e847493fd7c1f513beb3dac1126e57ffd23bf6702bae52902a5ac6aa7ab94b39833fc40b0c SHA512 288c28d80dc3540386db8774783bbba67455cacd81232aa41e065a9b22fed85dc1bdddb955f8438735bef0f1eb2b2947ab07c66344adb486ef77b31b345f1182
-DIST jsonschema-4.1.1.tar.gz 310026 BLAKE2B c14bee88d20c53e4198e58b946c92a5c505a205daa09c30c474c2e95af45414b1c527298a2e0df647acd79ccbe9344c2aa03ee3e1b7daafda76153248e73f794 SHA512 7afa1bffd9631a503277479595cc9ed9a58ecd0f8f9035a2b65e4005f9f58ff4f6fa968b5ca783aa22c4530fc4acc5e2ea1ef2f67b7f4f09f245e9a6f2b2c3bd
 DIST jsonschema-4.1.2.tar.gz 310016 BLAKE2B 16ec4f73a16980ec69e4c8e0d937726a6fcbf7ba0ba24dc9d76b5bf107b924fb3917927748e3dafacc0305322e9cb405daa83800dcfd5f2fcc63dbb8fe10a25a SHA512 5ab43602cfc2dfe07a8c733f01915b4961ee88ebb37723a7a3a6ee4793ddae4b4638abe77ac9d192158ae7634aacee0c58fa2959288ea0f83e3403d5f8b9f185
-EBUILD jsonschema-3.2.0.ebuild 1283 BLAKE2B 213785899c5e9ed46d98791ce02b45eeb96db799b3c26efe2285246bbd7e377a00522c1cba770f4e139736faab06d3aecc850edf2e5da2c561fd55f45f15666e SHA512 ca901919c61d47765752600d2b8390076d9a94a19a73e02e9d6259473e876e0aa84a0c7237b49bdecfef4b0d5ef449303dfa90afee63b910b900183e73823b87
-EBUILD jsonschema-4.0.1.ebuild 1333 BLAKE2B a34a74156ec7f991397d0e2e1a23a0987430987bcb42b70993e86111e63a3dca3e289f25f7c0c26476fb9bb9ca7ec40ec39b1a74ec61ca03244359f04eee2c19 SHA512 963905c3a3b6ac7a4853ab4adb74d2820ca2165587cf4df17e3e0149cf3c871f71b19fd7034e9583ac7e8555e73212f802336560219e466b1ddf037e0de139a3
-EBUILD jsonschema-4.1.0.ebuild 1351 BLAKE2B 561ebf80f5d74648ff1cb679ffbd807075edb6cd0f0a172d9c46b90b50c2a6b8331c40060b63b0677bededecb00e576345ea627c6202c4a27357da64d1139e65 SHA512 993a263da7eddf716d9252075a3b31f9d5050b763bfd830c6b4294710c5cc90532d5a34ad6d7ea1d243465704d3322b278957f0fb61028e444bb3fd7d20e094b
-EBUILD jsonschema-4.1.1.ebuild 1351 BLAKE2B 561ebf80f5d74648ff1cb679ffbd807075edb6cd0f0a172d9c46b90b50c2a6b8331c40060b63b0677bededecb00e576345ea627c6202c4a27357da64d1139e65 SHA512 993a263da7eddf716d9252075a3b31f9d5050b763bfd830c6b4294710c5cc90532d5a34ad6d7ea1d243465704d3322b278957f0fb61028e444bb3fd7d20e094b
-EBUILD jsonschema-4.1.2.ebuild 1357 BLAKE2B bfbb8207a457930c4e112826680c54e94b7efc8697ff8f7abbfcce268849300f29d3320d3938c95819d3f14d774551c37766e877d4625d4c898e4bf1214ba642 SHA512 04e560e0c91aa1262b8ebf50b6da1eacdb0a7e366789aef6b21d13327ed8f04d00fcc5d552147f2ac8692f72a74cb0c92da7d29463235c2336a01563f7b1466d
+DIST jsonschema-4.2.1.tar.gz 310668 BLAKE2B ba36be8abf0678fda773a9950f06e4d15f6a4c19fdd9f855310b80f45be1a25f44ce329c35667c4e107aab6ba381b02ff2caa305222932e2cbe733f293de82cc SHA512 349993c00e663f3efa2304e60c8b75e90c012d29faa498a01d5d2a5c47ddf0485f28894fd2ddf4766f9ab91e468f4b4f24a53390c72b7a31fae37d75c6f2b774
+EBUILD jsonschema-3.2.0-r1.ebuild 1197 BLAKE2B 81734c4600491524c84424a641ce9294e00045416bb1357be63ef8a9bdc55f04a1935b942a5b75f760d4c16e7d4fd6c055a6e75776ccec1cf23b13f6e34112c5 SHA512 9d37f5d64ecb8edd50854dfd22b649da5370620f01278584531a4dd4441c32cda3d743eecfc0f4a51596de60ff63016d3b0440607d272bd84508ea7209033b08
+EBUILD jsonschema-4.1.2-r1.ebuild 1265 BLAKE2B b48f1c8bb8073c3dcbb6e762f97b501dfe4dce5dbbe307a630010218436dd0e807689acac3414ef4f929a81a87f40193355c139d328e425f1b1f3002c45e1ffd SHA512 74e227ac92c67ddaec7d8af177ff4a2cfe4b2374ba83164e913c6ff694a3068a878548812c9880ee888d2c6ae4da504e548d61a7664aae0b1308ac7915f35704
+EBUILD jsonschema-4.2.1-r1.ebuild 1376 BLAKE2B 783ebd9d0aedc2538a423b05fba03a5c09d8a26c7366b8b83f86dc736209e332b3a857b9d60acfeaf6412a5e9536b3cdfae42439acf7346732b901baba53494f SHA512 40a0eb092ed6d906564e0a01ee0713d5db2a8e51f28389ceec92ba7870086792d72bab96d3803a4fd46d00062bf3b0fab3082c38012a85ef5bf93d55852be941
 MISC metadata.xml 692 BLAKE2B 16ae14e9b64feca61846e85fc4b7346bcd19e0264fb04fbba4e14aaeb391d43ad230bd148486936744248b1b49627c775dd3b56afbfedb2b6b3b1d8465c8aa4c SHA512 dc301a6bbebb6c0b131db43dfb6c7de88decb1c362ef0097cfea617eeed7935dcf5d5be5a1e8bdf74d60910f2733e45f15805e2a98d8e8693117df9af64ee9e6
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0-r1.ebuild
index 951511662f0a..a1a69cca3a4a 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0-r1.ebuild
@@ -20,9 +20,6 @@ BDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/pyrsistent[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-		' pypy3)
 	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
 "
 
diff --git a/dev-python/jsonschema/jsonschema-4.1.0.ebuild b/dev-python/jsonschema/jsonschema-4.1.0.ebuild
deleted file mode 100644
index 3eee583f9602..000000000000
--- a/dev-python/jsonschema/jsonschema-4.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
-
-# formatter deps
-RDEPEND+="
-		dev-python/fqdn[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/isoduration[${PYTHON_USEDEP}]
-		>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-		dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-		dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-		dev-python/rfc3987[${PYTHON_USEDEP}]
-		dev-python/uritemplate[${PYTHON_USEDEP}]
-		>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-)
diff --git a/dev-python/jsonschema/jsonschema-4.1.1.ebuild b/dev-python/jsonschema/jsonschema-4.1.1.ebuild
deleted file mode 100644
index 3eee583f9602..000000000000
--- a/dev-python/jsonschema/jsonschema-4.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
-
-# formatter deps
-RDEPEND+="
-		dev-python/fqdn[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/isoduration[${PYTHON_USEDEP}]
-		>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-		dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-		dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-		dev-python/rfc3987[${PYTHON_USEDEP}]
-		dev-python/uritemplate[${PYTHON_USEDEP}]
-		>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-)
diff --git a/dev-python/jsonschema/jsonschema-4.0.1.ebuild b/dev-python/jsonschema/jsonschema-4.1.2-r1.ebuild
index 903e733761da..b3b546bb0360 100644
--- a/dev-python/jsonschema/jsonschema-4.0.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.1.2-r1.ebuild
@@ -13,14 +13,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
 "
 
 # formatter deps
diff --git a/dev-python/jsonschema/jsonschema-4.1.2.ebuild b/dev-python/jsonschema/jsonschema-4.2.1-r1.ebuild
index 52313e225d8b..9e07327dcc79 100644
--- a/dev-python/jsonschema/jsonschema-4.1.2.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.2.1-r1.ebuild
@@ -19,8 +19,8 @@ RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
 "
 
 # formatter deps