gentoo auto-resync : 27:11:2022 - 01:15:53

5 files changed, 82 insertions, 2 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6da14c3f6866..710e6a5c43d6 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 143a9a4687be..09a8bf9c5bfe 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -2,6 +2,8 @@ AUX ansible-lint-6.8.1_test-module-check.patch 1576 BLAKE2B 4a5959f8528e7a9679a1
 AUX ansible-lint-6.8.6_test-module-check.patch 1882 BLAKE2B e42bae381ba29c224768295d7bca4e13d1d6baf3cbfc8fa73bd827bff61f29c25855884cf0e9ad0fdb9b345a8b29d6ce718eafb004a9ef1e5c48401b0bfc1032 SHA512 6470e68f91b1e62cc24fedb1486bf059644f9b79c87bc621363c58fe45141ccacfeda316f495971a4f7e2ff7ab721668aabdec7f0a45cca09e9c252c65c26255
 DIST ansible-lint-6.8.2.gh.tar.gz 288616 BLAKE2B 4ae9c344d834a3d69a05689df296c7915e6eb7cb2a85b773f3adcc4efd898c3e1c9f32d8b1efda31afb7a5466d1966aa754cd5529c7dcfd6c1f45517d39e1750 SHA512 101be050772f6df827a697faa5ff9650c98959d9bd6e7a025a19c0ac94faa6b06e114b9122ae8f09f650be565b226189f4706ef8dd0f27548774664adccf3d18
 DIST ansible-lint-6.8.6.gh.tar.gz 293630 BLAKE2B aa43acb9cca21d3cdafebddb18d82781ab708d5696edc51567a8c56cc3eacb3bd96d08f97436eab54e69866f55fa6fc6537eb62e44e4d26eb3ee46ee13e7322d SHA512 0beb16ecff432444a25d3efa70f67eb55437faed593dfbb4bcaf080b06558403e711218f5a021268a2450ceeab1127d8dc8de027d1e4889350f20ca3d9ed9dca
+DIST ansible-lint-6.9.0.gh.tar.gz 297551 BLAKE2B ed616155ba169a61092bac247da2c232541f1a131f8cb275744a33a8076de7d97542dc394d29a17430085b5571f578fe1657f29239a18d8afe38a0f544fdb12f SHA512 e3d708e19af0d5578516bfcc9a755a968a412593e775cdbc4817c057dbc5659f4a54e63d7757036f4783353d022302a24842f934d431ff5225702f752614599f
 EBUILD ansible-lint-6.8.2.ebuild 2916 BLAKE2B e13bcc29f518fb7de8fa2cf6790bc3bd5cbb19a05c1dfbc2c4299dabc58d32e84d83816162b1775f4fd513d75b466817ab4e63594ac07ecace22078951c36402 SHA512 c25506cf73dd7392c4fcfda3459e140d5b4a5e61aa4a2f650723971921e56add3c1e64ca7acd7728afc304232e31010ee5d09e68d32b69bc920a7a9fdcfda223
 EBUILD ansible-lint-6.8.6.ebuild 2931 BLAKE2B 822a3d70efff7b1c372fcf75301f4de59226c19a8b79053503fe917f3a87144df07a583d2bab1b6074b99af5e7ec2ae877fbf200a3f133dbbb6e062b81de43a9 SHA512 c26071c2b7c9105e927d66f1fc5f06b365cfe281e16f65daef259bcc4b0859e656cf9fe56190debdd5416174576d554db8d6981d7a4cce7fe458ce3407f6d0e0
+EBUILD ansible-lint-6.9.0.ebuild 2881 BLAKE2B 42423539627b347970bcdc12d2b4fe8fbd475d42ca6bae75a6d1847b21c62f9c3529edd2b43240b39aa4b712ed40fd4b976e2e1be846e99a73e3c39641adf693 SHA512 7c0885f1caffa7f3d59f9c93ed4cc10d2982cdf36af1b9c1b1ae3687f416b692a6eb48ab5670935fb887d46414fce0125f6f6406c619807b2732dbcd03e891b0
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.9.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.9.0.ebuild
new file mode 100644
index 000000000000..f2381dac1ab3
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-6.9.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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_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
+
+# Test suite fails to start without this. Bug in the eclass, maybe?
+python_test() {
+	epytest test
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index c94e314ac92e..47947c764d9c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -20,5 +20,5 @@ EBUILD rsyslog-8.2102.0-r1.ebuild 12864 BLAKE2B cdbbbe6c4b582c5d899318ebffc5a3eb
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
 EBUILD rsyslog-8.2206.0-r1.ebuild 12965 BLAKE2B f57c348fd034c19ab6f68da85f881c14a1cdbbd06c89f7f0cedcf72e558dafa591acd8b9e6a1739bc0482697148f51fbaf5c10dadb8b75e9d50ca1cf794ca378 SHA512 47784827bfec562177f1673d8104d0820aef01153e5623aa5e4e96d1533ff30143b442b7613cea48799d4ec0da34fde913f47a204ff3c35116d36b2adb434af3
 EBUILD rsyslog-8.2208.0-r1.ebuild 13067 BLAKE2B aecd341b7586a62aef07e3f246e1fccb259d309f6cb705366c8a4f30c9378aec9e4fe847b2b2d445bc39773056ba8775caf4dbd55055727b5fe4b3f8acc14f87 SHA512 2f5b4e086c2dba4dadd9631cb6fbe7c9629990d6de465416c3d1ed0486485a3690a9d874cd65407dd5e41b16bc778f3aa0292d533b063a89ea026bc4d5c87d97
-EBUILD rsyslog-8.2210.0-r1.ebuild 13123 BLAKE2B 7a1df2f8bfbe1c2c5be66c1a444ea83f024f3e39353506eed28eb7c31c6feed750bf435e326cdcf8fd693ff199a376c78ddf1a2b7f2770080669ec383906c52f SHA512 f3c3ba6a8420706e66cca3f8285f48ba49923b728f74211bf12d8c15a5fa7441829adf48615bc1416c5d71d3130fe0867445e8da85a7332b26c2136cb77815c9
+EBUILD rsyslog-8.2210.0-r1.ebuild 13121 BLAKE2B edb194a685ae26b7c9c4df409849dba67e08a0d200bfba8f926b87812b5938a71b1dc12c1d89e3be769711a16cf0205b143c7b9a66082e355ee430897663373f SHA512 9ebfc09cf6100d934b3b3a0548c4dd599c8b19744d14630f3708d154447df4333146b2537b8962bc102ea227e661a9cfc8190c7da6b1c16f0c4b9b203efa92e6
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
index 124a6ec61a3d..87304e80c4a9 100644
--- a/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz