Version bump, wrt bug #461830. Sync live ebuild, drop old versions

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

5 files changed, 39 insertions, 93 deletions

diff --git a/app-admin/ansible/ChangeLog b/app-admin/ansible/ChangeLog
index 241dd7a3afe4..42faa09a7eb8 100644
--- a/app-admin/ansible/ChangeLog
+++ b/app-admin/ansible/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2013/01/15 15:18:28 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.12 2013/03/30 15:56:34 pinkbyte Exp $
+
+*ansible-1.0 (30 Mar 2013)
+
+  30 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> -ansible-0.7.2.ebuild,
+  -ansible-0.8.ebuild, +ansible-1.0.ebuild, ansible-9999.ebuild:
+  Version bump, wrt bug #461830. Sync live ebuild, drop old versions
 
   15 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> ansible-0.9-r1.ebuild:
   Fix docompress call in src_install
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 9e3ce60a581a..ee3c0145b42f 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ansible-0.9-distribution-fix.patch 902 SHA256 70d3c64a3a689ca1a00bb8982b49993c5dc04ef6abc0087fce0de910900674ad SHA512 03e9d47e46fc4993b710c2c00fa7b8fdb1fae2e4369628db29709b1aff3cf0ff7924cbae228933651329e53742b49130ffc5d13bc272dd015cf2942ee1696abd WHIRLPOOL 66af6b2f104d869a7a5c76b08bcb807fbf0c9ecf426cf1d119466d2a579ad0cdcd1b40e2bd33d728913d8445fdeb64e93e939653b809ce2ac0e322fc37623cf9
 AUX ansible.env 99 SHA256 04a806ca12249b1b1387e17cabd85c8b09bac64914650d7a776576153e32591f SHA512 79d0d6581116ede67d6b184d1a16c2ba6586d4ca8cd71047bc5a81a82696b0e1a124f22248877aefc0a810f0ae3bd2724dadaf71dd5078bbe0910a9e8c3ab111 WHIRLPOOL f347143d490cf1dd6784059022fb7c6c85eaa5e957b6b5eb85f6b1b8a98d1b90c26aa0602fe2cd6679c4709fb9dad2fa67bc53326bfca80205cb7b7ded757c90
-DIST ansible-0.7.2.tar.gz 140922 SHA256 4eacbb7b08f0f7d67d41c58a275296c8babdae805b94e55e112267c03edcbf84 SHA512 0ec4115ebaa0bf9f1626540a85e6a99aaee3599231d29d972ed1fbe0e40b96ee8addbada5c038422472a6e86a39a107e85e703dcba48344ec9040bf1c4d869a1 WHIRLPOOL d8c8111211d3a56d49118cd58bcc1a33c5160045ba20db08d0647b240a79dea49b1cb47bf6dbd6b3a6ea0eb79091fedf8b51463f6e5d3592680749c1188008bd
-DIST ansible-0.8.tar.gz 573661 SHA256 04f8cab0136f048c55699e543170b261b32b1e09afaee42e2bb41dcbb7d7dde0 SHA512 56875e8ae6cf738e46a1da8d6fb1b2ddd1ceaffc4e917c40b95c243839234fc93673deebe4adbfb1b90312b5805cd9172692dc6f54964a82ea4f8d7920ef5ccd WHIRLPOOL f677c0e8e9b184a27724aa5e5082cde146124fa86eb64a5e015efe8f872d5c5b93a4a590a34df8d8009f97c62146398410297f16c50e54be7767d6d36a1234c4
 DIST ansible-0.9.tar.gz 603309 SHA256 55ba3ca0aeedf9b212b402bc36f206378b3d9151727b35b0b1eda90d7b07da27 SHA512 f1daff617cf0816543190b5f67a55d8addddfb90936023bc93d02e603bb3e4a552240484285ea0dcc5776e58cfc802bcf6e552c10c72c6f4ff09bc0df668fc58 WHIRLPOOL 6388cc9663e16211a7f80ba407ade396029e0f30eb540609cd09830b9277d38df81e7a9e23a0873fc5d9e7e76bc6eb34ba019f0e4aac58c467afb4214366a298
