gentoo auto-resync : 09:08:2022 - 14:16:10

3 files changed, 17 insertions, 69 deletions

diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index dfeacf073cb6..6d13b9d16167 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,8 +1,6 @@
 AUX ansible-lint-6.0.2_test-module-check.patch 689 BLAKE2B 69152c8799165f8efcf44640ad44133147e95945aeb4aee7a5a45aa0e74432fce599040f017ae92fb7264855f74c0bcd71a44e26abf0abebfcce2cbcaea39ada SHA512 01be971c7d33086aa799910ac744cfceb07b4d5041716043c49667075ab8c8579b57f0c14a8094248f96462c93fff3ac110776aa0aa1ea3adf11dc622028ca7e
-DIST ansible-lint-5.4.0.tar.gz 349353 BLAKE2B 9f41abdf1e9485afa4c8ed9498627b0dcbdcf57916f3b57c9886de8bd806e4e5b34e7e9c2e66b44ac8009a0afcea4d8566900ee8d391eaca61081fa23323c41c SHA512 f1bbbb49eb77991d60b6087646c695a938d328d719bba67707af4ed858de857d383b78490bcf0930cffebd13a0b0abde20269a47e47e4713a37da715a28c5da0
-DIST ansible-lint-6.2.2.tar.gz 232952 BLAKE2B 571dce6dc348c1158fed396fc29054421d172964facd8cbb0f8c1560036de574aa304f59497c8c76415ac99424d0450c8b06509ced113c9a997808e960793621 SHA512 ae119b29d87ce59e7bd5c401a8fcbc2194bdddecd5a65010ea02aee62cff1764a767803a57edcfd297e9ad0cbdf70fe69212625ed80b21afb53b4ebe429a7636
 DIST ansible-lint-6.3.0.tar.gz 268331 BLAKE2B 00ea2dbc7bb5e71d63a737ac99d4116441f6b1eee2fa476d9aa4d78068064e53975df00950f337e7c9e25dacf8778ddd2e40eb5d3ea1301f56a80dfd90d42c20 SHA512 3e9d480cb90f3022a4b001c061c3e76b753620776a009b1563dce335c13ee38b7ac334725592ac644a2808d85ceb98b618a451c193bc7c4961474d4e7fbbb88e
-EBUILD ansible-lint-5.4.0.ebuild 1852 BLAKE2B 913794c189a58ed0fa3cd0febde7b0ac4788294bee7b1309eb1d70f5619289d4c80f57a8227a7a834ce299c6a24a7c59285425c737d7b0cbd1e53c47ac570650 SHA512 5ca55f7c4d72b01d95813ecef1f3e984ff92993fb0cbf7e5090d938349dba942b88e695e6e34e022385c5a4d6e1fb457766d19aee606ceddedc458fa84c91bb4
-EBUILD ansible-lint-6.2.2.ebuild 2443 BLAKE2B 65f93d1523c1cea6ceab40516c4b228881660718f4f7a4a2d98ffe205e7aa4e1b43d57ba6f081ff0d8e291889ba470f701e479fa24848eb0ad561fc85def2b5a SHA512 ddd4cfcf1940a27b3af62bd440e81c21c5fc7a6faaec5875398396bfc1dda54ee00023199e8d6f0e10f3c225a3d5ee26c5fd21edd1d59e3cb51e2342e8b8c1f5
+DIST ansible-lint-6.4.0.gh.tar.gz 235346 BLAKE2B a2f55e6f4df739dccb011225f0a660978a9dfdbcc6e45cee2eef12467482c471d8700bb1bfad87e03eb1c4f21291307db5dc174e2440370ca11368f6ad6d195d SHA512 75e30a325a5c62f64066925b99e691886e299e029adc78fdceaa5eb23a74a46408793479e7c54c312d93e0a62d190b34f1e7614dec31a94822d39a231796e9df
 EBUILD ansible-lint-6.3.0.ebuild 2579 BLAKE2B ec7b5653eed42701af8469791f48b7c3a82efa6a2fa5369aa89ca01e613a977b6ba2b5b4c9abaf825475a89360d4498c0408dca0573681309790a3a96195d73f SHA512 b975db3ada230a8a6b24e211b6aa5818bc1e99a9bdb0cdfa2672a05f65b9a8f8ba53c64107451c9acf63b895ae5be5b33eafc498ef90747a31bf92ef657a785c
