app-admin/ansible: Latest security fixed release candidates

Remove old rc.
CVE-2016-9587
X-Gentoo-bug:605342
X-Gentoo-bug-url:https://bugs.gentoo.org/show_bug.cgi?id=605342

Package-Manager: Portage-2.3.3_p23, Repoman-2.3.1_p16

3 files changed, 68 insertions, 5 deletions

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 2f7380a34648..c2eacd62908d 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,4 +1,6 @@
 DIST ansible-1.9.6.tar.gz 941457 SHA256 50773781b1e76f2885bbeb2351a97cf1c6a29239d3e073da939a104e7e81ee5d SHA512 97ea17f032bf253c53d5e1f79071603f0b3b7caffe4e267534cf181ab88b7186d953c41203c762e0650ab70302bde7e84bb5ee8bcd03153a3e4a76e41d1a3bec WHIRLPOOL b26390090aeabd2a6e8e27916a7cc0e89e0041715bd036118f034292da52df55107d27c577fe38e838b3455d3167cf3e876533fa47fe184d02ebfaa98cf46f5e
 DIST ansible-2.1.3.0.tar.gz 1851643 SHA256 a3bb0487687b70d5586277f0f0c9a419d05ad1811b81fa18535a568e5d064c0b SHA512 6a73a361a89e2785ba5157e309e18c04e2dd09a4133f9ab437d0b05f4e56790bc0430e08976638306c0254aa6b8eac4b558bbcd058f8f5bdba420de8f48c8c34 WHIRLPOOL 7dbb85ddb4533a2b4189aec7aa911a173e51646902bca71c7fdad2fadb7e3f3b88b3463dbf4a75913df0a9c72b3073dbad4b6c962dd484f638d5c58b5112ec4d
+DIST ansible-2.1.4.0-0.2.rc2.tar.gz 1855972 SHA256 7fd749987ffa9955a0c2271314a11217e0c2106257c9c3c8243224550531ca2a SHA512 3fc7c4da59305f7dde51811a6ca13173bf4af768539403fc67d8015292680b4136f4b0ed006e87840cefd3cfd586e086dcd933bf99efc8919b5f38eaab3a5684 WHIRLPOOL 3fd91b89226bf0e4fe42c0f3070079606dcfb06efe36b533450367b45997867b158d9d6cbc8cc740f984d2cfb62ea8d75dcd2b2a6977a4628659991e600fc791
 DIST ansible-2.2.0.0.tar.gz 2441851 SHA256 d9f198d293394ce0f8ba802561b21368888e3301036a706b5584641b49408586 SHA512 8bb8360f41e920c46552ead826a342311d0acffa264334c8c8ae868f8bf45caad4ff2b9c9c0ec4e551653edaf80eb49d8dece5c2ba7e1088c2ce74d3ff0e3130 WHIRLPOOL 911ba4959fbca8527e9cf4b46c86cefc415433cab21486ff47302d02e60c4c2da1abc91c7ab564642a518acd5a5c1cbc8b3930ef7f596518c5aa358f001f4064
 DIST ansible-2.2.1.0-0.1.rc1.tar.gz 1665098 SHA256 c0ac6f74970cb798b8ba11e0508d43cfcd623510c9075afef9db72b96734f0d9 SHA512 5e0d5e4efe1cf14c2f09a673816d9c62c19cc2d5c9ee566320fb35c72f8fd5fad608473adb5ad0fd2711bdd5deb33d2e1f00ef019c05062b5edd621fc52ce653 WHIRLPOOL 51b75cf601668344a70717184cac52f9fa0f611d631f3bd18b4b75fdc2c10d654374d79a6099c6a9db3c04124fd37adc4c3a5d2511ba2e44b7f34a0a2439bad5
+DIST ansible-2.2.1.0-0.4.rc4.tar.gz 2454175 SHA256 2f47e7de9402b13dd388c2c00a0a89132930c81a237ce752c30d8da533c40a25 SHA512 eef79fb0e8c9ac9d838ac856418fdbb6be283004572a0539d6300c24e4abfc54599d9081ba4ae1060621f5400aad56559cc3345f7bc6d0f901fcb857923c7524 WHIRLPOOL adf2e4d46e74dc68c13075131aaf6b6263cdee1ad59b48a972f7b7d1e0512adf829660c78e6d4fd20d57b4b5754b57a0ea48ffb5677e56e5e5fd21f0ce4e2d61
diff --git a/app-admin/ansible/ansible-2.1.4.0_rc2.ebuild b/app-admin/ansible/ansible-2.1.4.0_rc2.ebuild
new file mode 100644
index 000000000000..f32d3cf41849
--- /dev/null
+++ b/app-admin/ansible/ansible-2.1.4.0_rc2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+MY_V="$(get_version_component_range 1-4)"
+MY_PV="${MY_V}-0.2.rc2"
+SRC_URI="http://releases.ansible.com/${PN}/${PN}-${MY_PV}.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
+	)"
+
+S=${WORKDIR}/${PN}-${MY_V}
+
+# 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
+}
diff --git a/app-admin/ansible/ansible-2.2.1.0_rc1.ebuild b/app-admin/ansible/ansible-2.2.1.0_rc4.ebuild
index 467401849fb0..1bfca18888c0 100644
--- a/app-admin/ansible/ansible-2.2.1.0_rc1.ebuild
+++ b/app-admin/ansible/ansible-2.2.1.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,9 +10,9 @@ inherit distutils-r1 eutils versionator
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="http://ansible.com/"
-# This is a release candidate, so we need to do things a little differently
-MY_PV="$(get_version_component_range 1-4)-0.1.rc1"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+MY_V="$(get_version_component_range 1-4)"
+MY_PV="${MY_V}-0.4.rc4"
+SRC_URI="http://releases.ansible.com/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -45,7 +45,7 @@ DEPEND="
 		dev-vcs/git
 	)"
 
-S=${WORKDIR}/${PN}-${MY_PV}
+S=${WORKDIR}/${PN}-${MY_V}
 
 # not included in release tarball
 RESTRICT="test"