Version bump, wrt bug #503298. Sync live ebuild, remove obsolete workaround for tests, add dependency on dev-python/keyczar to support accelerated mode

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

4 files changed, 78 insertions, 17 deletions

diff --git a/app-admin/ansible/ChangeLog b/app-admin/ansible/ChangeLog
index 797b769063e6..3d90fd143a74 100644
--- a/app-admin/ansible/ChangeLog
+++ b/app-admin/ansible/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2014/03/03 12:18:57 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.35 2014/03/03 12:21:30 pinkbyte Exp $
+
+*ansible-1.5.0 (03 Mar 2014)
+
+  03 Mar 2014; Sergey Popov <pinkbyte@gentoo.org> +ansible-1.5.0.ebuild,
+  ansible-9999.ebuild:
+  Version bump, wrt bug #503298. Sync live ebuild, remove obsolete workaround
+  for tests, add dependency on dev-python/keyczar to support accelerated mode
 
   03 Mar 2014; Sergey Popov <pinkbyte@gentoo.org> ansible-1.4.5.ebuild,
   ansible-9999.ebuild:
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 9e18d03dfe72..4594f264f500 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -9,23 +9,25 @@ DIST ansible-1.3.4.tar.gz 869278 SHA256 127ff0c68c7997f26ad9840fe6049567ada1ce76
 DIST ansible-1.4.1.tar.gz 1003129 SHA256 dd4e3f5a4bbd2f65c17be208a15313c5679859b0dccb762debfa0699cb4a1bfe SHA512 c62f93a8446ebc47c625c9ac985a81a8bcb311b5a224585147d984eaaff9c0f7bf4a3b58e5000ea7b7ed6a04b0ef51923fbd5b84972fb4ef94792ad0ade218e4 WHIRLPOOL 0ec66c5d299b1b4481a732d45eb9e39e60bfd43ac10a90b240b7f41c71a30910f1712d889b6c5a6b3a49c9c31be721f053692ff64a2e07d3d4ec0542f822ef92
 DIST ansible-1.4.3.tar.gz 1011935 SHA256 bb9f2a63a0a88ab60b64c58e5e7fe9e1602d7bea22f3965e633fe87dfc87eaf5 SHA512 52b7efe63f0c6932ae829011e545ed0e71d15ded10aadfba37c0e8185d3fc9015468c63888426215e492942489bd791cce831564954fa168dfcce34387ce90f8 WHIRLPOOL a9119c1758fc2ac6fe059ee97dd6b8c38a182fb2547104934f3cd08d5a607dbdabae282d586f90a5a139f5341246f0e2241067feff836975b8eaf08e90ee66ac
 DIST ansible-1.4.5.tar.gz 1012349 SHA256 61c35aad0d4ef668051652b8a5b84b6407016a5b1daa74b982889ff0fafddea0 SHA512 b65f1eaac0ef749a0cb1592b5e26cb3004dcf9b49dbf35496e06fe59f58328d0c82fc01ca38c6276440b85f267fcf69006b14f585525ee5219e1868c18433fed WHIRLPOOL 70be758c77aca464a83368533011aaf2d2467a946879e154c9fd1e798ab02207c11de2a4dbaaa816aba3edb873fdeafc76a3975723b4837a2d1a2f19a5a42806
