gentoo resync : 15.06.2021

5 files changed, 31 insertions, 70 deletions

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index da6f098491e6..0431abb6907b 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,4 +1,5 @@
 DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
-EBUILD ansible-2.10.7.ebuild 1509 BLAKE2B 9f50b6ec95df3480a38db3f83dc74bb90101594f0b96f867eb6b4ddcfa0e4dbe7c9ab2d2d00b3d562e4e00e3ee0a78de309f1dca068529bbf05522c7ef904137 SHA512 44ade17e48e8210fed9f559fcdc6460c4a41508b863d35ade6470041956e12e19f73ab05cab971c3c0de8fea04016891711e0238182f7224ffdc99323a68c97f
-EBUILD ansible-9999.ebuild 1513 BLAKE2B 42deec0e0cb5d0370ac103269bf6ac9bbf17ee61c647459de73b8ef880677aae4d85618c8aa705ea1d98a43a5ee9a5a60ca3c778ade1e47a82beb0e7cb0737c2 SHA512 6f91b7c3360739db565bc1daee47b92c9d5da4a52658b19ff2644d68b678bb47859412c532a578800fdc52c55bc5bb2502d8c06c90622b7dad220e0ea1ba27da
-MISC metadata.xml 837 BLAKE2B ace15c05a5ac41dcf4889ed6cbf1b920793af9b67d415b0e51ddb1da179efc1ccf6efb821bc1ea6031283b7896cc5fde309fdff6a7d30b5f4902fec471b901a4 SHA512 dc6e6af5b2c5e14afca5719a4fcb920edff8386c89145895784c8b4ed95942b2313035eb4b7d5c595871b316b21a3119d5f584d9851a643a18f6e6fae3c26506
+DIST ansible-4.1.0.tar.gz 33999079 BLAKE2B b7c512ed01f220dbfdd5c90cd67c88cc3b50dce5a83a783b798afafe88d75d96ae7abd9a512a1d4fc4e1ad0305c72e6d2b4ebe3811addf78faf2d14dab7dd188 SHA512 603a5aa6b63d447efcb6e2f04f40c1bf5d7cc888f344bdc00ca3f9bca92c406554328a0e77cf3d5f2633addc9d6459d7b9d9176d14ecc506c67013fc8180b0c0
+EBUILD ansible-2.10.7.ebuild 1521 BLAKE2B 7ede0de3fba6b4c5ee8f9d679478392f5ca8f4d0e47e70a9417718287e7c1861bfb72d7dec713c10705be2bacfbfafa60047c086707789626b4310510b367797 SHA512 1c0fc02118a4122e5e51bc6e0cd93bbb35a521021dbb3ba739bb066989885efe4d9fcbb9febd2c9e809295af43ada38ea3c0abb9e6c44d3fe47896c869c853ac
+EBUILD ansible-4.1.0.ebuild 607 BLAKE2B 36fcaac434ab8c234eb47fae029ce81d50424677d39e3efadd3b8b44af7831ccf0fee49c748881fee8c26655eb0431710eb65620e8284c0a3369160e46957d77 SHA512 fa3b300013afc4409b08c815e12842497abfd5a3745a4da7cd1e70d55f7aefbefdabe0203e5647b161a587c2e5066e86aace9fd1b10c584b774c35c719985d7f
+MISC metadata.xml 725 BLAKE2B 3d7a1655261b538ceb1511d626df23c93d0c30a0ab3b1ba38e560b4b43ffe7a82c6e207d991680bc321f6698596b1a61ec2182ae1c42c296a91b9f98896cff70 SHA512 bb3b5e0d20f530c1961bf19060ce1e5d087384008c116c4bc0af3e86368e9e9fdbce84d22b6f7b4f6760f039b180805364478e8e3d98b9b4d4d2600f9de62e6f
diff --git a/app-admin/ansible/ansible-2.10.7.ebuild b/app-admin/ansible/ansible-2.10.7.ebuild
index c5e15d422cab..247986757063 100644
--- a/app-admin/ansible/ansible-2.10.7.ebuild
+++ b/app-admin/ansible/ansible-2.10.7.ebuild
@@ -36,11 +36,11 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	app-admin/ansible-base
+	<app-admin/ansible-base-2.11
 "
 DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	app-admin/ansible-base
+	<app-admin/ansible-base-2.11
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/ansible-4.1.0.ebuild b/app-admin/ansible/ansible-4.1.0.ebuild
new file mode 100644
index 000000000000..39f0a61f6e8f
--- /dev/null
+++ b/app-admin/ansible/ansible-4.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-base-2.11.1
+	<app-admin/ansible-base-2.12"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
deleted file mode 100644
index c50250cd5308..000000000000
--- a/app-admin/ansible/ansible-9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://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"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${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}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
index ede75031e55a..a8f9be939d94 100644
--- a/app-admin/ansible/metadata.xml
+++ b/app-admin/ansible/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>