gentoo resync : 13.11.2021

5 files changed, 19 insertions, 122 deletions

diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 50ee06e24dd3..2385fd8c7333 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,12 +1,8 @@
 AUX cfn-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
-DIST cfn-lint-0.53.1.tar.gz 7561747 BLAKE2B 2561a04344c567cf9e1e62cdd65e6de0bf8efd17072b5562021055e65c140d8453062fb0019f56f1a8c520043e1215e7c5db894af53801dff26a6e2422688d4f SHA512 3832e6aac7b9a3e638dcf46103a83882fa0bd3778d95aa5837fb7bfe2c9dd10c13ac4434e371396e2f65fe39a36b3f7fb8c7cce52b628fe7dd3fc17ed313f8b6
-DIST cfn-lint-0.54.1.tar.gz 7605760 BLAKE2B 3ce3895ed67b50fab85cb13ab34c2f1a8339a7e68467a82be7c9dde67cef0c700d3d9fcf3cac18afc657abef81316d5c770b8fe97ebdcfc81ca5b97e17fbf011 SHA512 742059b42c3df5a50102d437a11b03890f1579bc5769ca72a033477c9335b5a5d4b5a02973615b98ba9b8ee4022b86c82edac3490a0ec8c9a3f241afe84a9d03
-DIST cfn-lint-0.54.2.tar.gz 7658613 BLAKE2B a29a55756bc4f3fa2ebecc02365025911af238938717c7fd42d5b0707f80ec4149b1986fa3bd66cd704c20468437ee25a47d23c0e551f8e0793eed15499a8361 SHA512 185e0231bb49521b33232678bbd610004821872a5ba4f29bf6c7a4b1df884ab216ce7b4b61af164da7ae31ec83bed066d045c743bc7687690fe542d6f7f6b71e
 DIST cfn-lint-0.54.3.tar.gz 7806470 BLAKE2B b61cb4b46e7c9d04aa70d2542e2aee0d029cc265ca3b85d9bd1c9ddcf2d22a56b28d74f27d6ccf5348cef7224e1ca9d1efec3e5a7b478e8bb87afcb0d39b3da8 SHA512 40e593f0bf092dafca7d7a801deaf2e09c37f4421d58b9244a2da533c3079da076dab70cb974868fd3eb9300ef69897414b03854f8e8fee139e1f5b4781795fc
 DIST cfn-lint-0.54.4.tar.gz 7835716 BLAKE2B 1709adda09a08b02f4a2637af1ed2a43c096d8f9eef91b3cfbac55365e0910be64c632e28e403356742396b72a4af6c88740b27d13a67b62b5f5af98c8639e43 SHA512 f31b8fc407adf75b1eb54a29719b39298494efcdba65e68610e28ca1d066dfdb3fa051e8a90fe589793683c01e49d1bab30832255153e8932bd9caca96b54441
