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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 18 insertions, 83 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/Manifest b/app-admin/ansible/Manifest
index 0e05b9a7849f..47c0a0231cfe 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ansible.env 99 SHA256 04a806ca12249b1b1387e17cabd85c8b09bac64914650d7a776576153e32591f SHA512 79d0d6581116ede67d6b184d1a16c2ba6586d4ca8cd71047bc5a81a82696b0e1a124f22248877aefc0a810f0ae3bd2724dadaf71dd5078bbe0910a9e8c3ab111 WHIRLPOOL f347143d490cf1dd6784059022fb7c6c85eaa5e957b6b5eb85f6b1b8a98d1b90c26aa0602fe2cd6679c4709fb9dad2fa67bc53326bfca80205cb7b7ded757c90
-DIST ansible-1.5.5.tar.gz 1036131 SHA256 d8ed21d8b099a20f71ad13f7dd675d7e1a85c74dbee594ba3c39a53168d988a8 SHA512 500b0bb7525f5a10b23e7a58af24c416cebd236c213e070dc9b772ed835adca6967ce3a8eed911bde9a395aedc7b578f82026c2d68f00fe40817e37ba2237cf2 WHIRLPOOL befca112c34fa6ca9aefbf32be00b2280aefef3f665426ed1154a6e73a7a077d5e091a956b69fd1b931b271ad9adcb6859b5bbcb3a1b27682ae171faff2ba86f
 DIST ansible-1.6.8.tar.gz 1177319 SHA256 9d9b42ec2fa1d0aeac5472cc0f00ad75930d3b15d4ae8a9c44ed877c3d4fc190 SHA512 494f9831b1620c88f45584be9be02e873b80b09e1a2030be22d0e9bd02fb6b8618f5c713b9a4f87c671d418d9e73119d84e6da0eb5c8a1cc061e7eee80380720 WHIRLPOOL 0869c29d27bddad8994d04926b7d0bef3e6732a645c33c742a568382797b774cc01623a365a60204b28c0f495c54059a132167753e1d2a0e21dcfa1f801642b0
-EBUILD ansible-1.5.5.ebuild 1596 SHA256 d045ebd05f4910e893a9b61d8142f903dfbbf6781032ca249739c63980103a5f SHA512 55d7d588419f520e6394bf0b915840f1f4f47bf83525ade90f289c983fa054b1edc78692205b4b07c24a691c47592c4efbd023b515b43bab5263ebaeca1d070d WHIRLPOOL 7337544a3812e34c6a4dc234fd19c4051393f697986cf8138af50e73f1ceb6fbe98ee699f1e01c8c8d686ed67197d2be0e80180fb79fa4ba51178b76c5c76c61
-EBUILD ansible-1.6.8.ebuild 1631 SHA256 8334e63758cdaf3482135f6f06082550ebdd44185260ae3fadf9437d7223a7f8 SHA512 03603b3cdee1aaeb976c1dca46f7baac700a5df388641bc1605a2577c0f56d5eff58d0df1d60436ce27290ca23fa68ea314e02bf9a70982dba4236ad251d8c8a WHIRLPOOL a52bfcd8949c97227bdabc78c273a8dd4de6e811dda2035d26eaaab4e0e012061f1fb3fe12be8d00f7891a3ae27a3857beabb5b8e147977b8d01fd10fb4bc59b
+EBUILD ansible-1.6.8.ebuild 1633 SHA256 cf7ab70ea00a7689a8f1b3915b87e0d997532118d9bee208436d61bf1869991b SHA512 c7c9515dd3f2c0df5b0363f6566bd7e5ae456822f290977ed6d70c1bb6e54a778986fd4c5e1ff0dd3b2bec508517abaeefe3b425825cc21b11fb51808ebc7c97 WHIRLPOOL 0883d28ae54925dfa8b6b12901a8cca4ce6d0eae6116695d1ac7a904f99660c084a4b8b95a03876bb80a02a61111ef303da543b1d16932f971a4e1ab2f17bab8
 EBUILD ansible-9999.ebuild 1632 SHA256 9c5464aabaf2148742852478a9cf34baf4c43f3528a5654b5890b85c1ce4c04a SHA512 62fce29fe6749d50d3c1741a16da6680157ee1e0ba843ebf6974d82249f3fd741f5c7625281a042bc123470cc8088e27527957cd431180d6396b79e8c8458844 WHIRLPOOL f7a8665d0d8e15e7776ff6c4dccf6507bb654e562ad27aed143f2be37f1228a30c884c62b407d67b624b7f639cccc4122347c052e9db2f069b02799861afc98f
