gentoo resync : 05.12.2021

4 files changed, 26 insertions, 49 deletions

diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index c9acb56f1280..61280dc6a42f 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,7 +1,5 @@
-DIST ansible-lint-5.0.12.tar.gz 348478 BLAKE2B 3ea2a0adb82bd21322fa9a2d4c8dd4f41345f909401341748e8395aa8acf92bfc8058ee679a594c886327480bb808e69622e874c9def97c406265a0828a314eb SHA512 06b84d098253ab70f9c3fb59e1d2ba4d30918f1e7c6f3decc8f73fe8cdb7d697527eff3efcc7238fc952bc07b7179d37582d5fb9968e691e2df5495741802404
-DIST ansible-lint-5.2.0.tar.gz 356238 BLAKE2B 7c8bdb1486d7fca5f6addbb87075d98b51e9af4e5544f5bd272ee2a4648d289e48e3922246f7c681fa3450cb881b1da8e098d715bd49e3d75783c812e9863a7b SHA512 d3c1da5f0ee648ac7b5f32d4ae186a24cda11fba4fccd4d5d43dbd228986793f975b43895db07855a80528fe684f6adfc4be451aeed7109d65dfae6c351b6c47
 DIST ansible-lint-5.2.1.tar.gz 356071 BLAKE2B 70c54114a667ba63c1d285ec8a73a7c3332f89cbdf1b8d4866de86aa2c358e41759ac69188806c715cbd3893a2d0b1123e6b679ed208ce4c40141a40b9f54681 SHA512 9ae1aa775572485aaa68ef127cb2ea2d66cd1057878ac396b1644244a070f05b7920eceec3cdb16523f9fadcbcb5df971f3513d7e4d9cbd6ace1ec4f4d861451
-EBUILD ansible-lint-5.0.12.ebuild 1009 BLAKE2B 615ba49b7a88fdefb4cc1159491df0464e54c02674afcf22510cafaf9cc563a14dcb305f6175bd40285fdc12fdc4b8a4e33cbb15834ab3825903c98917f51802 SHA512 e0504f2773d5b84241a208cde4a25af27bd454f9141374add81d6b2018a78403ff2093bad6390d367ec4a4ea8174aa2f6eb3571da99e1cd4c9691310650dd760
-EBUILD ansible-lint-5.2.0.ebuild 1159 BLAKE2B 27ade2e87ff0af7b5e85493b517711036c28358a666fc143a499f31a835fe3fb163c78b6296a9ecb5d7f69b08c699458fdd97c1a9d27552df1c5be6a09bdef6b SHA512 18fc6d53ad2c8461cd1c18c927821fd3f0942946f53315d007ff6e9e566a98929578107541c130a24e2f2de6bb01e6ea821ac3ce7b39ae9b543df8a42696ace2
-EBUILD ansible-lint-5.2.1.ebuild 1159 BLAKE2B 27ade2e87ff0af7b5e85493b517711036c28358a666fc143a499f31a835fe3fb163c78b6296a9ecb5d7f69b08c699458fdd97c1a9d27552df1c5be6a09bdef6b SHA512 18fc6d53ad2c8461cd1c18c927821fd3f0942946f53315d007ff6e9e566a98929578107541c130a24e2f2de6bb01e6ea821ac3ce7b39ae9b543df8a42696ace2
+DIST ansible-lint-5.3.0.tar.gz 355745 BLAKE2B 3f161a91a5cf8f0efedd7a928f55c2680f20e0e35b4d1be466435a65a38e6af0ecff8fe86702a6a71e544925e58a2bb3df758c93c4af8841661c0bb240a7a21d SHA512 862c40472dc00b9685fda62740fbe5b2dfa48adec10322c185eeb436f7dce800a95c478f9eb926f328a501df45a885946bc38190bb28c33ced8edfa17384c0fb
+EBUILD ansible-lint-5.2.1.ebuild 1516 BLAKE2B 2506a58802c30dff8193c489b893954e99c4d2328a886e7fe7933dbec463ddaa43982acaff09a1e022da975804af4f73b7f8235dced49a1e63940cf5b439476b SHA512 b6029f18d328dfe5caf4e68a2b2c3d869181643f5cfe15b3a478098d618b48393b92c3ee73bf8b02a54185483963f92fd3f6b60f3008c1275d87316352d87217
+EBUILD ansible-lint-5.3.0.ebuild 1556 BLAKE2B a6e8a4ea6e984535de2e47490e409001cc4fe020a286fd86e555aca7fdf9f955b6146a2d69c4c3af9446105036f714b0bda7dc85f2f6c6c1052f743112fa0790 SHA512 2578255ba9909d6befdd254eba015798ad516c31d99017f06c0402333358d77e6d293d466a654106bd03f3fe16cec1dc8cf1db2cdd9392902f4eb37ea400f1e6
 MISC metadata.xml 581 BLAKE2B b2032b06ec9ebe63385918be612a0ee1c351943bfc05a544670a78d87bb2836eb2143bd80da6542c140ab16d33f4b79fa0f18cce3291833b34e43ffb6fd3e737 SHA512 912848e5c37863ed0b04062210da0e925a2d71f1766dd43bb746e7aa364a86ff501e4a6e9762c584ca6d37d4f38b7418a32f3a02b30a7ee4b3f7b828f84f6646
diff --git a/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild b/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild
deleted file mode 100644
index bb3d2887ad1e..000000000000
--- a/app-admin/ansible-lint/ansible-lint-5.0.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-# tests are broken at the moment
-RESTRICT="test"
-
-RDEPEND="
-	app-admin/ansible[${PYTHON_USEDEP}]
-	dev-python/enrich[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tenacity[${PYTHON_USEDEP}]
-	dev-python/wcmatch[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests nose
diff --git a/app-admin/ansible-lint/ansible-lint-5.2.1.ebuild b/app-admin/ansible-lint/ansible-lint-5.2.1.ebuild
index 23d0affbc127..6deaf6a286bf 100644
--- a/app-admin/ansible-lint/ansible-lint-5.2.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-5.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..9} )
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
 HOMEPAGE="https://github.com/ansible-community/ansible-lint"
@@ -15,7 +15,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-# Many tests require still-unpackaged yamlllint
+# 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="
@@ -34,6 +36,12 @@ BDEPEND="
 	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 pytest
+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.0.ebuild b/app-admin/ansible-lint/ansible-lint-5.3.0.ebuild
index 23d0affbc127..a5036ce2dc07 100644
--- a/app-admin/ansible-lint/ansible-lint-5.2.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-5.3.0.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
 HOMEPAGE="https://github.com/ansible-community/ansible-lint"
@@ -15,7 +16,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-# Many tests require still-unpackaged yamlllint
+# 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="
@@ -34,6 +37,12 @@ BDEPEND="
 	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 pytest
+distutils_enable_tests --install pytest
+
+pkg_postinst() {
+	optfeature_header "Consider installing the following optional packages:"
+	optfeature "letting ${PN} run YAML checks" dev-util/yamllint
+}