-EBUILD ansible-0.7.2.ebuild 1698 SHA256 dcf0001c0b04ec04d0952f148b24d8a341badde1047aafdc8ec512b1863676bd SHA512 765f4a52288a0af0429a8e987d9d35e432aaaf3bc58e0c17f8680350ff3d693a229aeb359a29446e73dc7c3dfb8b4578655bd08c99397a58482859c9faf97a46 WHIRLPOOL 3c3020f59a330b1d153592d9c6b9a985145ff6807b503cb7e7063924ce35a83f310f9b942393245deef3b9b44ddb202c344cbbe6700686fa78240404196eea5e
-EBUILD ansible-0.8.ebuild 1696 SHA256 66ac44a9b82738c136991b1cb96a9c1b59813e624c12b62160237328bfa5528b SHA512 013cf345ec50691d8ed99b451bf9f1d79050bfa8603f13f2144074662e3e1e8a702931bd30cd8e1923059cb289d665e5d323e96d6749368f5a17a29a90e67f07 WHIRLPOOL 7835db61e5d43cc6e152eac5dfbfe3bd21f233ee8364379eb118c11b9c6ecd562591821a3650cee66fcb98a2f9060ec4b3f33da10a8c60badfe555f993bcc24d
+DIST ansible-1.0.tar.gz 629525 SHA256 6e9bba5eef2575284bfc533c0cc751468d7a07dd608845437c2f96fc57653a54 SHA512 d5f84184cb7c0bc086ee726188d5e13533172cb219b6dde0a570b165540f08f64ca708b515e52fb95b1675755f1f90550a962c3b51fd085763389daa12ec971a WHIRLPOOL bb0cdbe096e4dcf6cf1d473b4678e9a3deec59d34da5fdebe1d80b20b781392a841bc5641fefc7f0f581be79c4829f9436792545cc2dfd0f70097d9d16213935
 EBUILD ansible-0.9-r1.ebuild 1778 SHA256 6add6acbf1eb3eb28cc2e2887c670299e88fec267bbe240f29fdda3bf54e6766 SHA512 8e4657db4f3e0abebc89f0a95f87429b2ba47db0d1e3ded82c2e140a4c5cd9111751ec7957b9cfdea3ed3534cec781dc299c872675befb94cedd5eb34cbbc0cc WHIRLPOOL 0dea2ea13b88e55d674d686a9c7bac4aa1d47b63b480d68760c789514a59bf3641aec8a6a3c8587117f2e3a14f85e21c8cf5ce12dafe42872123c091fb690cff
-EBUILD ansible-9999.ebuild 1721 SHA256 f99741536b6b8afc8c05ca62b81db615b3e1a0ad0a94fae7a03ca6cdb1cd0b5a SHA512 bdefd3781f7e9c4f39575c1ad41eaeeae107f969646bf151f508dc0c578525ef564cbe58f5e26d0272b9a3911cfdb1da9ac015787a2c2c78c197148714d40e7c WHIRLPOOL 912bae17705618306a076a69ee1d6316f2d418c5d1aeb41be946d930c1c22a349d8069521fc1ee010b4cdbb9a7d33444716b508511541a72923b5c784852ef59
-MISC ChangeLog 2036 SHA256 df71c6cfb085c908ef8ac278fa0453cdc5898ef78420dd9145e91ce7bec5e85a SHA512 4d419bcb7f9ef05edaed084ff0f063e4865639929550bf76a3a5151ab4db300ea49cef2f876fa1732036578cdc4447cf4bac368b8459446b956a3be353aa8fcf WHIRLPOOL c2b96193972198f0b7f5e1a8949439e46835e3f0d77b7cc624fcf7a65fd595e8c894890657eed92eb28360b9e760d7b3358291c9c3b9e3fe13a55999a89121d0
+EBUILD ansible-1.0.ebuild 1630 SHA256 8cc72d44045dea2982a00c56e90f650eccc5de5ee85236a3c1cc393a5d4aeb98 SHA512 fd22a86dfac45cf3667630f222152e1eece616181296064b27a2f0490ac15a20205f5eed4732af152d790e10b99383b8dd22ad4691eb8efa57c0fdfda851867c WHIRLPOOL cce0a39f294a7854a5645d396f48070d351d65702a95267abc0a65b2ea5023777804956f65de7a088721f5310e60729c5f9541db8e00420074df7a3fe44b3f61
+EBUILD ansible-9999.ebuild 1631 SHA256 8e6dd9d1e9144ce4de7a9fc80d3112b8033895dc83471b3423ff69204c5f7d6f SHA512 94daa7f5726ac6ee10eb5b48d6c7ac65720962db1e310aca241cf96d019e180e0fcb6dae8a30200f90868f615741eca6eba6f1eb186efc91e054a1b0edf6bcca WHIRLPOOL 3f6e0a63aa279364e95a4d925042597f7430f6cf103978651291c3dac3bf42999437cb055c545dbd9eec7027499739af0c734798e97c98915f4f43d93cd84c3c
+MISC ChangeLog 2272 SHA256 e9a015714c830ed9c8f03c09e6dbc503fdbcab1e6828852be04c7aae1b23d279 SHA512 10ecf0d82b2ab31a0e18161f175a523a45a34405ca0d59c0839cf4c31d891efb57768ac769f9021e67677ee9417ee35e166c7596d195e859d1793822a433c48d WHIRLPOOL c66bb11bf9b6243eaf198d0c3fcfe2d91ecef4074bbc1bad419e16889836276ab60db0a3ef76facd11b4ec59ffd0ec33b49c66155b5f5619527f98056f5ceb4e
 MISC metadata.xml 797 SHA256 4f1cd2cc212b4f25b5855d0d63962624ea62927bc336a5b8f589e2a541dfd091 SHA512 145019e574064431624824df42213b52b8f464d6ff098aec05bebb022d63b817e6e5f791e8153741850e051f5b3d4c91b20a06a4b2e05465c96ffb3dfbf5b0a7 WHIRLPOOL e5e7c98f351f2ab0e586f91fbd33f3e44f01d58459c71af2c6899ac98e71f1330bbc3309cd3803598e2d3e6e2b6dadf3424bb84894a8dbc788b03abc5fb9d4e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRVwszAAoJECo/aRed92676XAH/jQM2W/1OL5uGSmoBaiummNB
