gentoo resync : 15.06.2021

4 files changed, 132 insertions, 3 deletions

diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index eb402e7e9cf4..ef501213e66c 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,8 @@
-DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
+DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cbdfb2ef97c2881bca60be5c23e3245262e15304a63431704d8b69fff56594e25517c0e5e1f2641b3eca5ad6a1e76e4d7b3 SHA512 b599b498a20b77cd3346f5b865b5a0436cdd835af250e8cc4ed20d61ac6a4929bf4ceef9a95c6e7b8e825c5f513d33ea32b24661c58e2f1d285db0569d71fc1b
 DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a
-EBUILD ansible-base-2.10.4.ebuild 1671 BLAKE2B 15a11fb545630d1556f315b4d658919c4246c73fccd5bf0c43523ee237b014a5ddd0481367844c123fe2d16d160d12d8f9e77629d35334672e861424ce087f26 SHA512 a620337d5a5cf5deadc308d99dc52cb508cb5746a9be8d23f2f3c14a571e0e8ccfa537ada1503e29e5b63b4b60c2cbb17784dd9bf5a330e4ea1407dc129a1586
+DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381
+EBUILD ansible-base-2.10.10.ebuild 1674 BLAKE2B 00a56fbe3fabbadfec92bc38e7a7af99468f2d55ac66362fb39958a343b3a1f863f722665ca2d48ba97b8e8a4735a405af010ca65ef35232dcd5bc6574acead5 SHA512 188194e7c129d2f8b4c071107cc20557d0f8f6b689eb74099d5e76b12a82ba8d572a612a3feb1fdc4c35cf9a8c9243337abab185107bd8f3c560e36dbf713ffc
 EBUILD ansible-base-2.10.9.ebuild 1671 BLAKE2B 15a11fb545630d1556f315b4d658919c4246c73fccd5bf0c43523ee237b014a5ddd0481367844c123fe2d16d160d12d8f9e77629d35334672e861424ce087f26 SHA512 a620337d5a5cf5deadc308d99dc52cb508cb5746a9be8d23f2f3c14a571e0e8ccfa537ada1503e29e5b63b4b60c2cbb17784dd9bf5a330e4ea1407dc129a1586
+EBUILD ansible-base-2.11.1.ebuild 1591 BLAKE2B 65152605faa707e8c5e3da6e6e044172351a4a9034cc4535073d67d5afd8b8aea86cd9369502b6ee2f786673bc3776f8f2021a7ffc662b00dfbfe2e2cc30a3c7 SHA512 469406aa1aad73e0abdf2e7d56587047d561746581bcc0722d5eb894c9514de818ff0e9c9e43b1bfda3628e294cc84550dda19052cc36e2f943424723497df3b
+EBUILD ansible-base-9999.ebuild 1591 BLAKE2B 65152605faa707e8c5e3da6e6e044172351a4a9034cc4535073d67d5afd8b8aea86cd9369502b6ee2f786673bc3776f8f2021a7ffc662b00dfbfe2e2cc30a3c7 SHA512 469406aa1aad73e0abdf2e7d56587047d561746581bcc0722d5eb894c9514de818ff0e9c9e43b1bfda3628e294cc84550dda19052cc36e2f943424723497df3b
 MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32
diff --git a/app-admin/ansible-base/ansible-base-2.10.4.ebuild b/app-admin/ansible-base/ansible-base-2.10.10.ebuild
index 431b7f154bdd..f7e9e5b567c5 100644
--- a/app-admin/ansible-base/ansible-base-2.10.4.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="test"
 # doc removed due to https://github.com/ansible/ansible/issues/71395
diff --git a/app-admin/ansible-base/ansible-base-2.11.1.ebuild b/app-admin/ansible-base/ansible-base-2.11.1.ebuild
new file mode 100644
index 000000000000..466c8bf7fc59
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.11.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/resolvelib[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/ansible-base/ansible-base-9999.ebuild b/app-admin/ansible-base/ansible-base-9999.ebuild
new file mode 100644
index 000000000000..466c8bf7fc59
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/resolvelib[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}