From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1211343-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id D614B138359
	for <garchives@archives.gentoo.org>; Fri,  2 Oct 2020 18:29:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F3592E09E1;
	Fri,  2 Oct 2020 18:29:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id D825DE09E1
	for <gentoo-commits@lists.gentoo.org>; Fri,  2 Oct 2020 18:29:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5B5F8335DC7
	for <gentoo-commits@lists.gentoo.org>; Fri,  2 Oct 2020 18:29:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CC38F332
	for <gentoo-commits@lists.gentoo.org>; Fri,  2 Oct 2020 18:29:17 +0000 (UTC)
From: "Matthew Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" <prometheanfire@gentoo.org>
Message-ID: <1601663354.41d30917a54f4ac2f02ec4e031a6c89849782837.prometheanfire@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-admin/ansible/ansible-2.10.0.ebuild
X-VCS-Directories: app-admin/ansible/
X-VCS-Committer: prometheanfire
X-VCS-Committer-Name: Matthew Thode
X-VCS-Revision: 41d30917a54f4ac2f02ec4e031a6c89849782837
X-VCS-Branch: master
Date: Fri,  2 Oct 2020 18:29:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 254e8a1e-5b0e-491f-814c-11ab57106044
X-Archives-Hash: d1c4538bbb485e817fbb30cbf0a55b43

commit:     41d30917a54f4ac2f02ec4e031a6c89849782837
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 18:28:25 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 18:29:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d30917

app-admin/ansible: use env var to allow upgrading of ansible

closes: https://bugs.gentoo.org/746164

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

 app-admin/ansible/ansible-2.10.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-admin/ansible/ansible-2.10.0.ebuild b/app-admin/ansible/ansible-2.10.0.ebuild
index c19820e359f..d62ac3db6e3 100644
--- a/app-admin/ansible/ansible-2.10.0.ebuild
+++ b/app-admin/ansible/ansible-2.10.0.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
-BDEPEND="!<app-admin/ansible-2.10.0[${PYTHON_USEDEP}]"
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -51,6 +50,8 @@ DEPEND="
 		dev-vcs/git
 	)"
 
+ANSIBLE_SKIP_CONFLICT_CHECK=1
+
 python_compile_all() {
 	if use doc; then
 		cd docs/docsite || die