1 |
commit: 33ebf17bdef0bd435075e9f25cad7f6d30744cf4 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 16 19:45:54 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 16 19:47:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ebf17b |
7 |
|
8 |
app-admin/ansible-base: disallow co-install with app-admin/ansible |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/ansible-base/ansible-base-2.10.0.ebuild | 2 ++ |
14 |
app-admin/ansible-base/ansible-base-2.10.1.ebuild | 2 ++ |
15 |
app-admin/ansible-base/metadata.xml | 2 +- |
16 |
3 files changed, 5 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/app-admin/ansible-base/ansible-base-2.10.0.ebuild b/app-admin/ansible-base/ansible-base-2.10.0.ebuild |
19 |
index 3cc5cd35c7b..3610e3b40b0 100644 |
20 |
--- a/app-admin/ansible-base/ansible-base-2.10.0.ebuild |
21 |
+++ b/app-admin/ansible-base/ansible-base-2.10.0.ebuild |
22 |
@@ -29,8 +29,10 @@ RDEPEND=" |
23 |
dev-python/pexpect[${PYTHON_USEDEP}] |
24 |
net-misc/sshpass |
25 |
virtual/ssh |
26 |
+ !app-admin/ansible |
27 |
" |
28 |
DEPEND=" |
29 |
+ !app-admin/ansible |
30 |
dev-python/setuptools[${PYTHON_USEDEP}] |
31 |
>=dev-python/packaging-16.6[${PYTHON_USEDEP}] |
32 |
doc? ( |
33 |
|
34 |
diff --git a/app-admin/ansible-base/ansible-base-2.10.1.ebuild b/app-admin/ansible-base/ansible-base-2.10.1.ebuild |
35 |
index 4abf588a044..2cfa0593cbe 100644 |
36 |
--- a/app-admin/ansible-base/ansible-base-2.10.1.ebuild |
37 |
+++ b/app-admin/ansible-base/ansible-base-2.10.1.ebuild |
38 |
@@ -29,8 +29,10 @@ RDEPEND=" |
39 |
dev-python/pexpect[${PYTHON_USEDEP}] |
40 |
net-misc/sshpass |
41 |
virtual/ssh |
42 |
+ !app-admin/ansible |
43 |
" |
44 |
DEPEND=" |
45 |
+ !app-admin/ansible |
46 |
dev-python/setuptools[${PYTHON_USEDEP}] |
47 |
>=dev-python/packaging-16.6[${PYTHON_USEDEP}] |
48 |
doc? ( |
49 |
|
50 |
diff --git a/app-admin/ansible-base/metadata.xml b/app-admin/ansible-base/metadata.xml |
51 |
index eb7c38b1c2e..8e285e3eb63 100644 |
52 |
--- a/app-admin/ansible-base/metadata.xml |
53 |
+++ b/app-admin/ansible-base/metadata.xml |
54 |
@@ -18,7 +18,7 @@ |
55 |
<name>Patrice Clement</name> |
56 |
</maintainer> |
57 |
<upstream> |
58 |
- <remote-id type="pypi">ansible-base</remote-id> |
59 |
+ <remote-id type="pypi">ansible-base</remote-id> |
60 |
<remote-id type="github">ansible/ansible</remote-id> |
61 |
<bugs-to>https://github.com/ansible/ansible/issues</bugs-to> |
62 |
</upstream> |