gentoo resync : 20.03.2022

3 files changed, 62 insertions, 8 deletions

diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 48d76220c2c7..063b0d4c1b39 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,5 +1,7 @@
-DIST ansible-compat-0.5.0.tar.gz 32913 BLAKE2B 468dbcf20865225c76896dd8aad6f4b9a749b7a45d661484f89e2eaab4416b29f2e0ea0477b86ea52193165cd23180a79ebd5adac571e0b7d659096e84c27bcb SHA512 3ea219ceda313daf923d11ff45c31a760ddbae7ac782b1f89316eb29960a8028fab4e7e242fa0247c6ef5824d71ff9f22ae8956af73dda261a69713110e3db8e
 DIST ansible-compat-1.0.0.tar.gz 34729 BLAKE2B 56eb32314e310777e454a5f5e020cc4dfc485e6d5720d45e99734ce8cf238377f1ff443f9f78f5b9de947944564a7001294907c0e186fe94cd4561d4d348723e SHA512 dd02b47acf38b378016acbe6f2e6494df1cbf68d88a0cb685a5f594ee24b23af1c4d14878090ba7ea69f76185afb57eeb546cc40a6038171eebc991401c6e241
-EBUILD ansible-compat-0.5.0.ebuild 1833 BLAKE2B 68adb5e57ae000f40f04d0951abd8553d210cb224d192b0943c23c9b7610d9adf635ab6bca04c62fb820edfad20e26398905e814ff979cc84f447c245905aa32 SHA512 cba48e8ae2b0b49d2cb03a67deb7d7ff5ad06422ab4aa1917f20810c2266292d790261697846a4833b3c2abb6764d13c262e0d6b497da874046073cdc04b97fc
+DIST ansible-compat-2.0.0.tar.gz 34702 BLAKE2B a88afd442ffa520037957a537be5a22c8644c1a3d3cc9e23645f74687db068113945869c271b93ad1fdc07ebc58f29d3137e606889a0eb01ad0e68f75237ba1f SHA512 2b2aade5a201e6edbd5000b0e19497eb5ed5eaf9633edd502c19596b3d1018212f5504f1abad5bc225a8128ad5bb118fcea664b3a927490bcb3636e00ec16fd9
+DIST ansible-compat-2.0.2.tar.gz 35072 BLAKE2B 288baaa4bb535da5fc41ea6a700d4eaf969b466848a592f3c919cac55b237cc81b9bfcd800a429b89c82781b29e80dc6486ea9bf0621ae8a3f249139021030e2 SHA512 ae278498f58ac1eb663115215e7ef6bda7279ff02d4a1f09e8301b88681d8c46f13a620b765cbbbacfc3d1fe8b294d5258cddbf7fd2f2cb54f0bde85fc9af593
 EBUILD ansible-compat-1.0.0.ebuild 1734 BLAKE2B 193fd3618adf36a087d3c60515063b45c15e3d67b40d28d371aa6b1615139542b617f9ea3795e8f89b24d93a917b66731ec58c851d577cb5fb52be278df51465 SHA512 2b3d1e1a224bafb5dfd7a75e5ff8817949db7f54ab0a9a82b7cde2185aecbd483c36bc278807c12863faf3da4fb49aee20c527ea312372f56a0740af7a173d86
+EBUILD ansible-compat-2.0.0.ebuild 1721 BLAKE2B 932e80083255ac718beab5b7d4867fdeb2aaed6a9ae6242dde2687cb30653317d432fe0e9cfee19120177df8f6134b4a310b723b6c9d3f39b12a067d5ac6fa6b SHA512 b73cabb9b757c1b4bc4b86996921e8e5386893e6475f463d54a894658c2362acc082c92d3661e9cad7ac99362d8794c61e763787ea94d2faa884edb023758b99
+EBUILD ansible-compat-2.0.2.ebuild 1705 BLAKE2B f212b5455b6f1ec0679d51d7dfdd1c48e791432ee5ffc79288fa71c0e72ab92ccaec54ed5453667b6ae3b5159ac55c7e9b3882c0a2b446725254e8c85772dcdf SHA512 5599c863674f8056d67518d631589c0770641123dbe644b05eeb449d0ec1757d84285f381a918324eafb79f890d1eb95ec347d678e9cc3acd7578892a0b7893c
 MISC metadata.xml 419 BLAKE2B 5862d98909b54bbf69b84b10742ae5c4e8e5919f84a986161f8fb948f472c9f4f8b567fd4fa81d259395187c8b58ce64c2675349b076d9087021c2ef246d03d9 SHA512 9c22801a3c01f6d1be465823f3b78ee43016dd037ce80f99f78ec0d906fef887260b830ff20d523fae085204914cecece77893e3c3a7c5a6247f301395d8e3f0
diff --git a/dev-python/ansible-compat/ansible-compat-0.5.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.0.ebuild
index 7b7537c2f7bc..5a527bb5e082 100644
--- a/dev-python/ansible-compat/ansible-compat-0.5.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.0.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-# TODO: 0.6.0+ support py3.10 upstream but as of 2021-11-18 we are still missing
-# support for it in app-admin/ansible-base, add when ready
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 
 inherit distutils-r1
 
@@ -47,7 +46,6 @@ EPYTEST_DESELECT=(
 	test/test_runtime_example.py::test_runtime
 )
 
-# Requires currently unpackaged Sphinx extension myst_parser
-#distutils_enable_sphinx docs 'dev-python/sphinx_ansible_theme'
+distutils_enable_sphinx docs dev-python/ansible-pygments dev-python/myst_parser dev-python/sphinx_ansible_theme
 
 distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
new file mode 100644
index 000000000000..5002b5d41ebc
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="https://pypi.org/project/ansible-compat/ https://github.com/ansible-community/ansible-compat/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-markdown[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+)
+
+distutils_enable_sphinx docs \
+	dev-python/ansible-pygments \
+	dev-python/myst_parser \
+	dev-python/sphinx_ansible_theme
+
+distutils_enable_tests pytest