[gentoo-commits] repo/gentoo:master commit in: app-admin/ansible/

["Matthew Thode" <prometheanfire@gentoo.org>]

commit:     d17df5f395c306c6ba7beaf5f63f29c104fbd2da
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 18:26:16 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 18:36:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17df5f3

app-admin/ansible: 2.10.6 stable amd64/arm64/x86

2.10.5 cleanup

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-admin/ansible/Manifest              |  1 -
 app-admin/ansible/ansible-2.10.5.ebuild | 61 ---------------------------------
 app-admin/ansible/ansible-2.10.6.ebuild |  2 +-
 3 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 018826c81f5..ae8da8a127d 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,3 +1,2 @@
-DIST ansible-2.10.5.tar.gz 29123326 BLAKE2B a63ba7d26d2bf49f8367c48962ad77461994601b073986342ce090f7ec16a2c4d23e9176f9463adb558996ad33a5b6e27bf829983e648f2b9b3d9992b7678f01 SHA512 9eca87e0a98e2641112ac3c4fff07d624afa3db9655ba88d3ac5faa76464f7e89f6a64fe0613582c6e5528c2c0408fe1ee237f4c69353bdfcd73b264444fe3dc
 DIST ansible-2.10.6.tar.gz 29620960 BLAKE2B 4a894eb100b7351e5b9c24e163333fde37fd2f5a0ab34e248e59a0196d81393165796b1b76993c883a08fe378ce12dbbeb289c6146a9b135b42afa831d4d83f7 SHA512 d5d2af728f3f6ff281e078fd4791c7278819d79d6c734f8e9d01fa549f0db25241045456d6aa6e8ccbceab4905039e7431c9db3aaaa89acb01ca599186963e24
 DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191

diff --git a/app-admin/ansible/ansible-2.10.5.ebuild b/app-admin/ansible/ansible-2.10.5.ebuild
deleted file mode 100644
index e0f16be830f..00000000000
--- a/app-admin/ansible/ansible-2.10.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-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}]
-	net-misc/sshpass
-	virtual/ssh
-	app-admin/ansible-base
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	app-admin/ansible-base
-	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/ansible-2.10.6.ebuild b/app-admin/ansible/ansible-2.10.6.ebuild
index c736d9e59be..e0f16be830f 100644
--- a/app-admin/ansible/ansible-2.10.6.ebuild
+++ b/app-admin/ansible/ansible-2.10.6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"