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

[Marek Szuba]

commit:     36062e12c363790c60432af67b3a017e54e4bfff
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 12:12:15 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 12:33:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36062e12

app-admin/ansible: move the live ebuild to ansible-base

This is what the upstream GitHub repo has been since the introduction
of collections (which have their own, separate repos in the organisation
"ansible-collections").

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../ansible-base-9999.ebuild}                                | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-admin/ansible/ansible-9999.ebuild 
b/app-admin/ansible-base/ansible-base-9999.ebuild
similarity index 84%
rename from app-admin/ansible/ansible-9999.ebuild
rename to app-admin/ansible-base/ansible-base-9999.ebuild
index c50250cd530..466c8bf7fc5 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible-base/ansible-base-9999.ebuild
@@ -3,21 +3,24 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
 DESCRIPTION="Model-driven deployment, config management, and command execution 
framework"
-HOMEPAGE="https://ansible.com/";
+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
-       SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+       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 ~x86 ~x64-macos"
+       S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="GPL-3"
@@ -34,12 +37,11 @@ RDEPEND="
        dev-python/six[${PYTHON_USEDEP}]
        dev-python/netaddr[${PYTHON_USEDEP}]
        dev-python/pexpect[${PYTHON_USEDEP}]
+       dev-python/resolvelib[${PYTHON_USEDEP}]
        net-misc/sshpass
        virtual/ssh
-       !app-admin/ansible-base
 "
 DEPEND="
-       !app-admin/ansible-base
        >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
        test? (
                ${RDEPEND}