gentoo resync : 29.12.2022

4 files changed, 8 insertions, 59 deletions

diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 9f0f9ae7e648..e4d5c3f3daa0 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,5 +1,3 @@
-DIST ansible-compat-2.0.2.tar.gz 35072 BLAKE2B 288baaa4bb535da5fc41ea6a700d4eaf969b466848a592f3c919cac55b237cc81b9bfcd800a429b89c82781b29e80dc6486ea9bf0621ae8a3f249139021030e2 SHA512 ae278498f58ac1eb663115215e7ef6bda7279ff02d4a1f09e8301b88681d8c46f13a620b765cbbbacfc3d1fe8b294d5258cddbf7fd2f2cb54f0bde85fc9af593
-DIST ansible-compat-2.0.3.tar.gz 35328 BLAKE2B cd5a476eb23de667381c9a6667d6bd781821fc50e1aec65ca47e8bb9d47beccbea0ee62f763ed421c18c95d9f1d1c14f5cc2a62bcc77d664213eb614ccd568e4 SHA512 0887e5da23041d02be0371bfd9569256252c586f80cd92ab855b32172328989c8160e57169aff6d72f1c3c89c9d3a00b56293e3badc0dc4aad135b1992d06599
-EBUILD ansible-compat-2.0.2.ebuild 1702 BLAKE2B 425593284f3679798c96fabae8b20f2307664b5b216dfde1513c3b5c0a64e24137d62278c90de17e79ed63d1a525d31b60144145abede9e0b93a2f20db39bb9c SHA512 676c9c05e3aa8726712159d66476b1170b96e21b87db102e9ed17f939dab9879b55d192935fb7bd4e814a286395470d0da258a86bbf6df47a0ff5d341ee56572
-EBUILD ansible-compat-2.0.3.ebuild 1752 BLAKE2B 0cd874164f298c45b39041a23c5b1de34398473eebd168cb48af5efcf777b4bf22c7afac88fed59d36d71c0ae3125df4de4f7aa32dd31c4360a10c6ca5540721 SHA512 0c9128bc5a377bf278b07981ee4404393e7164f1a1621d5f75b566f5b08ae8e189f276a21d146d306686727fba090455df37360c36ef4d82c8f18a125830a061
-MISC metadata.xml 409 BLAKE2B 60c2a2a8a80326a6fa9b375b3bdac4f8f609d071f5f06f76a0a80038bf9950c7c2cc377ae883abab3d93104fe2095a8c31c2bc3554b97f5e9e4a2cef8a8cec72 SHA512 900ba03ec907dcbba53f4eb6827485c5948300e04d7b00f9159d328f8bc507a5bc9f893593f0dcc7029b5f6c480a1129ddb541f9ddb40e3b389669bfb0d1f3f1
+DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed94418836b3351cbd376ae35ef22046b68dad0a8ab68fd293015db9954e0a5e1df4b5c529b3845cee5778daed2bb207733ca4f SHA512 a85681aff3d34ef4a4cdad8f419017a174bf315034495bc032a7e33d586cbcf72de74d163b6faf3cd21988704e5dbb922872b83a23981891311dbb18e53797a3
+EBUILD ansible-compat-2.1.0.ebuild 1801 BLAKE2B 429e761c9a8dc220ef53274cba9f0da1a1647ee483e6afb0bf98fe14e25507d907b4515d4fc266ddbd53cc96cb105c172fc800c98c2a1becbc85c43900f64be6 SHA512 8c299014a4005e2a6e199e848e8829b792368c1862311c07b77d8df258ef6b16ec2bca27c2cf3a78f879052aa883267f37f91b2ac725a53787bb84923d1d7e62
+MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
deleted file mode 100644
index c1f62f805b15..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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/ansible-compat/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-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
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.3.ebuild b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
index 5b3828e761ae..7f566730059f 100644
--- a/dev-python/ansible-compat/ansible-compat-2.0.3.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
@@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/ansible-compat/metadata.xml b/dev-python/ansible-compat/metadata.xml
index cc57cf6f5340..867cb86db2b4 100644
--- a/dev-python/ansible-compat/metadata.xml
+++ b/dev-python/ansible-compat/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ansible-compat</remote-id>