gentoo resync : 28.04.2021

4 files changed, 5 insertions, 68 deletions

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index e24305ab21ff..da6f098491e6 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,4 @@
-DIST ansible-2.10.6.tar.gz 29620960 BLAKE2B 4a894eb100b7351e5b9c24e163333fde37fd2f5a0ab34e248e59a0196d81393165796b1b76993c883a08fe378ce12dbbeb289c6146a9b135b42afa831d4d83f7 SHA512 d5d2af728f3f6ff281e078fd4791c7278819d79d6c734f8e9d01fa549f0db25241045456d6aa6e8ccbceab4905039e7431c9db3aaaa89acb01ca599186963e24
 DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
-EBUILD ansible-2.10.6.ebuild 1515 BLAKE2B ebca3cc18aac4ff84244e81b091b53aafbcb1c5d7ed4f856487d2248232ad93473450c40e0afd50c9ae21a5281c337d6aaca69a347b0bc18eff55f5196701866 SHA512 0ec8950255baa217ce84651978bb1411c36e4d505914ca5bbf70e6f853d50a22e4bb03ac88b5a860e9944c0aa8ba95ead2b9a71f9afe2416b4127dccdc0e51cf
-EBUILD ansible-2.10.7.ebuild 1518 BLAKE2B c1892761fdd9ff6827d780f403a1cbac41045644f01ead13f2a78d4e36c66ff02163a9a26de309b08e1a24a92003ca2eaacb21cea648bb66037e0fdf99c4bcfa SHA512 1686c8260bb137857dcc8e76dd51d3f8661264d04d92ed2df1b9f52bf19b824b73620c42ba45b17c90490b504084d222b03214e5b921a7e5f502e55588645791
-EBUILD ansible-9999.ebuild 1520 BLAKE2B 30643b6c8ace829eceb1207b11af38df6f14e9401f7da120138c1076e46a78f173d7c5dd9cb0f4b12792a8bf4b5754bb8165f2d8029bc97af8a875a6f8e42445 SHA512 1b7304063fd4777f05dc21fddce1889bde9ea9998c2f1daca549a8415ee8bc0b4af707f96d0580b6ae9eb348422ee2fbf48d48b7e5e943b9c965ed44697388c5
+EBUILD ansible-2.10.7.ebuild 1509 BLAKE2B 9f50b6ec95df3480a38db3f83dc74bb90101594f0b96f867eb6b4ddcfa0e4dbe7c9ab2d2d00b3d562e4e00e3ee0a78de309f1dca068529bbf05522c7ef904137 SHA512 44ade17e48e8210fed9f559fcdc6460c4a41508b863d35ade6470041956e12e19f73ab05cab971c3c0de8fea04016891711e0238182f7224ffdc99323a68c97f
+EBUILD ansible-9999.ebuild 1513 BLAKE2B 42deec0e0cb5d0370ac103269bf6ac9bbf17ee61c647459de73b8ef880677aae4d85618c8aa705ea1d98a43a5ee9a5a60ca3c778ade1e47a82beb0e7cb0737c2 SHA512 6f91b7c3360739db565bc1daee47b92c9d5da4a52658b19ff2644d68b678bb47859412c532a578800fdc52c55bc5bb2502d8c06c90622b7dad220e0ea1ba27da
 MISC metadata.xml 837 BLAKE2B ace15c05a5ac41dcf4889ed6cbf1b920793af9b67d415b0e51ddb1da179efc1ccf6efb821bc1ea6031283b7896cc5fde309fdff6a7d30b5f4902fec471b901a4 SHA512 dc6e6af5b2c5e14afca5719a4fcb920edff8386c89145895784c8b4ed95942b2313035eb4b7d5c595871b316b21a3119d5f584d9851a643a18f6e6fae3c26506
diff --git a/app-admin/ansible/ansible-2.10.6.ebuild b/app-admin/ansible/ansible-2.10.6.ebuild
deleted file mode 100644
index e0f16be830f7..000000000000
--- a/app-admin/ansible/ansible-2.10.6.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.7.ebuild b/app-admin/ansible/ansible-2.10.7.ebuild
index c736d9e59be5..c5e15d422cab 100644
--- a/app-admin/ansible/ansible-2.10.7.ebuild
+++ b/app-admin/ansible/ansible-2.10.7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
@@ -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"
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index cf61366acb01..c50250cd5308 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"