app-admin/ansible-lint: add 5.4.0, drop 5.2.1 and 5.3.1

Signed-off-by: Marek Szuba <marecki@gentoo.org>

3 files changed, 20 insertions, 67 deletions

diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index f33314c9a685..5b7658ffdc5f 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,3 +1,2 @@
-DIST ansible-lint-5.2.1.tar.gz 356071 BLAKE2B 70c54114a667ba63c1d285ec8a73a7c3332f89cbdf1b8d4866de86aa2c358e41759ac69188806c715cbd3893a2d0b1123e6b679ed208ce4c40141a40b9f54681 SHA512 9ae1aa775572485aaa68ef127cb2ea2d66cd1057878ac396b1644244a070f05b7920eceec3cdb16523f9fadcbcb5df971f3513d7e4d9cbd6ace1ec4f4d861451
-DIST ansible-lint-5.3.1.tar.gz 356514 BLAKE2B 3ae30c357ed03c544773671af94763bf76d3544f30b1c7b7081db9a67feaeaecfb678d4b194c05b45fc8c7e75cc1c057ad9612ad4aaf364cfd4904200ac128f5 SHA512 2d46b1cf2605c68765c67e7d7e90a049e9253b058ac01c833ed0afc67ba553a8855f3d9315eec440bfc08c0d9e7b0b0f5e0151021708ad1e05fd895c7f679c43
 DIST ansible-lint-5.3.2.tar.gz 356870 BLAKE2B 4af11f760e30945e066a9d160438bbedd5a4d39799009bc6d30614baab0b88a21cad088c0b758529aaa5fbb54a9f2a1f636ab6d642a37297a27c8ba5240f53ef SHA512 4ff2d36de20b2e6982d0cd1bca6a3f886307701dfa0bf880d2d417387191d90adc9361afb57f8ed26239cbc110e5f05f52a186950d7d3b4b0a8e4406e4695acd
+DIST ansible-lint-5.4.0.tar.gz 349353 BLAKE2B 9f41abdf1e9485afa4c8ed9498627b0dcbdcf57916f3b57c9886de8bd806e4e5b34e7e9c2e66b44ac8009a0afcea4d8566900ee8d391eaca61081fa23323c41c SHA512 f1bbbb49eb77991d60b6087646c695a938d328d719bba67707af4ed858de857d383b78490bcf0930cffebd13a0b0abde20269a47e47e4713a37da715a28c5da0
diff --git a/app-admin/ansible-lint/ansible-lint-5.3.1.ebuild b/app-admin/ansible-lint/ansible-lint-5.3.1.ebuild
deleted file mode 100644
index a5036ce2dc07..000000000000
--- a/app-admin/ansible-lint/ansible-lint-5.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible-community/ansible-lint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-# 14 tests fail due to usersandbox denying the executable 'ansible'
-# access to $HOME/.ansible. More importantly, some tests (6 as of 5.2.1)
-# fail even when run manually with tox.
-RESTRICT="test"
-
-RDEPEND="
-	>=app-admin/ansible-2.10[${PYTHON_USEDEP}]
-	>=app-admin/ansible-base-2.11.4[${PYTHON_USEDEP}]
-	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15.37[${PYTHON_USEDEP}]
-	dev-python/tenacity[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.1.0[${PYTHON_USEDEP}]
-		>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-pkg_postinst() {
-	optfeature_header "Consider installing the following optional packages:"
-	optfeature "letting ${PN} run YAML checks" dev-util/yamllint
-}
diff --git a/app-admin/ansible-lint/ansible-lint-5.2.1.ebuild b/app-admin/ansible-lint/ansible-lint-5.4.0.ebuild
index 6deaf6a286bf..4f26c3d985c4 100644
--- a/app-admin/ansible-lint/ansible-lint-5.2.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-5.4.0.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1 optfeature
+inherit distutils-r1
 
 DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
 HOMEPAGE="https://github.com/ansible-community/ansible-lint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# PyPI tarballs do not contain all the data files needed by the tests
+SRC_URI="https://github.com/ansible-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-# 14 tests fail due to usersandbox denying the executable 'ansible'
-# access to $HOME/.ansible. More importantly, some tests (6 as of 5.2.1)
-# fail even when run manually with tox.
-RESTRICT="test"
-
 RDEPEND="
 	>=app-admin/ansible-2.10[${PYTHON_USEDEP}]
 	>=app-admin/ansible-base-2.11.4[${PYTHON_USEDEP}]
@@ -29,19 +26,24 @@ RDEPEND="
 	>=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
 	>=dev-python/ruamel-yaml-0.15.37[${PYTHON_USEDEP}]
 	dev-python/tenacity[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]"
+	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]
+	>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]"
 BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-xdist-2.1.0[${PYTHON_USEDEP}]
-		>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_tests --install pytest
-
-pkg_postinst() {
-	optfeature_header "Consider installing the following optional packages:"
-	optfeature "letting ${PN} run YAML checks" dev-util/yamllint
-}
+# Skip problematic tests:
+#  - test_call_from_outside_venv doesn't play nicely with the sandbox
+#  - test_eco tests require Internet access
+#  - as of 5.4.0, test_cli_auto_detect fails even when run manually with tox
+EPYTEST_DESELECT=(
+	test/TestUtils.py::test_cli_auto_detect
+	test/test_eco
+	test/test_main.py::test_call_from_outside_venv
+)
+
+distutils_enable_tests pytest