Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible/
Date: Fri, 02 Oct 2020 18:29:21
Message-Id: 1601663354.41d30917a54f4ac2f02ec4e031a6c89849782837.prometheanfire@gentoo
1 commit: 41d30917a54f4ac2f02ec4e031a6c89849782837
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 2 18:28:25 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 2 18:29:14 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d30917
7
8 app-admin/ansible: use env var to allow upgrading of ansible
9
10 closes: https://bugs.gentoo.org/746164
11
12 Package-Manager: Portage-3.0.4, Repoman-3.0.1
13 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
14
15 app-admin/ansible/ansible-2.10.0.ebuild | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18 diff --git a/app-admin/ansible/ansible-2.10.0.ebuild b/app-admin/ansible/ansible-2.10.0.ebuild
19 index c19820e359f..d62ac3db6e3 100644
20 --- a/app-admin/ansible/ansible-2.10.0.ebuild
21 +++ b/app-admin/ansible/ansible-2.10.0.ebuild
22 @@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
23 IUSE="doc test"
24 RESTRICT="test"
25
26 -BDEPEND="!<app-admin/ansible-2.10.0[${PYTHON_USEDEP}]"
27 RDEPEND="
28 dev-python/paramiko[${PYTHON_USEDEP}]
29 dev-python/jinja[${PYTHON_USEDEP}]
30 @@ -51,6 +50,8 @@ DEPEND="
31 dev-vcs/git
32 )"
33
34 +ANSIBLE_SKIP_CONFLICT_CHECK=1
35 +
36 python_compile_all() {
37 if use doc; then
38 cd docs/docsite || die