8 files changed, 4 insertions, 272 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 665d91b8f069..54f35a985aa1 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 91082dcf2d94..44dd1c537eb6 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,11 +1,5 @@
-AUX ansible-lint-6.8.1_test-module-check.patch 1576 BLAKE2B 4a5959f8528e7a9679a1fee76573a0e1bab602900efcd8c785473b9fa048cb0b771e58e3286b2353b800db42f78e05b2ee38b9ddf9b3b1dfb8af670a7770a754 SHA512 c8616dfdaec597ac914cd21598cb2e77af4422bae4ffb3d019715f9d825a13c4d7f2e5ec173b1f8bed025ac69b264cede8dd9362326390998dfc2d54ae287f24
-AUX ansible-lint-6.8.6_test-module-check.patch 1882 BLAKE2B e42bae381ba29c224768295d7bca4e13d1d6baf3cbfc8fa73bd827bff61f29c25855884cf0e9ad0fdb9b345a8b29d6ce718eafb004a9ef1e5c48401b0bfc1032 SHA512 6470e68f91b1e62cc24fedb1486bf059644f9b79c87bc621363c58fe45141ccacfeda316f495971a4f7e2ff7ab721668aabdec7f0a45cca09e9c252c65c26255
 DIST ansible-lint-6.12.1.tar.gz 466371 BLAKE2B f43b3403c5d3db80d3ec3e3526cafc22bee68b31b5458e378a73bbec900de5411c597e9fc079a77cffc66a278a37bf0fc9ecfcaba3beccf74c6eecbe5b6148b9 SHA512 05c92c930d91419c212a9513aed5506c99e993acbce9437b6f8f3b95bd78ca5b0ff8e1a7d39f32907df72d858a2e4e6c74f47443c0f937b3644c7a18d1d59252
