gentoo resync : 12.05.2022

3 files changed, 68 insertions, 2 deletions

diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index b2e7de623d24..04e2d9130002 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,8 +1,10 @@
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
 DIST ansible-core-2.12.3.tar.gz 7757271 BLAKE2B 02c8c2c09b778de9775384471f0b485237a8074468d437d41a6879e85769444c91ed4571e17de9aa4024fb2b6c29b4e90b4c31b6714d633ef7028e9711f5ecf3 SHA512 dedac2546881442f5e904c485bdc464d0ced847520879fd10c2454a2055ada4d051416d450f01ae5a1e2f5073f1633cb4db5265855199bb32c0acb41092d6f05
 DIST ansible-core-2.12.4.tar.gz 7756536 BLAKE2B f2820db0c8a3b618b8dc37670709185ed26d21dc96bb3e8ea34a011d8f2c006ca541a74cd4196ea5cf8d420f9f57efc1bc256a76320b860c1b3a8e3f4304163f SHA512 a196a4f75834b5951330a1ea201aca41581c88a3cedbdd1c9e00acd5d3f06b4fd1948ddb2acea32bc2b758587baf9bd75572d150d6d47a3a957f5d8c4fc06d2f
+DIST ansible-core-2.12.5.tar.gz 7757691 BLAKE2B 04be15e932221dfbc8435c703efe3803d4de5f1f94b3205c220f4ea105ffd703df5dff680a4812f1230b77f21ee78b9f6b1020122442aac333aa26304d4d62c0 SHA512 795001257d8b2ffdca00c13a018ebfc822c11f1d8a0eb83df30a1670c19bdc995325da1c87414b672a4fcf8bf57215ff8b7a7b85325ad561d5123c549b18dbe9
 EBUILD ansible-base-2.11.7.ebuild 1648 BLAKE2B cfa73eefc856be5b4a7a71b37fd62b3142f09a9d2a89bb94f20d8c362bce8606e00a0efe2db3824e7e15008f346c1dddb217bacd559a410a031a76e5487b95b1 SHA512 0f71b29df5a4acf4d11eb088c567b0d00d8a1f5880e86053281165cdd36a6630339a90d5a122746e4d057b754cb19754a6d790aadc687bd8602697d91decf6f5
 EBUILD ansible-base-2.12.3.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
-EBUILD ansible-base-2.12.4.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
+EBUILD ansible-base-2.12.4.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
+EBUILD ansible-base-2.12.5.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
 EBUILD ansible-base-9999.ebuild 1652 BLAKE2B 790486ad0a49351a7c12ad6ed3661bf16503423edaa8fb7e128dd8cdb06c1dc4c19aa3e538faf16e51c244e83ab000d33f2892dd97b6f53a8d49d4a0a1a15dc7 SHA512 d4fde99d65fc48702f6def192b0c8bd042fe19659e98a0cca4c3f4567b5f8f86cdd12d81ec62dfd9f828c03ac71bdc6e42adec695fe0175b37f420a47c35abab
 MISC metadata.xml 1040 BLAKE2B c516a3b141924ad21424220f2a9df134d428156283f00f01a6c953ef837bef941fff9f345b48aae23a4af29c938d5053f6147d2e7c43b24af16c1c68b79b9d5b SHA512 6e99c597f3d16d8a5173da3334639e0beed6c95235082b152a3ca256de4a10907c083a646d69152fad23816ac2fb81d0f8d3188fe1713f4030a638cd225e3f61
diff --git a/app-admin/ansible-base/ansible-base-2.12.4.ebuild b/app-admin/ansible-base/ansible-base-2.12.4.ebuild
index 06d9ba54c027..e8c2a3cb1c45 100644
--- a/app-admin/ansible-base/ansible-base-2.12.4.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.12.4.ebuild
@@ -19,7 +19,7 @@ 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 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/app-admin/ansible-base/ansible-base-2.12.5.ebuild b/app-admin/ansible-base/ansible-base-2.12.5.ebuild
new file mode 100644
index 000000000000..06d9ba54c027
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.12.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~riscv ~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-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${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
+}