app-admin/ansible: bup and cleanup

Package-Manager: portage-2.3.0

4 files changed, 3 insertions, 123 deletions

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 5d5fc78f72ce..3fdb5c8ba770 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,4 +1,2 @@
 DIST ansible-1.9.6.tar.gz 941457 SHA256 50773781b1e76f2885bbeb2351a97cf1c6a29239d3e073da939a104e7e81ee5d SHA512 97ea17f032bf253c53d5e1f79071603f0b3b7caffe4e267534cf181ab88b7186d953c41203c762e0650ab70302bde7e84bb5ee8bcd03153a3e4a76e41d1a3bec WHIRLPOOL b26390090aeabd2a6e8e27916a7cc0e89e0041715bd036118f034292da52df55107d27c577fe38e838b3455d3167cf3e876533fa47fe184d02ebfaa98cf46f5e
-DIST ansible-2.0.2.0.tar.gz 1516681 SHA256 373a2e50319d90da50948e3faf1c033464b7302200e0199da8981d24646d4387 SHA512 0f78f15fcfcfe0e0fe60b1ee5f60b101d93f1fa81de942955a036763da4d492f86f2854cc8561e36427c23beb9b70bc577f5d0f42d9a3c7c966bb0979dee8011 WHIRLPOOL a704fea45396ab635662d6df07888ea17321e9f42127957c658ed88f02968a96b6f7fa1f8efa9c266c13f40ff3ab8f00377ac631fcafe0c402a258d71953cf3a
-DIST ansible-2.1.0.0.tar.gz 1877209 SHA256 403443b55f6522cf86f9b41544a9b6b81f7d27f088446e85334d5d7a6317ccad SHA512 8601325098b70469cf908ce09c075334952774519a4331f109b6aa0568fc718bb347ea4d06389277e41ce54270b19dca01815f46071d8e638e0cd751957f20c7 WHIRLPOOL 03cb5713eecd8bb8c050366c0c23d040fb3a27fa5da91a3fa3ffc14871052e24e2f207eb6c6f35f4f8e4893dd566de5b9d33a72da321dc2833b86b20356de3fa
-DIST ansible-2.1.1.0.tar.gz 1875511 SHA256 8d2d4f39341b30257b83830a682b559c22904d81fd60b4a3e8b96f055f031197 SHA512 b8019a56140c19bc3994fea87f59d08a59ce128ea0a68d975dfd0cf6c6c52b29a7652c1f7a7d911f713af4993d490722869e98d82d3553eafd7754ff36e1ddf0 WHIRLPOOL a0b0109f9eb86b0ac3cb3cb83cf6c7d56d48f54551d99d13b0ced536629ca4d455bdbd382ce97144b306daea81d38e30210e9cc7aa12e28b20ee048d9adba9ab
+DIST ansible-2.1.2.0.tar.gz 1881113 SHA256 9c37a7bd397c05ab8ca3fcc49417649ea49b9133d4cd9500408235617d1621eb SHA512 5637a7ee82ef6b5377bb0daafd215df3e5c54be7b84d49bfea1f5584090e4f3831a20c206f41816f879ea961d7d6eb461e954d4f4d84bfb875c030585e8f8c2e WHIRLPOOL fafabec1a4e74fb2ab68c25147074f519f68124eda222a745452846f50a739d66977e310366168bf22a560747e49813f92f5867add5c3317ecba064207830140
diff --git a/app-admin/ansible/ansible-2.1.0.0.ebuild b/app-admin/ansible/ansible-2.1.0.0.ebuild
deleted file mode 100644
index 26b830bb74ed..000000000000
--- a/app-admin/ansible/ansible-2.1.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-BLAKE2B_HASH="26/6e/3974858f047641de6ceffad0f51ab7cafa5f2c09d1474c6221ec96434f58"
-SRC_URI="https://pypi.python.org/packages/${BLAKE2B_HASH}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="keyczar test"
-
-RDEPEND="
-	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${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() {
-	EXAMPLES=( examples )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-}
diff --git a/app-admin/ansible/ansible-2.1.1.0.ebuild b/app-admin/ansible/ansible-2.1.1.0.ebuild
deleted file mode 100644
index 2f8494f7683d..000000000000
--- a/app-admin/ansible/ansible-2.1.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-BLAKE2B_HASH="26/7c/4c717d39afac30bc324744a35fda077c969d3881daf71d396969958e01b7"
-SRC_URI="https://pypi.python.org/packages/${BLAKE2B_HASH}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="keyczar test"
-
-RDEPEND="
-	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${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() {
-	EXAMPLES=( examples )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-}
diff --git a/app-admin/ansible/ansible-2.0.2.0-r1.ebuild b/app-admin/ansible/ansible-2.1.2.0.ebuild
index e1e67a318738..c79f01997b96 100644
--- a/app-admin/ansible/ansible-2.0.2.0-r1.ebuild
+++ b/app-admin/ansible/ansible-2.1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils versionator
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="http://ansible.com/"
-BLAKE2B_HASH="b3/0e/5f3ee8884866a3d5e3b8ba86e9caa85ecdec75adabac8924b1c122339e7f"
+BLAKE2B_HASH="5f/51/9f54f20180eb323a80451c9f48f508bd5bbe03008c136e125b4ce3946fcf"
 SRC_URI="https://pypi.python.org/packages/${BLAKE2B_HASH}/${P}.tar.gz"
 
 LICENSE="GPL-3"