-DIST ansible-lint-6.13.1.tar.gz 488778 BLAKE2B d58002e10105759c6a19e8f67cccf6914cfb058573f7873bb6092bc3367c5af9583de30478c65e0d3b9b4840ac8103d688e6dc63e49543199b82447eba12eca0 SHA512 c71b45f3a73dd782480ae9c4c38fef5741297706d60d07c524f5abfb3249c87950bf8ffccd782a85ee6a83c357b1a0fbf101c659c640d98365d508dfb0a513a3
-DIST ansible-lint-6.8.2.gh.tar.gz 288616 BLAKE2B 4ae9c344d834a3d69a05689df296c7915e6eb7cb2a85b773f3adcc4efd898c3e1c9f32d8b1efda31afb7a5466d1966aa754cd5529c7dcfd6c1f45517d39e1750 SHA512 101be050772f6df827a697faa5ff9650c98959d9bd6e7a025a19c0ac94faa6b06e114b9122ae8f09f650be565b226189f4706ef8dd0f27548774664adccf3d18
-DIST ansible-lint-6.9.1.gh.tar.gz 388343 BLAKE2B 73035bdbd6c1bdee5566d5dee5a8461953d99bbaf896d7a9764c32419e74c3d23883ac1a7548de3e21372195f99c325c371cead7397bf64d6d033d9a2f81ed01 SHA512 eaf255c53fb8355b06e7013f6676a09e2d7e67aa332306448f530c345925c80ff5ea54c580f7f6720a25ebed9e8deb4c0a8e4e22af4183e8a8ef7b6999be6099
-EBUILD ansible-lint-6.12.1.ebuild 1630 BLAKE2B fc5bd20153e7117acc7d66dd37177bc3b959d4bebddc61c64b129247ea726403eae676aa064e8c5c9553a76a4feaccf99efd26adc4c5ba1db68f1b7b02588f80 SHA512 c1316c20c5d9c93dec35a81797d47bf7745491e745be4662ed4fc8c646756d32b88b9d86a8b6a3ab26bc3c8a0c4d8eea412a83f3494f161a73423c3e292127de
-EBUILD ansible-lint-6.13.1.ebuild 1630 BLAKE2B fc5bd20153e7117acc7d66dd37177bc3b959d4bebddc61c64b129247ea726403eae676aa064e8c5c9553a76a4feaccf99efd26adc4c5ba1db68f1b7b02588f80 SHA512 c1316c20c5d9c93dec35a81797d47bf7745491e745be4662ed4fc8c646756d32b88b9d86a8b6a3ab26bc3c8a0c4d8eea412a83f3494f161a73423c3e292127de
-EBUILD ansible-lint-6.8.2.ebuild 2911 BLAKE2B 5887284aa1458b35dc7a5c6ade49febe2c5923758347c3b5cb4c375f8661ba5f87dc088cce4a8b2fb7520f184632823d59eddee92392fa5bfb8870b885419887 SHA512 a40f308441fd5d039b47efbcb14e13d5f9796f5a081dee98a3da0fc65090b8255a5bc967ff7940acabc9d1e6aa698fc041c4267899847fff4747ee0a5a251019
-EBUILD ansible-lint-6.9.1.ebuild 2960 BLAKE2B 8dd9e27d90b9f738ab91e22d675478f15c55d796d4ca9e22c99f64227c6a20ebd228bb2005e78ff578f65aea50445ba19bd234bc81284c257adfd7c74e4d229d SHA512 3538e1821001f70026a271e37ca115345593e3ae13fc86b9d69bce0a7560452b5472fcba870f9595a2f7f523721b0c116aeefa0224ef1f36e52ff93cb34e12a7
+DIST ansible-lint-6.14.0.tar.gz 472203 BLAKE2B 041c7dbf0bc133423dc7f2a09c4f56b5b77e0bd46f86493a6e78748742ef930c9cb6d7525dcc72309b24b5f11e5ec135f967d56f079034f68ecba4da1a2dab03 SHA512 fd8546d4ba514c7979f6a194c992fee732046c0d0d3969a846689cc945a3f1cbe1798f3876883a664d7b9c2d0225ea27f3fd9fe30e2fdfc408afc4a028b91fdb
+EBUILD ansible-lint-6.12.1.ebuild 1629 BLAKE2B 4c50e08619c06228173e959f79e2b9ea7da7908a366326d7bbdf7935f64baff7c8a6ec1280e03f3c3ce9c7954952380cec6ba1ce9f8adbfa831c4a801ac1605e SHA512 f59fb0cad5f796537f39597c8187ffae282cd9e8229b2152e8cfcaeefed57a5c7cce7290b16b68d325848e50a2377ac5b5f27ba55ece35a6d8af8a99b26a96bc
+EBUILD ansible-lint-6.14.0.ebuild 1630 BLAKE2B fc5bd20153e7117acc7d66dd37177bc3b959d4bebddc61c64b129247ea726403eae676aa064e8c5c9553a76a4feaccf99efd26adc4c5ba1db68f1b7b02588f80 SHA512 c1316c20c5d9c93dec35a81797d47bf7745491e745be4662ed4fc8c646756d32b88b9d86a8b6a3ab26bc3c8a0c4d8eea412a83f3494f161a73423c3e292127de
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild
index ee2222e75df9..70acfb5c1344 100644
--- a/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 # Upstream has stated explicitly that all tests require Internet access
 PROPERTIES="test_network"
