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

[Matthew Thode]

commit:     33ebf17bdef0bd435075e9f25cad7f6d30744cf4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 19:45:54 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 19:47:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ebf17b

app-admin/ansible-base: disallow co-install with app-admin/ansible

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

 app-admin/ansible-base/ansible-base-2.10.0.ebuild | 2 ++
 app-admin/ansible-base/ansible-base-2.10.1.ebuild | 2 ++
 app-admin/ansible-base/metadata.xml               | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-admin/ansible-base/ansible-base-2.10.0.ebuild 
b/app-admin/ansible-base/ansible-base-2.10.0.ebuild
index 3cc5cd35c7b..3610e3b40b0 100644
--- a/app-admin/ansible-base/ansible-base-2.10.0.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.0.ebuild
@@ -29,8 +29,10 @@ RDEPEND="
        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? (

diff --git a/app-admin/ansible-base/ansible-base-2.10.1.ebuild 
b/app-admin/ansible-base/ansible-base-2.10.1.ebuild
index 4abf588a044..2cfa0593cbe 100644
--- a/app-admin/ansible-base/ansible-base-2.10.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.1.ebuild
@@ -29,8 +29,10 @@ RDEPEND="
        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? (

diff --git a/app-admin/ansible-base/metadata.xml 
b/app-admin/ansible-base/metadata.xml
index eb7c38b1c2e..8e285e3eb63 100644
--- a/app-admin/ansible-base/metadata.xml
+++ b/app-admin/ansible-base/metadata.xml
@@ -18,7 +18,7 @@
     <name>Patrice Clement</name>
   </maintainer>
   <upstream>
-       <remote-id type="pypi">ansible-base</remote-id>
+  <remote-id type="pypi">ansible-base</remote-id>
     <remote-id type="github">ansible/ansible</remote-id>
     <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
   </upstream>