gentoo auto-resync : 02:09:2022 - 10:16:01

3 files changed, 36 insertions, 3 deletions

diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index bb43057777e0..01e4f271393b 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,6 +1,7 @@
 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.1.gh.tar.gz 244320 BLAKE2B aff13d6ce9346dbdba459722cfc071b1e671dc17f3fb44744a706097f29e2a6a9962514fc61e669b58517acf6e95feba88af1bf8c7a4fb668e1a8d1cc5d54746 SHA512 40890a3fc0caaa3fd1d38f32739615dd664db1e7ea534c0bc3138da7295cdc6923715ea12febefc8951be350aad5bf7ac76dd004e3c4aff386b78551bd6442a8
+DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
 EBUILD ansible-lint-6.4.0.ebuild 2627 BLAKE2B 87d358b1580e5bc7586a9860c01df38d5e1f6ef4d3e9d880db97b114a3b66a4896b1b2edaf8fc9116f395d637866b6b21e4da1527cf084a5c481639e469fc0b7 SHA512 270a28e69675fb39c85f1b927ed4a7998de4f4725b9d6ebb5e5a1e570bbeca06d2886c76d6993f74254ea8885166521c07be59043929160b8318b3d38ca42f9f
-EBUILD ansible-lint-6.5.1.ebuild 2713 BLAKE2B 28b661de4fdb151601220453e97db9c49799ad242a08c488171595bd08c4d54f01e530cdaca8272e8db65299fa31c58efdab5de7d2d71c6998f5103718966498 SHA512 cd1feb743058f196975a0f2379a02c4fb662ae7058d8221be7c8478209d6121d8b489cd2c6bc7bdc1b8485befbb328c24346300e7bab4a92563440543b718d1d
+EBUILD ansible-lint-6.5.2.ebuild 2713 BLAKE2B b0cfafaa7112750c0a29cf26d9b3ba49a8893df7b1b37a05d21ad5ee9d736670722009b03756a6a4068d4a3d1b64e3190fe759ff9485b96bff587542132fa4b3 SHA512 2e09635aaf037757012370a8ed935b53598a3d3ea2b42cec547a4623673f061cd823357ec2e4ce2d6111e9a07119836fc43a0d83b043be19ae44617e9fb50cf3
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.5.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
index 117da9fdcf9e..ba4605d1720d 100644
--- a/app-admin/ansible-lint/ansible-lint-6.5.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
+	"${FILESDIR}"/${PN}-6.5.2_test-module-check.patch
 )
 
 # Skip problematic tests:
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch
new file mode 100644
index 000000000000..8e6cb512b633
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch
@@ -0,0 +1,32 @@
+Let the package managers handle dependencies, m'kay?
+
+--- a/conftest.py
++++ b/conftest.py
+@@ -7,27 +7,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)
+-
+-if not HAS_LIBYAML:
+-    # 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.
+-    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"
+