Version bump, wrt bug #475602. Remove examples USE-flag due to upstream changes. Sync live ebuild

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

4 files changed, 84 insertions, 25 deletions

diff --git a/app-admin/ansible/ChangeLog b/app-admin/ansible/ChangeLog
index 418ed9282ba6..36c723b72680 100644
--- a/app-admin/ansible/ChangeLog
+++ b/app-admin/ansible/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/ansible
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.19 2013/05/25 11:11:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.20 2013/07/16 12:23:02 pinkbyte Exp $
+
+*ansible-1.2.1 (16 Jul 2013)
+
+  16 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> +ansible-1.2.1.ebuild,
+  ansible-9999.ebuild:
+  Version bump, wrt bug #475602. Remove examples USE-flag due to upstream
+  changes. Sync live ebuild
 
   25 May 2013; Agostino Sarubbo <ago@gentoo.org> ansible-1.0.ebuild:
   Stable for x86, wrt bug #471226
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index f40545ea8d5d..1938ccef2b9b 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ansible.env 99 SHA256 04a806ca12249b1b1387e17cabd85c8b09bac64914650d7a776576153e32591f SHA512 79d0d6581116ede67d6b184d1a16c2ba6586d4ca8cd71047bc5a81a82696b0e1a124f22248877aefc0a810f0ae3bd2724dadaf71dd5078bbe0910a9e8c3ab111 WHIRLPOOL f347143d490cf1dd6784059022fb7c6c85eaa5e957b6b5eb85f6b1b8a98d1b90c26aa0602fe2cd6679c4709fb9dad2fa67bc53326bfca80205cb7b7ded757c90
 DIST ansible-1.0.tar.gz 629525 SHA256 6e9bba5eef2575284bfc533c0cc751468d7a07dd608845437c2f96fc57653a54 SHA512 d5f84184cb7c0bc086ee726188d5e13533172cb219b6dde0a570b165540f08f64ca708b515e52fb95b1675755f1f90550a962c3b51fd085763389daa12ec971a WHIRLPOOL bb0cdbe096e4dcf6cf1d473b4678e9a3deec59d34da5fdebe1d80b20b781392a841bc5641fefc7f0f581be79c4829f9436792545cc2dfd0f70097d9d16213935
 DIST ansible-1.1.tar.gz 718567 SHA256 85331eda53171fc5faba9835f978e721c091b2f9792bd3e29dccdde5a16a1125 SHA512 cbe816b109077cee01a0fb92d11e0a1caad3a8ea7bea3a7fd77f1ad82bfe69824736c222072f8d98e8ebaf1e24f1b4a98c87eba5d950f7dc36259cfe6774d067 WHIRLPOOL 88597c5c37bc9653c5c9df5b9e846f13f939ee84b961c041c5b3f9f9e2592a24a7e6ac5a1581ac52b89328aa906d67c74af363500f72510263951625c3c9db67
+DIST ansible-1.2.1.tar.gz 777619 SHA256 5b46639fea3576233c8f235468a8b19f0b180fc0ddd6ede3014bc570362c5e66 SHA512 4efe9583f91e36bb07787d272b6a5e79d1cd37e17d1d1bdbcf99c54736838642cba051601e95b38b957deb9d7ec92c11b84da6fa4984bdeeee3b951b6df94ac3 WHIRLPOOL ad63ac251b0ed3f2ba48feb742271498f698b956cfc6be129080d0e33b086180a41d5c99f45423eebeab1a3a191048d6ee8d71311e81871368e2235a25a73705
 EBUILD ansible-1.0.ebuild 1623 SHA256 7e2971067a5ce06f98d88dfb77413c4805e098ca790cd5936780f71684bccc13 SHA512 4c8f079f57ca4daf2f0e768c34085e012873adae7ff866eecd310758402e7d590e1aec4ab6e4bc9469ac5ce2c9e087fe8a77a623edc4051b91294ff0daa12391 WHIRLPOOL 17227af2c83b42d74111d654f8232db9692a34b40da5cff19daab95c19065e1025b5c8839b5d5dc1374d0041bfb2b472f4a02e5d16101ff8b9cff73c9dfc84a9
 EBUILD ansible-1.1.ebuild 1566 SHA256 b80d6bc404e743f4cdbc8176183316d784e9f4e80fa4d7a6886f69255239d02a SHA512 d2aab5aa819f5c7dcac21601a0a2610c9a04600d2c3f703fbc1b83fba5f8a08efdd1f843af760427ff23327734ad4978873031737fc8069c95c4170250d443bd WHIRLPOOL aee775bb53c8cb77ee32e2075f0c47fcb15a2437a9074c493e279939f6aa05d5f3413eeec36a2cc554e347fdfefc42c07556dd3617bcaca6a30dc566e14cca50