-MISC ChangeLog 7866 SHA256 02c7b210fbb2218e0ccd7ede78bf517c7dfcb385a6322bb02b1c00027f7e467f SHA512 ed4a5af01dfaddb63bf4a3d2fbbc9c1345edf6b6c5d2c854448250c7b736c25f31c43356a7d58c1712bf85fe687ecb3137f1e38f9bac32e679d88edfd76ddabd WHIRLPOOL bc4244cc072b0af174179c7863094af35723f0281f814ca121debd9959944465d111e411b36322a63a875669f599d47c9a8ae041f505c53a8f8280679cbc0f9d
+MISC ChangeLog 8044 SHA256 9156a2c30977c1ba2dd78fa0621acde47ac1bbb34b95e44a17e5aaad155832cd SHA512 d808243f8344fdadc67dd9b8e81d1386ce0997fd85fd58f0fe48092389956fd8691fe8f971e99193e1df983a719440ffab1ac4a292c815f65f67b1bfc1b59dd8 WHIRLPOOL c961a0fdc78210d45fa0767646db449210da4ca68600586243105d4ddd086ecdd97d7875f146d6ba8a71b1c565403dbd99c94df5e6690b6f325d08da21e7e4ff
 MISC metadata.xml 536 SHA256 e44890b0ee85a75b78487e171512bc77b7e275d312a59d808d8a4bb2e937ec5c SHA512 47ee41085f1998c36f3680187dba6e89d0630a67f328bfb0fadaff128d29248d5a224dbf39f5455cbac666627c631daa8194b8e3731ac9333d748e6c2264bf72 WHIRLPOOL 67900c5a9994a3e6c6661a4bc9210228a808edd8b0908e6d280d50500d89c5cbe764e55ab44eba28662e9d3399aeffb7dba31e6e6fc2d42ce6a52e47fc09cbeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJT2N2bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir0nIP/A1VXvDUAMaRlE83XIivxDqA
-HmEnYwNBkh5IVWTZPDto9jfsacvKtxRKGdxJRW+6EqqupDl3vLsm0qvL79NnOg56
-ysJQIGMGWImIB5/0rZFIgpy8dIcn6saWZKx5gEKSSUiugI75KY3NOzUkJBeXDYUJ
-cfK3TEfgVHdtdOGFWZ0lElBqCYsJObzbxxanEaFWx+4dQ3K/TpsGUPBmkxPR+5Fu
-TT0RqVAm/kyFrPBOQUl8/+yhN7LCOneF5FBTV7tOggVlwKbg5b9pfuFpj0Fphmk7
-LyIawihgvY/mTLxzU4bFsXW/ORC8GtaTZJPB59aX6bQREwbrmjSR1MYYy3/1oinb
-JogMBGiYtpNbX9PucMndTEbT/b9wGd8D5lKo0EfKNUDflMEF9jwM9Ad02hT1b+Vc
-SP0IYX5a8eIKqGLFYHomPRpli1pHZRGNkp0v42rnwpA7MZDGY0SRPZG/LIPZ8hBQ
-ypaEd/cUMzrXOweyUxUABfjTIpRNCTFJLOEFS2dsr5QW4vQqtM3nnOaS3duoSAUx
-PrTze3F71gJH5082gsEMaQNTn4cE2/EW4Ytl6F96/IfQS8BRO7r09xKO1MO5sVFv
-hRe70NTdDxVtYGCmanYPjngEi/DLOU3U4Y9extBbgzIL2yEd52ltaI/HV0bbQbmP
-lOCVPRJu3JOPYE+plOpW
-=4VMu
+iQEcBAEBCAAGBQJT2dxeAAoJECo/aRed9267qygIAJMPBpbjVOn+5o/heo/X62Wp
+Zt3dqdMpgyluQ4/iCe9ErcbiqJmw8XHSAYTpCTN85BVI6w/yEsrr38Ku0dDX/n49
+4PVN8lc7MdUe5YNf+obchALHy4aYmoIEG8m8iW7rFt3QeDxt0GcMu7nEuFJfPEPg
+Zv2h4gfWbNefU4rApRybEDLeSClkBr8BtVRbHFQNdx4FIMcX7yLoc41noCBWnsh7
+xhtTTm8yvQjbO4D5IHlNXzebcq2hv+sMxOkcrl0RfpNTm7zGYO1HTGJPqXrX43SD
+wP9WPaugDWNgFlYI0pmJgpLc/zuXB7MAHY0htTL3c51EPR88Q23/4brmZtM4pEU=
+=dWPB
 -----END PGP SIGNATURE-----
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"