+DIST ansible-1.5.0.tar.gz 1024953 SHA256 9ac02f181f595a95c00cf1615b1166ba86149a7d1503a8c0e758165409d1e4be SHA512 cc0f0dedbaeaaad6d69448490bdbeae4fb100d31d5ee12d95823df5f11e093d8bedb7cc202e47915eeeffad2dce09cfee36b3937627c5637a1dfdc1daa290531 WHIRLPOOL 19e5194182da5b22dcdb70416459f5d0a7369d71703d62a3a924ccd2b4fbde5d5eb0f1581d4868d32310df2a2ad7a9d53aeb650d74fd15efeff7fbb9e647c932
 EBUILD ansible-1.2.3.ebuild 1589 SHA256 0749ce81fb89928e7c96a433a2ce583a8dbfbc7b0afa442271b6dc623f74b490 SHA512 336a7bdad7ef7d34143d76102539dd39561b2fdc65e3697ae360cc6f5ebb27b9d463a1cfd5bed5d023bf6142a383772fe2efbe2fb5f9577576d48b13ddfb4ee8 WHIRLPOOL 2aaae6a1a4a7e8010731b209a2ab970be75e13510b00f0dc427c71db4a552d6972d8b3ea3e92c2c5c4493eb6d5da82fd1e884056c9375b5712b9f5ff00986315
 EBUILD ansible-1.3.3.ebuild 1597 SHA256 b7ae3f76550d8ccd126e890e40c5db7af6c50c89aabfde45005f8b913da60e3f SHA512 d891b2dcdd71b97d8796fd56ddc0973c749a88c9d5472a4ba35883aab1213d9952c2d1f7aa162018693ab974f9bf782f5d19ea3e8d43ba6692aeca42ec5696cc WHIRLPOOL 2f75c1202f4f3dc205a1cff19f00020d76d42c6a57001db5d7e1d14bab32c106d43dbfbd67fc24fc74a4669546f267ba1274984cde628ed48bf866022c572953
 EBUILD ansible-1.3.4.ebuild 1595 SHA256 97db492ad657726b240a67d3747ad9e37b116bfd7a611d925e778e8e755b7ae0 SHA512 0086c084e3f82d7a359001937f2ff7399a7f8ec24a201ce8103a7c97b6c00c073147f5258152f016b52f4e49421d5f4af3f3fe9355e53a2d8d905140f44308d7 WHIRLPOOL 4d8bef228daeb7a32caa335c677e4b28f5799229164233423e7ccd155a3a7e5a4a61dc9d5122fa0489e1fed6ee90dd33b9cdc9661d0ac1e894c122825b4d9a9f
 EBUILD ansible-1.4.1.ebuild 1647 SHA256 e927b23cecd793fef83976ec20993ec5d72c13f196c814d1307104a110df6bcc SHA512 34228ce4aa7603b4d60df5256213c9bf12541296368d7602f9b76bce3bd587b517f07663172ff90789763056b0033b162de8086ea6a4daf3719da1eea229595c WHIRLPOOL 2deb9c653229047401f9c6f7e3feb7afd6a0bb412f33ff30a3402b9ccc91570f2aa229ad93075bb77d378ab2b7d46ecdd9fc3f4abc1fd7d3438679adde128a41
 EBUILD ansible-1.4.3.ebuild 1606 SHA256 ced495b224ed02d59e96de246cc603b792a7172e03e7be4ad56c19232dbcbdd4 SHA512 c142b0c82aac5342d8cd8c561320d302004a4984e0c712a0cf8e98d4fd105f11f56b1eaf9ff2e7632d9e173758b16ce15d2218d40ed3966f1bfb4268a7433055 WHIRLPOOL 5862859164efb7d46f229aad2a75474c2cf553ea82a559d461e40794af55d6f2232ff76b3d79ea5638f4c6e65b4caad19e1fbeb23cfd77602e20bda8ad4fc532
 EBUILD ansible-1.4.5.ebuild 1678 SHA256 c4407b4513563e428b74dfed3ce1d6e9acde0c6a5073cc6736fe5873a0072f2a SHA512 06a8f8a46796b70230c8bef866c18293bf571f355861e73a63353ec7518eada0d4f085158aa33df34f93aa7f7100decbb32e7ae827502a13bed03f4ec3ebbf8f WHIRLPOOL 77c1c8e1afe13da0f21589a003f125acb04819144e2f83d648e8698b17d6a5c6ce14e36cf006561a534bb6c5e86f907ce282816418e081a43d3d40089d412d2d
-EBUILD ansible-9999.ebuild 1678 SHA256 8d21d2c7c0bc39d4db67a4572e9f7be536664fed9565400e7d9a651a1ad1c049 SHA512 baa6cdd75d90703d7e20f7b056515aaa8c8637feaf66aa9f071c98061ade52e07f99f4f31cbd5814916ea39dfb850ac1b311a22f5ce0c65e577d955bf19cf964 WHIRLPOOL b8f77a2cd8b30c4b7c8ba19bfb47713bba5ac3cc90cbe2e10ea967ecc52dbeead75155b514718305ecffb722b74e33c26b99c6fe0438e1fdee0f8fbc83f27d76
-MISC ChangeLog 5579 SHA256 679ebcb1f0ab7be4cbfb8b52c42e34c61ef713813565d1dd556c1fa4d3839968 SHA512 ffdf221d04887ee030f53c4b3c555e75e6849c773972edb0369aab159607f807cf346c86be4ed45640afc3d23bd138d91151f42afc0a36a4e84db10db6bc52b1 WHIRLPOOL 198b1bd54bf03b699a4f2d31848dff88473717a4335da7aed75b92d45ac5dfa144ddaff0a5c31b2668003464fc1ddb063212890c89b5b2dfc5d55beebeaf3c52
+EBUILD ansible-1.5.0.ebuild 1516 SHA256 f272097861c470e3f47ec72e564b109124089fe1f8af724994b816d90b812779 SHA512 8dcb13402cc8f5f66523ad161fcb81ffc7968551d3348cb3939a8c9bb7756590aaf3836968236a9afea61c2d0c80c41c35e51a4a10d5b5e11590ec2c357044c1 WHIRLPOOL f00d6711e76d1b078a6e4fb43bb6f1a9b712d4e8a12f2548223db0ddd85c711c53ade95096248c849b262f7c63951c96030e6a5b3c41b3204f23c869769275a2
+EBUILD ansible-9999.ebuild 1516 SHA256 13c3698976759d13fb30f7f52d16f01b707b06b7b4f86871b2fc4f999792486b SHA512 8408f4d99671171c4b388262788cb5d1c2c9a8b94b46415b36c6ec224d8a27f123217b9270dd381ed204dfc5e9892eb61f3969a6e5f57dcef45c1c39009d4d43 WHIRLPOOL 4369654a3bc60b37f3cf8f838de8ca8552273a638f834da003b646498f4d312e9dcc247c5a2c77efb849a28d5bcacd89af8bcb329a6c7b7d56f9d9eeda13f865
+MISC ChangeLog 5862 SHA256 8c4bcf5213e568e89155b29d32568e744f0f41b500552ed2bb6378248372a6dd SHA512 28ceda252df763adaeb4d3db48e822d28c922d07d0b7da227cc1c713d1903f7c4d910ff5c00fdddc0d9b93cd68286de70547a328c387027651d733d1b579194d WHIRLPOOL 4bf4de0172968b5a5955076170d03b3d6e1b41fbedfbb1d96e34d37ea4262bb49b5ca2de1306b4d0234c7b786652cf0a858ff45794c11020d3b4e8273c2fcffb
 MISC metadata.xml 523 SHA256 0c114d8c4cd668f23d77fc851ed059c6116386ff8c39e7817d4a3f821ba01418 SHA512 54be61d702042ec2cfe0681c76bf4f86668878072d8009c0b7173faa15d1a73f5fb15bfb6ca8d4b132bccaed0b47b4ec6085e1d88ab9124bd7a34bc16e73ed1e WHIRLPOOL 66db565db3bb92934610a6ff408a0712cd6f8d962fb1c702ceab4813243ff2b910d510d0ddc91c3a8ab678eadfb385235a4bb1916942e024f162646ceac99c42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTFHMyAAoJECo/aRed9267OPcIAKgUUm/cAOudXCxXc6XiDvf5