-EBUILD ansible-9999.ebuild 1568 SHA256 33255eb8b2f243e2319e543b9da5c9a5ed17717fa18bff4dc7b5a66043b48e51 SHA512 876997aabd11e57ac9c7e2d3f7166cf81882651a7257a2c4f2f80651c1d8fc50ef7cf38f86c8adffbc7985eacf0dd4a5068ec9a9d21cec2d65d641b46c5e417f WHIRLPOOL 95ca98e610d068fcb00317dc45f72cdcd04e95cd2efcc1f38ea37f1c2e2b9e6576d5034c028b28221bc4d1cdb2748b4d4d33eaf41343ab9994aac1bd9e1a09d3
-MISC ChangeLog 3314 SHA256 25d9090baad66a2a6f3fda7846f10f186d1560d8e5fa68cd10c68a1d1851b2f8 SHA512 695b1022d7d57a0fc064c7b7beeeb5612217a6ff3fc0b4fdb3a5d4b6e5cf003c168cd5d13a47475fa02b6ab0e04bf87ac16d1eb373d396c0189d5de11e6d165f WHIRLPOOL 9d30b93500bf463daf1bf0ea4e266130a4d6bb70df66f118ee51781c7cea42b6a6bd20f370f53700fdba1e04039f958182b730cbca7e0878c527aeb1d0d5f903
+EBUILD ansible-1.2.1.ebuild 1520 SHA256 cc380b79484f4f583938894fc8fee68f4a2db76a2dfa12d2d6775a5f2acf47ca SHA512 36708eec915e4ac3ebab4f43eb67114476b43ee462c971d3d1b226b6305e89a225946aa09149f8c808e7fa39b3c091afffc919c03b3694c3c04eaa271ac68f75 WHIRLPOOL 713a4c56ff57148c17e75af3e0ad04c86b3a3da3a590272418a23427ad1d38f1ab23372aa5b410b3e713e32d36e7e4237db5a2510ee01d4898c354714cc06ca0
+EBUILD ansible-9999.ebuild 1520 SHA256 ac58a5941e05a4cb5797ecf88c1c798b8bf5cf7f1c7f6969e4dd2e5e4536577d SHA512 ae7bbfd5f44239ade420096ee7f96b1fdcc5263f241620ef082adf2dfb167a54234eb24b843c7853fcfbdb96a2cee940a3685e5a695fe6b8fe278ae74280e70e WHIRLPOOL 20ebf7dbecc5803c4d90755a0ca438fb7bbd0e84611df3869d0d057518c3cf60c461372b808ce382f632b2849cd19b51b92f61f3ab37c3933d7a89b4cf9d9299
+MISC ChangeLog 3548 SHA256 b5439faec6094e6025daf899a127d31ad2f262483cb20f068dc916f2145a8060 SHA512 8673e40a65708d1f057e5a781443967be3dc9222128d3ede6fe90273d30c9a1090f7ea1f4bc6f46ca84e19ba3f321b2a96eed2a16bde0a0ba011f07b88d4e367 WHIRLPOOL 35dff3f9d71c5b8204924f4ab4018cf8e268c0b440d0899d33fab9f1addc06a87139816952918af1d74e5bb9f9133c197139f454ccf7c23725b331e5c717945a
 MISC metadata.xml 523 SHA256 0c114d8c4cd668f23d77fc851ed059c6116386ff8c39e7817d4a3f821ba01418 SHA512 54be61d702042ec2cfe0681c76bf4f86668878072d8009c0b7173faa15d1a73f5fb15bfb6ca8d4b132bccaed0b47b4ec6085e1d88ab9124bd7a34bc16e73ed1e WHIRLPOOL 66db565db3bb92934610a6ff408a0712cd6f8d962fb1c702ceab4813243ff2b910d510d0ddc91c3a8ab678eadfb385235a4bb1916942e024f162646ceac99c42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRoJx5AAoJELp701BxlEWfLLQQAK8fL2yRHgI+FdErxap6F98L
