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

[Matthew Thode]

commit:     443df1ad893e5d37ccf78a499f4119e6c462a1bb
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 05:40:52 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 05:42:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443df1ad

app-admin/ansible-base: update to 2.10.2

this also adds a dep on app-admin/ansible as it provides the collections
now (seems like upstreams instructions were.... unclear).

closes: https://bugs.gentoo.org/743007
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-admin/ansible-base/Manifest                    |  3 +-
 app-admin/ansible-base/ansible-base-2.10.0.ebuild  | 76 ----------------------
 ...se-2.10.1.ebuild => ansible-base-2.10.2.ebuild} |  6 +-
 3 files changed, 5 insertions(+), 80 deletions(-)

diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index bc5fd97adc4..9fddfe32080 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,2 +1 @@
-DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
-DIST ansible-base-2.10.1.tar.gz 5980851 BLAKE2B 478c9ca6ebf423dea98830ed0447201dfb8db24f963f2fc849e0eab395611c1fb923c5060c397e12138c3e98d7118e367c4713f44ad07ca914e20c3044e74bba SHA512 77bc2f3f6b924299add7e3a57beaf4a0517b036027a785c177874ae6a07a06679de65770a296f81ab0022cb0b495f17e2ceb772f906172fbf46fb65609be1ce2
+DIST ansible-base-2.10.2.tar.gz 6023200 BLAKE2B 80abfa3fab56d3f997cbe90b557ffd5004b216709d6ba2c6d50ea0fb7a2e5a2ad49ce83bfc7a17054582e786f53ce29814d8b5a3fc2408a1e729b1647619080c SHA512 2ee60303841e88d3451ddbcc4c18473d3a37253873406b0783816b1bbf9d8404599ebed12bac7c7f32693314048668b84f3a1c593621c7b8c37a7b48687c769b

diff --git a/app-admin/ansible-base/ansible-base-2.10.0.ebuild b/app-admin/ansible-base/ansible-base-2.10.0.ebuild
deleted file mode 100644
index 3610e3b40b0..00000000000
--- a/app-admin/ansible-base/ansible-base-2.10.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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="doc test"
-RESTRICT="test"
-
-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
-"
-DEPEND="
-	!app-admin/ansible
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${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_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}

diff --git a/app-admin/ansible-base/ansible-base-2.10.1.ebuild b/app-admin/ansible-base/ansible-base-2.10.2.ebuild
similarity index 93%
rename from app-admin/ansible-base/ansible-base-2.10.1.ebuild
rename to app-admin/ansible-base/ansible-base-2.10.2.ebuild
index 2cfa0593cbe..110f4ce8121 100644
--- a/app-admin/ansible-base/ansible-base-2.10.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.2.ebuild
@@ -29,10 +29,12 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	!app-admin/ansible
+	>=app-admin/ansible-2.10
+	!<app-admin/ansible-2.10
 "
+# ansible-2.10 or above is needed for the collections
 DEPEND="
-	!app-admin/ansible
+	!<app-admin/ansible-2.10
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (