gentoo resync : 08.01.2021

4 files changed, 3 insertions, 133 deletions

diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index dbcad9d41370..2132becde76f 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,7 +1,3 @@
-DIST ansible-base-2.10.2.tar.gz 6023200 BLAKE2B 80abfa3fab56d3f997cbe90b557ffd5004b216709d6ba2c6d50ea0fb7a2e5a2ad49ce83bfc7a17054582e786f53ce29814d8b5a3fc2408a1e729b1647619080c SHA512 2ee60303841e88d3451ddbcc4c18473d3a37253873406b0783816b1bbf9d8404599ebed12bac7c7f32693314048668b84f3a1c593621c7b8c37a7b48687c769b
-DIST ansible-base-2.10.3.tar.gz 5836841 BLAKE2B 000ee1e369beb450a9a58680030fc7605f62020a28f0ec4634569be0b12ca54c79d0c36a6022895f93b6f8449b8f8483e07590eeea233383490600bbce600aff SHA512 4da2c79c7d990bbe07e136447643484d947e512693194017623deadd88d6556dac67865069182059ae2daf82a13876600dc5472712d6ab6e0556cb829fce3b5b
 DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
-EBUILD ansible-base-2.10.2.ebuild 1678 BLAKE2B e2ea250401ab8e5a12ae93e07788844ed90dcbc430137b3298c215d2efb56e1e6156d87d7fbe1c99826d0fd4d4cb087e6c1d11a1509e27fc11c582542d76e76c SHA512 e8da7dd4f6bf332a1138b4ce2f0eab40be05d4a5d5e932692877158c6e579eb4ea8e9daaac147f6dfc27c8ecf3f68604cf0429996b88f8b005294cec29b8c272
-EBUILD ansible-base-2.10.3.ebuild 1679 BLAKE2B 7a0df030842dd19e042b56cb771802b0eff897739456dcbda6fc85749b4806d9277f59fa8815618a6147c11006b574d9466386f8160d466124531ee2303dd6cb SHA512 178689c5fa8db63ea02da55fd552ede89e8b2cadad9ee0d72f9d3bf92cebb383a48f7a38ff1085c140d0c977740df5630b786f6a94c7a4b4737cddba449f23fd
-EBUILD ansible-base-2.10.4.ebuild 1681 BLAKE2B 8951247229c2713c1399a2236bf7ed8fcfcaa1c91b6365f5f7928be3da9e5419e855c7ab55ac5778ffcab0584d767b27f21696cf6c9e85c4fc156efe0bc14a6f SHA512 df4909f9d68a5fc78220eaba10f473bd65c839ac65e453f4e890fc52a16179feb9f988552c64d1fab8e9756a359c3483aaafd1f90117b184f8103b4e4fd3138f
+EBUILD ansible-base-2.10.4.ebuild 1678 BLAKE2B 97b1821b3d5adadfccf88e01ebfac3edef631af01156a714d4f8b3b6bb178c98998415ab2742df8bd6152ae9c1871e88ff1362ca0a348023bbffa84455430e73 SHA512 68af5a51524cc631020a9016cfe42036e27149a9e5bdbd826f6dd7350d725b720bb47e19b9351e51c1b8e94038996a6eb96dcba8c69760772bc78cc9210fccd6
 MISC metadata.xml 1266 BLAKE2B 449ac5109e0fb6b64d32185f0660ce6e8c3828a830f8516d680f47ebc25aef880ab5116103d67cfba02e04b1ad496917fbf67252b7bfc062d828e22f15b961fd SHA512 95d52b68b5b3efad6d8575741430b2d1c18a7c7b41a1374229763fea7c599f3ff2b46dee51845e20388829faa4246e5a05011e61254e91d10709457a4b822f0f
diff --git a/app-admin/ansible-base/ansible-base-2.10.2.ebuild b/app-admin/ansible-base/ansible-base-2.10.2.ebuild
deleted file mode 100644
index b24b734cb988..000000000000
--- a/app-admin/ansible-base/ansible-base-2.10.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="test"
-RESTRICT="test"
-# doc removed due to https://github.com/ansible/ansible/issues/71395
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${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}]
-	net-misc/sshpass
-	virtual/ssh
-	!<app-admin/ansible-2.10
-"
-# ansible-2.10 or above is needed for the collections
-DEPEND="
-	!<app-admin/ansible-2.10
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=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() {
-	# disable version checks on upgrade
-	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
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r examples
-}
diff --git a/app-admin/ansible-base/ansible-base-2.10.3.ebuild b/app-admin/ansible-base/ansible-base-2.10.3.ebuild
deleted file mode 100644
index 5dbedc04ecfe..000000000000
--- a/app-admin/ansible-base/ansible-base-2.10.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-IUSE="test"
-RESTRICT="test"
-# doc removed due to https://github.com/ansible/ansible/issues/71395
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${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}]
-	net-misc/sshpass
-	virtual/ssh
-	!<app-admin/ansible-2.10
-"
-# ansible-2.10 or above is needed for the collections
-DEPEND="
-	!<app-admin/ansible-2.10
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=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() {
-	# disable version checks on upgrade
-	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
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r examples
-}
diff --git a/app-admin/ansible-base/ansible-base-2.10.4.ebuild b/app-admin/ansible-base/ansible-base-2.10.4.ebuild
index f376ff42569a..10ce97471c50 100644
--- a/app-admin/ansible-base/ansible-base-2.10.4.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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