4 files changed, 21 insertions, 87 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/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() {