5 files changed, 3 insertions, 104 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2a1f3bf23a87..ec9ca0b75dcc 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 8c9ed0e56806..add085b6754c 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,9 +1,6 @@
-AUX ansible-lint-6.0.2_test-module-check.patch 689 BLAKE2B 69152c8799165f8efcf44640ad44133147e95945aeb4aee7a5a45aa0e74432fce599040f017ae92fb7264855f74c0bcd71a44e26abf0abebfcce2cbcaea39ada SHA512 01be971c7d33086aa799910ac744cfceb07b4d5041716043c49667075ab8c8579b57f0c14a8094248f96462c93fff3ac110776aa0aa1ea3adf11dc622028ca7e
 AUX ansible-lint-6.5.2_test-module-check.patch 1090 BLAKE2B 1fa06ac57a978c75744224f20e5dad1917a96c7716273daff72b025bd8696cb8ed960c1c7ef464278da0f8b2e99146d99e0194fdba3fdde8fff62b6bd86ff2f3 SHA512 8f6cc1a3b9522a1584fd7ae5b1f2d7b1d1295f4cd0fa286d3d917bdada355f06b5eb46cf3f7fb5f6e7410c489e1de56ac4b2f10553734a2e592bcc2594b60336
-DIST ansible-lint-6.4.0.gh.tar.gz 235346 BLAKE2B a2f55e6f4df739dccb011225f0a660978a9dfdbcc6e45cee2eef12467482c471d8700bb1bfad87e03eb1c4f21291307db5dc174e2440370ca11368f6ad6d195d SHA512 75e30a325a5c62f64066925b99e691886e299e029adc78fdceaa5eb23a74a46408793479e7c54c312d93e0a62d190b34f1e7614dec31a94822d39a231796e9df
 DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
-DIST ansible-lint-6.6.0.gh.tar.gz 270913 BLAKE2B c192da771939055be89d66783d0b09e114de20919af6ab5ce044ba58b8398f598c63180498f1f4737a3535f687a41f007fb41c9b83151308ec1491fe19d48c87 SHA512 af5e1cf88717bc1e6ee0b9479a380bb06de0b29ef26200acefa0eba6bf1ef9ffa3117e0d4a43db94a8b6ba94b01cbb5790b1286a98576699cca100afb2316313
-EBUILD ansible-lint-6.4.0.ebuild 2627 BLAKE2B 950efcc8376d6619ed27c8c95e07f805039356e625bf0eb4a3eb3ec7c620ffac19bfc383bd1441f84c5b7df042603a2ce104f633484f4abc7a3c12064c10327a SHA512 0cfbe711a7eb278d9db6b38295e07768fbf90e8fc23206c5f1aaf4ccbef33fa06fb233227ff1f82386746837682a9b6c07112d60e6551cdaf4f08326267c4341
+DIST ansible-lint-6.6.1.gh.tar.gz 272235 BLAKE2B 50d014a919b7e915aff541b7be401f287ac990ec3dc435af2356143434fb27619e2e9ebad4a6b0ed57d9b0c1972137c34d08b603eda7f8dba49359d209da2e0a SHA512 bd6c2b695ba65e808f7773deef11bd51693b0343dc356788a87761810295fad32114bfb6f8df8eef69a13702b136f1c1d02b1a9f41c43c6e64174842ec67124f
 EBUILD ansible-lint-6.5.2.ebuild 2749 BLAKE2B eb63cfb774f451e410ad1c5ae5fa3be86f5d63a59fc7524262816150bfadd7378aa901a65d91b63cfc1f20f87acc9c1b537cb8bcbf4c7568541a4034d400c192 SHA512 2d33e1edb4d6c7bf69724689fb3787edcfe4d117a420dda3bdb187e91df3f0d32e522854b59f4ce3a5ef632b7d711ae0e13d8f1557d54c400455728536954364
-EBUILD ansible-lint-6.6.0.ebuild 2749 BLAKE2B eb63cfb774f451e410ad1c5ae5fa3be86f5d63a59fc7524262816150bfadd7378aa901a65d91b63cfc1f20f87acc9c1b537cb8bcbf4c7568541a4034d400c192 SHA512 2d33e1edb4d6c7bf69724689fb3787edcfe4d117a420dda3bdb187e91df3f0d32e522854b59f4ce3a5ef632b7d711ae0e13d8f1557d54c400455728536954364
+EBUILD ansible-lint-6.6.1.ebuild 2749 BLAKE2B 1376aa9a508034f257287c6395eb956290293ca3e0959ee36c3be6ff02568e90136dc6ffedcd2e645e3cbec7c9d343f05cfe3ef74edcbc84cd352287473c5882 SHA512 ad8d34d1afa854ec2cef5f00665babefbc8a3d92a2dbbb022f9b1575c2fb35112731e840ef6827d047b414d83cd091c4f20171510669f50655735333d8ab2dc9
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
deleted file mode 100644
index bc3e252daa8c..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
+++ /dev/null
@@ -1,75 +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/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.1.0[${PYTHON_USEDEP}]
-	>=dev-python/enrich-1.2.6[${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}]
-	>=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.0.2_test-module-check.patch
-)
-
-# Skip problematic tests:
-#  - 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_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() {
-	# As of 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.6.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.6.1.ebuild
index 71e510a4133d..a483735e3a30 100644
--- a/app-admin/ansible-lint/ansible-lint-6.6.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.6.1.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.2_test-module-check.patch
+	"${FILESDIR}"/${PN}-6.6.1_test-module-check.patch
 )
 
 # Skip problematic tests:
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch
deleted file mode 100644
index 4288bb897c1e..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Let the package managers handle dependencies, m'kay?
-
---- a/conftest.py
-+++ b/conftest.py
-@@ -3,18 +3,6 @@
- import os
- import sys
- 
--# checking if user is running pytest without installing test dependencies:
--missing = []
--for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint", "pytest_cov"]:
--    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)
--
- 
- os.environ["NO_COLOR"] = "1"
- pytest_plugins = ["ansiblelint.testing.fixtures"]