app-admin/ansible: 2.5.4 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.40, Repoman-2.3.9

5 files changed, 1 insertions, 171 deletions

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index cae36392ed65..ce3d4d8564a7 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,4 +1,3 @@
-DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
 DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
 DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72
 DIST ansible-2.5.2.tar.gz 10105800 BLAKE2B 0d9080b666164c96c2a237f9a5f4b271a2fe9933d1999df85cd973df0cf85d850343bc33b8afb18c1bf0a7eecb2ab193e91c7a02c3e56e8a5e41338ce7a90081 SHA512 25568665b96ee9d7ca0888dadd90de178a9cc1da7dba07acb682ca4455ef91622344958ec2000eafbb4cfda87aec325be77d3d5b395aa4bbc2d180fad1a90a34
diff --git a/app-admin/ansible/ansible-2.4.2.0-r1.ebuild b/app-admin/ansible/ansible-2.4.2.0-r1.ebuild
deleted file mode 100644
index 573d04b35802..000000000000
--- a/app-admin/ansible/ansible-2.4.2.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=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
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.4.2.0.ebuild b/app-admin/ansible/ansible-2.4.2.0.ebuild
deleted file mode 100644
index 096299da9d67..000000000000
--- a/app-admin/ansible/ansible-2.4.2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.5.3.ebuild b/app-admin/ansible/ansible-2.5.3.ebuild
deleted file mode 100644
index 573d04b35802..000000000000
--- a/app-admin/ansible/ansible-2.5.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=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
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.5.4.ebuild b/app-admin/ansible/ansible-2.5.4.ebuild
index 8f63e8546445..fb7e782721e5 100644
--- a/app-admin/ansible/ansible-2.5.4.ebuild
+++ b/app-admin/ansible/ansible-2.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="