Stable on amd64 and x86, wrt bug #517770. Drop old and vulnerable version

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 7 insertions, 62 deletions

diff --git a/app-admin/ansible/ChangeLog b/app-admin/ansible/ChangeLog
index e98fc4a92a71..e34ce81caeb7 100644
--- a/app-admin/ansible/ChangeLog
+++ b/app-admin/ansible/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/ansible
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.47 2014/07/30 11:57:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.48 2014/07/31 06:04:14 pinkbyte Exp $
+
+  31 Jul 2014; Sergey Popov <pinkbyte@gentoo.org> -ansible-1.5.5.ebuild,
+  ansible-1.6.8.ebuild:
+  Stable on amd64 and x86, wrt bug #517770. Drop old and vulnerable version
 
   30 Jul 2014; Justin Lecher <jlec@gentoo.org> ansible-1.5.5.ebuild,
   ansible-1.6.8.ebuild, ansible-9999.ebuild:
diff --git a/app-admin/ansible/ansible-1.5.5.ebuild b/app-admin/ansible/ansible-1.5.5.ebuild
deleted file mode 100644
index 45274612dc5a..000000000000
--- a/app-admin/ansible/ansible-1.5.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.5.5.ebuild,v 1.3 2014/07/30 11:57:13 jlec Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-
-DOC_CONTENTS="You can define parameters through shell variables OR use config files
-Examples of config files installed in /usr/share/doc/${PF}/examples\n\n
-You have to create ansible hosts file!\n
-More info on http://docs.ansible.com/intro_getting_started.html
-
-Some optional dependencies, you might want to install:\n
-dev-python/keyczar - needed to support accelerated mode\n
-dev-python/paramiko - alternative SSH backend"\
-
-python_test() {
-	make tests || die "tests failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-	# Hint: do not install example config files into /etc
-	# let this choice to user
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
diff --git a/app-admin/ansible/ansible-1.6.8.ebuild b/app-admin/ansible/ansible-1.6.8.ebuild
index de5b22af29ca..6a61b5c766dd 100644
--- a/app-admin/ansible/ansible-1.6.8.ebuild
+++ b/app-admin/ansible/ansible-1.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.6.8.ebuild,v 1.3 2014/07/30 11:57:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.6.8.ebuild,v 1.4 2014/07/31 06:04:14 pinkbyte Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Radically simple deployment, model-driven configuration management,
 HOMEPAGE="http://ansible.com/"
 SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"