-EBUILD cfn-lint-0.53.1.ebuild 1362 BLAKE2B 92654cc8bdf1efa54c97778ca2dcb7b8c432a56664fef43a1a93f46c84ac6b1bd9e9beb34efda2ce753a04b2b93d191e5e83721aa138ae92a3d9b26d9f83c3bf SHA512 ee3b9639e4f863056e37211a45e3b129fdaa3a5177984e56d4e8a480bc4ad9d883ebbc15b6267c7d63b5b99a08be8ef5df5eeb1100baba5b575276731031e36d
-EBUILD cfn-lint-0.54.1.ebuild 1364 BLAKE2B e2b72cb943d7b7e3432ed067a00f081fcc1ce16339cd5e484451b6b22e07cfc227b349995fcce2e392699d43182675a447544aa83dcaa522125c0eb15ba7bd1d SHA512 9be234f448c9be319bca1d97ff8b88f86a85abcdc9b4877b424f3908ee6dfe6a25287558549d4ac05cc6d93bc42753394e9edaeaf3fbd605a439414a8de8a8b7
-EBUILD cfn-lint-0.54.2.ebuild 1364 BLAKE2B e2b72cb943d7b7e3432ed067a00f081fcc1ce16339cd5e484451b6b22e07cfc227b349995fcce2e392699d43182675a447544aa83dcaa522125c0eb15ba7bd1d SHA512 9be234f448c9be319bca1d97ff8b88f86a85abcdc9b4877b424f3908ee6dfe6a25287558549d4ac05cc6d93bc42753394e9edaeaf3fbd605a439414a8de8a8b7
-EBUILD cfn-lint-0.54.3.ebuild 1364 BLAKE2B e2b72cb943d7b7e3432ed067a00f081fcc1ce16339cd5e484451b6b22e07cfc227b349995fcce2e392699d43182675a447544aa83dcaa522125c0eb15ba7bd1d SHA512 9be234f448c9be319bca1d97ff8b88f86a85abcdc9b4877b424f3908ee6dfe6a25287558549d4ac05cc6d93bc42753394e9edaeaf3fbd605a439414a8de8a8b7
+DIST cfn-lint-0.56.0.tar.gz 8069291 BLAKE2B 6a6b0481f857e3360d2abeb372415a43ae59ed54f2c1ef08ea079f32442bea9f30a7222233cfadd398922994bc70aa78e92b8807d7386ca4b979548622d3e5f4 SHA512 f12ca4ba831c32d7c9c8079ed9d59baf6346a2c4a09cf2af0a8b258dc551b381983cb346800b37e6df3022fbb6f09ee186b44bb9ba3e0a2713c8faabce83f67b
+EBUILD cfn-lint-0.54.3.ebuild 1362 BLAKE2B 92654cc8bdf1efa54c97778ca2dcb7b8c432a56664fef43a1a93f46c84ac6b1bd9e9beb34efda2ce753a04b2b93d191e5e83721aa138ae92a3d9b26d9f83c3bf SHA512 ee3b9639e4f863056e37211a45e3b129fdaa3a5177984e56d4e8a480bc4ad9d883ebbc15b6267c7d63b5b99a08be8ef5df5eeb1100baba5b575276731031e36d
 EBUILD cfn-lint-0.54.4.ebuild 1364 BLAKE2B e2b72cb943d7b7e3432ed067a00f081fcc1ce16339cd5e484451b6b22e07cfc227b349995fcce2e392699d43182675a447544aa83dcaa522125c0eb15ba7bd1d SHA512 9be234f448c9be319bca1d97ff8b88f86a85abcdc9b4877b424f3908ee6dfe6a25287558549d4ac05cc6d93bc42753394e9edaeaf3fbd605a439414a8de8a8b7
+EBUILD cfn-lint-0.56.0.ebuild 1685 BLAKE2B f47f8ca539b51a5d61d560e2e49f08eb30299e1090d64a6baa4dd831045a846cb191756c32b39e93c633d070844ead5d70a565d85c9a7ef367c81e42fe2b2d89 SHA512 d5999123edefe4eb284705648668bfaf98b9411aac28e58fb4a0636326dd9c61ed1aae2d0714138955d24859a6164d444fb8ccd6d5a6a069334a1bc0de9202ce
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.54.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.54.1.ebuild
deleted file mode 100644
index beac470392cb..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.54.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.38.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.54.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.54.2.ebuild
deleted file mode 100644
index beac470392cb..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.54.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.38.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.54.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.54.3.ebuild
index beac470392cb..765144d99ea5 100644
--- a/dev-python/cfn-lint/cfn-lint-0.54.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.54.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.38.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild
index 765144d99ea5..0254104b251a 100644
--- a/dev-python/cfn-lint/cfn-lint-0.53.1.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.56.0.ebuild
@@ -14,16 +14,18 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=dev-python/aws-sam-translator-1.38.0[${PYTHON_USEDEP}]
+	>=dev-python/aws-sam-translator-1.40.0[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 	dev-python/junit-xml[${PYTHON_USEDEP}]
 	dev-python/networkx[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.11[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -32,20 +34,21 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
 )
 
 src_prepare() {
 	# unpin the deps
 	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
 	distutils-r1_src_prepare
 }