+EBUILD ansible-lint-6.4.0.ebuild 2627 BLAKE2B 87d358b1580e5bc7586a9860c01df38d5e1f6ef4d3e9d880db97b114a3b66a4896b1b2edaf8fc9116f395d637866b6b21e4da1527cf084a5c481639e469fc0b7 SHA512 270a28e69675fb39c85f1b927ed4a7998de4f4725b9d6ebb5e5a1e570bbeca06d2886c76d6993f74254ea8885166521c07be59043929160b8318b3d38ca42f9f
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-5.4.0.ebuild b/app-admin/ansible-lint/ansible-lint-5.4.0.ebuild
deleted file mode 100644
index a2b7755f9476..000000000000
--- a/app-admin/ansible-lint/ansible-lint-5.4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-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
-
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible-community/ansible-lint"
-# 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"
-
-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}]
-	>=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}]
-	)"
-
-# Skip problematic tests:
-#  - test_call_from_outside_venv doesn't play nicely with the sandbox
-#  - all test_eco and some test_prerun 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.py
-	test/test_main.py::test_call_from_outside_venv
-	test/test_prerun.py::test_install_collection
-	test/test_prerun.py::test_prerun_reqs_v1
-	test/test_prerun.py::test_prerun_reqs_v2
-	test/test_prerun.py::test_require_collection_wrong_version
-)
-
-distutils_enable_tests pytest
diff --git a/app-admin/ansible-lint/ansible-lint-6.2.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
index 8e20fa3a01ff..071feb3061bb 100644
--- a/app-admin/ansible-lint/ansible-lint-6.2.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
@@ -11,23 +11,17 @@ inherit distutils-r1
 DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
 HOMEPAGE="https://github.com/ansible/ansible-lint"
 # PyPI tarballs do not contain all the data files needed by the tests
-SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-# Since 6.2.0 ansible-lint once again does not need access to Ansible Galaxy
-# even to get the test suite started, however quite a large fraction of tests
-# fails without network access. Needs more work.
-PROPERTIES="test_network"
-RESTRICT="test"
-
 RDEPEND="
 	>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/ansible-compat-2.0.4[${PYTHON_USEDEP}]
+	>=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.8.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
@@ -47,18 +41,27 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
 )
 
-# Skip problematic tests (TODO: update this list for ansible-lint-6.2.0+):
+# Skip problematic tests:
 #  - test_call_from_outside_venv doesn't play nicely with the sandbox
-#  - all test_eco and some test_prerun tests require Internet access
-#  - as of 5.4.0, test_cli_auto_detect fails even when run manually with tox
+#  - all the others require Internet access, mostly in order to access Ansible Galaxy
 EPYTEST_DESELECT=(
+	test/test_cli_role_paths.py::test_run_playbook_github
 	test/test_eco.py
+	test/test_examples.py::test_custom_kinds
+	test/test_import_playbook.py::test_task_hook_import_playbook
+	test/test_list_rules.py::test_list_rules_includes_opt_in_rules
+	test/test_list_rules.py::test_list_rules_with_format_option
+	test/test_list_rules.py::test_list_tags_includes_opt_in_rules
 	test/test_main.py::test_call_from_outside_venv
 	test/test_prerun.py::test_install_collection
 	test/test_prerun.py::test_prerun_reqs_v1
 	test/test_prerun.py::test_prerun_reqs_v2
 	test/test_prerun.py::test_require_collection_wrong_version
+	test/test_profiles.py::test_profile_listing
+	test/test_rules_collection.py::test_rich_rule_listing
 	test/test_utils.py::test_cli_auto_detect
+	test/test_utils.py::test_template_lookup
+	test/test_verbosity.py::test_default_verbosity
 )
 
 distutils_enable_tests pytest