+Ab0TeF3CY6dwCTyNm/462iLzCKK2DCW6GbXk30fWU8F9K0pFKeRb1eNvnf/JOKXG
+clzal1eW976QDJo2oxjVqddcXtquqljfbOnvBXI/1sm+0/ukVF0mDjmXjPRaZ97H
+f1s6h8hC34GSKuly7WN6g8k9Tiq38c0+2KwVp5jHnwvDBbqZ3TzLydUrvAQ+xT28
+43wAobT/6dTT+3l4KHvpdOejS8mshFMVycJpU5qkmQ1WTBVhQR8BWKt43I7XFkTC
+cISMdZ+bXpbWdtjLe+OoWKb5aEyAiuaCU/TyCrr0JAFfeStJgDsrfw50vzOrJYE=
+=V18j
+-----END PGP SIGNATURE-----
diff --git a/app-admin/ansible/ansible-0.7.2.ebuild b/app-admin/ansible/ansible-0.7.2.ebuild
deleted file mode 100644
index 8e6c7404f316..000000000000
--- a/app-admin/ansible/ansible-0.7.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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-0.7.2.ebuild,v 1.1 2013/01/05 13:38:15 pinkbyte Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.cc/"
-SRC_URI="https://github.com/ansible/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="examples paramiko +sudo test"
-
-DEPEND="${PYTHON_DEPS}
-	test? (
-		dev-python/nose
-		dev-vcs/git
-	)"
-RDEPEND="
-	dev-python/jinja
-	dev-python/pyyaml
-	paramiko? ( dev-python/paramiko )
-	!paramiko? ( virtual/ssh )
-	sudo? ( app-admin/sudo )
-"
-
-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"
-}
-
-src_test() {
-	make tests
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/ansible
-	doins library/*
-
-	doman docs/man/man1/*.1
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${P}/examples
-	fi
-	# Hint: do not install example config files into /etc
-	# let this choice to user
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "You can define parameters through shell variables OR use config files"
-		elog "Examples of config files installed in /usr/share/doc/${P}/examples"
-		elog "You have to create ansible hosts file!"
-		elog "More info on http://ansible.cc/docs/gettingstarted.html"
-	fi
-}
diff --git a/app-admin/ansible/ansible-0.8.ebuild b/app-admin/ansible/ansible-1.0.ebuild
index 3347ff5ae727..e9626c094463 100644
--- a/app-admin/ansible/ansible-0.8.ebuild
+++ b/app-admin/ansible/ansible-1.0.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-0.8.ebuild,v 1.1 2013/01/05 13:38:15 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.0.ebuild,v 1.1 2013/03/30 15:56:34 pinkbyte Exp $
 
 EAPI="5"
 
@@ -10,24 +10,23 @@ inherit distutils-r1
 
 DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
 HOMEPAGE="http://ansible.cc/"
-SRC_URI="https://github.com/ansible/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="examples paramiko +sudo test"
+IUSE="examples test"
 
-DEPEND="${PYTHON_DEPS}
-	test? (
+DEPEND="test? (
 		dev-python/nose
 		dev-vcs/git
 	)"
 RDEPEND="
 	dev-python/jinja
 	dev-python/pyyaml
-	paramiko? ( dev-python/paramiko )
-	!paramiko? ( virtual/ssh )
-	sudo? ( app-admin/sudo )
+	dev-python/paramiko
+	net-misc/sshpass
+	virtual/ssh
 "
 
 src_prepare() {
@@ -49,7 +48,7 @@ src_install() {
 	doman docs/man/man1/*.1
 	if use examples; then
 		dodoc -r examples
-		docompress -x /usr/share/doc/${P}/examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 	# Hint: do not install example config files into /etc
 	# let this choice to user
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index a47d7fe83129..052ec8cb5c0d 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.7 2013/01/15 15:18:54 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-9999.ebuild,v 1.8 2013/03/30 15:56:34 pinkbyte Exp $
 
 EAPI="5"
 
@@ -18,22 +18,18 @@ SRC_URI=""
 KEYWORDS=""
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="examples paramiko +sudo test"
+IUSE="examples test"
 
-DEPEND="${PYTHON_DEPS}
-	test? (
+DEPEND="test? (
 		dev-python/nose
 		dev-vcs/git
 	)"
 RDEPEND="
 	dev-python/jinja
 	dev-python/pyyaml
-	paramiko? ( dev-python/paramiko )
-	!paramiko? (
-		virtual/ssh
-		net-misc/sshpass
-	)
-	sudo? ( app-admin/sudo )
+	dev-python/paramiko
+	net-misc/sshpass
+	virtual/ssh
 "
 
 src_prepare() {