Sync live ebuild, regarding previous commit

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, unsigned Manifest commit)

1 files changed, 20 insertions, 24 deletions

diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 1bb975a174c7..09e7acdfa0e8 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.4 2012/10/21 14:50:25 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-9999.ebuild,v 1.5 2013/01/05 13:39:27 pinkbyte Exp $
 
-EAPI="4"
+EAPI="5"
 
-PYTHON_COMPAT="python2_6 python2_7"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 EGIT_REPO_URI="git://github.com/ansible/ansible.git"
 EGIT_BRANCH="devel"
 
-inherit distutils git-2
+inherit distutils-r1 git-2
 
 DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
 HOMEPAGE="http://ansible.cc/"
@@ -20,12 +20,13 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="examples paramiko +sudo test"
 
-DEPEND="test? (
+DEPEND="${PYTHON_DEPS}
+	test? (
 		dev-python/nose
 		dev-vcs/git
-	)
-"
-RDEPEND="dev-python/jinja
+	)"
+RDEPEND="
+	dev-python/jinja
 	dev-python/pyyaml
 	paramiko? ( dev-python/paramiko )
 	!paramiko? ( virtual/ssh )
@@ -33,7 +34,7 @@ RDEPEND="dev-python/jinja
 "
 
 src_prepare() {
-	distutils_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"
 }
@@ -43,11 +44,9 @@ src_test() {
 }
 
 src_install() {
-	distutils_src_install
+	distutils-r1_src_install
 
-	dodir /usr/share/ansible
 	insinto /usr/share/ansible
-	insopts -m0655
 	doins library/*
 
 	doman docs/man/man1/*.1
@@ -55,20 +54,17 @@ src_install() {
 		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
-	dodir /etc/ansible
-	insinto /etc/ansible
-	doins examples/ansible.cfg examples/hosts
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo "You have to create hosts file for user:"
-	einfo "		echo \"127.0.0.1\" > ~/ansible_hosts"
-	einfo "or global:"
-	einfo "		echo \"127.0.0.1\" > /etc/ansible/hosts"
-	einfo ""
-	einfo "More info on http://ansible.github.com/gettingstarted.html"
+	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
 }