-Q4BtGBHa36Cb5fR+vGDp1SNi5GDPiy2QhP8AhXSn/c3e5/aQeUm6hxLjRYgjYeB7
-XcHb+1SIjtsXrTmVGfOoz147H6Cd3HkvDKWoE9BKu4fjSw458NCvD+cjqXrzKCRq
-VGZ6CZ7J+JVyHwd0cyZREFzLOL5BL1AOBUOg2igsXzcbopWFrYl81UQD7rGBdR9w
-l8GJnNGlBDQO8izS+Lgf+uxWGndt4tUb0nIbV0mDq2PlWJT3bAR4gnk2+8goBoXq
-ba/OpfvtusjmqQj9aqDcrlLGx4/FHO9QJ0HOmYI0ou0UKK7b4OFAe1JYFzzs2fF5
-MHGrgDoDO8Xc9f4iRMq8JV1rm/eAB2ASIoYPL5WY+vsKHPNr7ozWj6rKyhUDjp6e
-e5lRFNi2npG4DxkCF5YtNDQ8P3iwaocznWgTtpzbPryk9T1tHBKuUdIP88X5UGDm
-xEUryEoAM4ljMSC70FDgbf58E5Xf2dOsCPHUbrAqMlsBI6eR/ljb4z1ytinEKiLA
-YbZbHHm5zETOWWD+86F0HOOQT2+SpVsMupf/EYINJWABoNE1Uo6EA+QGnCfyZxdy
-2EFcKgkOkqkbhP7h/eRa2hGZGvwsOU4IaUsJChGWhc9yNwJ0KkcouQ70qNJRzLUi
-UnOacWBQDChScTwM7lBV
-=AVCH
+iQEcBAEBCAAGBQJR5TssAAoJECo/aRed9267zpUH/RO8cX/4yCce7fOf5NgT+f1s
+kPEL6VXbIxza/wN10pKQX82csePwa5Gm2jd3xqiKQIUeEedhC6PyWomYlhUC/mBJ
+5Rv3KsYobrGHx6cq1gqZcBmg/gqJGYpTf5UjT0DE8vBU4HZ+FquG+ARUTjsN/kaa
+Lr0OarX9rCytwL1KGhu0Xgf0g0dxcO2XoSGmSFUYNETUBkR17TXpgb5xe6Nn0XVk
+SAf2tRxtUkaKu1aT0T4j55mHAsOAzwJ+cbx16bQf+58m1NWIk9h/V5M7Ra3mTsW/
+Tkkqe+dV8EWnzq+nm4MlibhYoj6q4D9LUfM/b8wZVFVGl4AzhJLVJk3YJHgeQzY=
+=dgFA
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ansible/ansible-1.2.1.ebuild b/app-admin/ansible/ansible-1.2.1.ebuild
new file mode 100644
index 000000000000..08496a0d5741
--- /dev/null
+++ b/app-admin/ansible/ansible-1.2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.2.1.ebuild,v 1.1 2013/07/16 12:23:02 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.cc/"
+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
+		dev-vcs/git
+	)"
+RDEPEND="
+	dev-python/jinja
+	dev-python/pyyaml
+	dev-python/paramiko
+	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/${P}/examples\n\n
+You have to create ansible hosts file!\n
+More info on http://ansible.cc/docs/gettingstarted.html"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# Skip tests which need ssh access
+	sed -i 's:$(NOSETESTS) -d -v:\0 -e \\(TestPlayBook.py\\|TestRunner.py\\):' Makefile || die "sed failed"
+}
+
+src_test() {
+	make tests || die "tests failed"
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+
+	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
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index eec5c9bab404..dc3f543e281f 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.10 2013/05/25 07:47:28 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-9999.ebuild,v 1.11 2013/07/16 12:23:02 pinkbyte Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI=""
 KEYWORDS=""
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="examples test"
+IUSE="test"
 
 DEPEND="test? (
 		dev-python/nose
@@ -40,7 +40,7 @@ More info on http://ansible.cc/docs/gettingstarted.html"
 src_prepare() {
 	distutils-r1_src_prepare
 	# Skip tests which need ssh access
-	sed -i 's:PYTHONPATH=./lib nosetests.*:\0 -e \\(TestPlayBook.py\\|TestRunner.py\\):' Makefile || die "sed failed"
+	sed -i 's:$(NOSETESTS) -d -v:\0 -e \\(TestPlayBook.py\\|TestRunner.py\\):' Makefile || die "sed failed"
 }
 
 src_test() {
@@ -52,10 +52,8 @@ src_install() {
 	readme.gentoo_create_doc
 
 	doman docs/man/man1/*.1
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 	# Hint: do not install example config files into /etc
 	# let this choice to user