diff --git a/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.14.0.ebuild
index ee2222e75df9..ee2222e75df9 100644
--- a/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.14.0.ebuild
diff --git a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
deleted file mode 100644
index 622d56553866..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_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/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}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}]
-	dev-python/black[${PYTHON_USEDEP}]
-	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.9.0[${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/wcmatch-7.0[${PYTHON_USEDEP}]
-	>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.5.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-plus-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.8.1_test-module-check.patch
-)
-
-# Skip problematic tests:
-#  - test_rules_id_format has been giving an internal error since 6.5.4 or so (TODO: follow this up with upstream)
-#  - test_call_from_outside_venv doesn't play nicely with the sandbox
-#  - 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_rules_collection.py::test_rules_id_format
-	test/test_skip_inside_yaml.py::test_role_meta
-	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
-
-python_test() {
-	# Since 6.2.1, without this the test suite still gets confused by the presence of ansible-lint modules
-	# in both ${ED} and ${S}.
-	cd "${S}" || die
-
-	epytest test
-}
diff --git a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
deleted file mode 100644
index 5e650d086a23..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible/ansible-lint"
-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"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/ansible-compat-2.2.5[${PYTHON_USEDEP}]
-	>=dev-python/black-22.8.0[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.17.21[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
-	>=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.5.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-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.8.6_test-module-check.patch
-)
-
-# Skip problematic tests:
-#  - test_rules_id_format has been giving an internal error since 6.5.4 or so (TODO: follow this up with upstream)
-#  - test_call_from_outside_venv doesn't play nicely with the sandbox
-#  - all the others require Internet access, mostly in order to access Ansible Galaxy
-EPYTEST_DESELECT=(
-	test/test_ansiblesyntax.py::test_null_tasks
-	test/test_cli_role_paths.py::test_run_playbook_github
-	test/test_eco.py
-	test/test_examples.py::test_custom_kinds
-	test/test_examples.py::test_example
-	test/test_file_path_evaluation.py
-	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_rules_collection.py::test_rules_id_format
-	test/test_schemas.py::test_refresh_schemas
-	test/test_skip_inside_yaml.py::test_role_meta
-	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
-
-# Test suite fails to start without this. Bug in the eclass, maybe?
-python_test() {
-	epytest test
-}
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch
deleted file mode 100644
index 8c2ca1a96503..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/conftest.py
-+++ b/conftest.py
-@@ -8,40 +8,6 @@
- import pytest
- from ansible.module_utils.common.yaml import HAS_LIBYAML
- 
--# checking if user is running pytest without installing test dependencies:
--missing = []
--for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
--    if not importlib.util.find_spec(module):
--        missing.append(module)
--if missing:
--    print(
--        f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
--        file=sys.stderr,
--    )
--    sys.exit(1)
--# we need to be sure that we have the requirements installed as some tests
--# might depend on these.
--try:
--    subprocess.check_output(
--        ["ansible-galaxy", "collection", "install", "-r", "requirements.yml"],
--        stderr=subprocess.PIPE,
--        text=True,
--    )
--except subprocess.CalledProcessError as exc:
--    print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr)
--    sys.exit(1)
--
--if not HAS_LIBYAML and sys.version_info >= (3, 9, 0):
--    # While presence of libyaml is not required for runtime, we keep this error
--    # fatal here in order to be sure that we spot libyaml errors during testing.
--    #
--    # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38.
--    print(
--        "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
--        file=sys.stderr,
--    )
--    sys.exit(1)
--
- 
- os.environ["NO_COLOR"] = "1"
- 
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch
deleted file mode 100644
index 5302a54cc32e..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/conftest.py
-+++ b/conftest.py
-@@ -7,56 +7,6 @@
- 
- import pytest
- 
--# checking if user is running pytest without installing test dependencies:
--missing = []
--for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
--    if not importlib.util.find_spec(module):
--        missing.append(module)
--if missing:
--    print(
--        f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
--        file=sys.stderr,
--    )
--    sys.exit(1)
--# we need to be sure that we have the requirements installed as some tests
--# might depend on these.
--try:
--    from ansible_compat.prerun import get_cache_dir
--
--    cache_dir = get_cache_dir(".")
--    subprocess.check_output(
--        [
--            "ansible-galaxy",
--            "collection",
--            "install",
--            "-p",
--            f"{cache_dir}/collections",
--            "-r",
--            "requirements.yml",
--        ],
--        stderr=subprocess.PIPE,
--        text=True,
--    )
--except subprocess.CalledProcessError as exc:
--    print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr)
--    sys.exit(1)
--
--# flake8: noqa: E402
--from ansible.module_utils.common.yaml import (  # pylint: disable=wrong-import-position
--    HAS_LIBYAML,
--)
--
--if not HAS_LIBYAML and sys.version_info >= (3, 9, 0):
--    # While presence of libyaml is not required for runtime, we keep this error
--    # fatal here in order to be sure that we spot libyaml errors during testing.
--    #
--    # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38.
--    print(
--        "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
--        file=sys.stderr,
--    )
--    sys.exit(1)
--
- 
- os.environ["NO_COLOR"] = "1"
-