-sKcIGNEEI9tZrZHQIpaFJcJ0RwEhRSG77M7sobFP2EoQ0gPorKFsNGKYAWL7j5ok
-OTBQngQpjCYbWQmOo6VlDkHNcCJWpyg5sYZ/Ud3LfXpVLV4/hAO+UGKVcrtVpS5f
-7SzDIWFonGQ9OSLTNKhhycJfX67JSkXFQT8bzr+ohnkl/Zli/3yUSM15AyuTQZBi
-qAKTAcFN/9waty3DSYh4Kb2Mp1RjhaQADPtTqZa7cAUq0RPqKHWTECdyqHeQhr2M
-tJpcLO4+g8zO9M6R438LB7ldtsccBQeM15fFtmsUPBi3rJdG1WTyrfNRw6FDCro=
-=1rSa
+iQEcBAEBCAAGBQJTFHPLAAoJECo/aRed9267icAIALPt3mNzJQAcujZ2Vlnx3Pai
+cdK6ww45p6DJnF/70a2GVULyUDeGoH8MqmOS/VgoJdL7/GLgEaxuP5NUg92zyCcQ
+4ZkyY6Gxr1Xstqf8aSKjZppJBNQIKnXNqDO6z71WZAM67T/PAscSq6y9/1ktLYBr
+yMiA97GQWfoKYOxxxPBx+YzBi4sF79l7X6tR6WPaUiFymRvieFAXMnMc6uClBMn2
+w742emuoahaaIIF58V91YvhxDCQTLxgyp6HXbn1lrdoKGwxkxq5r/hBaXeBqCl0K
+5nEla85JRhv6JdQ8HVVQNnjb8ovoWKcwlPku2SWXOfs+y2/kImb7de1XZalJEIQ=
+=RWNQ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ansible/ansible-1.5.0.ebuild b/app-admin/ansible/ansible-1.5.0.ebuild
new file mode 100644
index 000000000000..93091fb62c0d
--- /dev/null
+++ b/app-admin/ansible/ansible-1.5.0.ebuild
@@ -0,0 +1,57 @@
+# 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.0.ebuild,v 1.1 2014/03/03 12:21:30 pinkbyte 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/keyczar[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/paramiko[${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"
+
+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-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index c11e768bf57f..4945d5a73ef2 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.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-9999.ebuild,v 1.15 2014/03/03 12:18:57 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-9999.ebuild,v 1.16 2014/03/03 12:21:30 pinkbyte Exp $
 
 EAPI="5"
 
@@ -26,6 +26,7 @@ DEPEND="test? (
 	)"
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/keyczar[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	net-misc/sshpass
@@ -37,12 +38,6 @@ 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"
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	# Skip tests which need ssh access
-	sed -i 's:$(NOSETESTS) -d -v:\0 -e \\(TestPlayBook.py\\|TestRunner.py\\):' Makefile || die "sed failed"
-}
-
 python_test() {
 	make tests || die "tests failed"
 }