Sync live ebuild, regarding previous commit

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

3 files changed, 26 insertions, 27 deletions

diff --git a/app-admin/ansible/ChangeLog b/app-admin/ansible/ChangeLog
index e2fe24b7c975..04b7a3926cb9 100644
--- a/app-admin/ansible/ChangeLog
+++ b/app-admin/ansible/ChangeLog
@@ -1,6 +1,9 @@
 # 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.7 2013/01/05 13:38:15 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.8 2013/01/05 13:39:27 pinkbyte Exp $
+
+  05 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> ansible-9999.ebuild:
+  Sync live ebuild, regarding previous commit
 
 *ansible-0.9 (05 Jan 2013)
 *ansible-0.8 (05 Jan 2013)
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 1e1f4405ae42..879c2c57f708 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -5,6 +5,6 @@ DIST ansible-0.9.tar.gz 603309 SHA256 55ba3ca0aeedf9b212b402bc36f206378b3d915172
 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
 EBUILD ansible-0.9.ebuild 1697 SHA256 c30579d185753b5bd82fa397a202ac9eaf9e377cde8a36e6aca8b371e9cff80a SHA512 3b93032d9f8847b33b6b1693feddde5ef2756fac393cd47a93dad25df0fc6ddfc0190ea82592f308f2349c5dd9dd5134f2ca9413cd1f4fd34083396f32316e17 WHIRLPOOL 45a92464b968b34760e495ec5d32816221275d78860e0aaffe2a759595e8825518de40fbe1640b95b917d3e844bfe97e27d7d2538fefb7c88c1e3209f21764b5
-EBUILD ansible-9999.ebuild 1676 SHA256 2c6755281c7a8ed0f761228dfe7f46a1306d114110a2b7b58953bb069eb613a6 SHA512 8186dffd7bc53a7a46a0aef06760b0bb7950db635efe1eebdd33f004bc0bbca77d320b0869782dfa8e22026f7da670b355573620e43ad6a23443c7dfe88b58d5 WHIRLPOOL 0d119d30efbcb406a00ced24e327ff7fbf778c5713913ccadd15436caa30806666d4137336427aa52081e0ba34fab0cf1e4a6fc70024db4a8c2a17cb96ac4733
-MISC ChangeLog 1429 SHA256 a50ccf8338822258ded60e24fc3fe1afc850d6704be32cfa924a99666ae86283 SHA512 1672de22a81f71be15b7900f6059765597429b0797f0b0fc77c03f63958a80f7737f1d8372e508290eb76e2695df46e1089fae4c360ca069e0a8af3cb48cc560 WHIRLPOOL 13739bfa4d162cd7c22b6fab40302c4ba3ff67f14a0ba116320a0e918a83b7ec8beb619284d58763817e43409fd12e70af460c3ae816bac8c5cbe6590d02edb5
+EBUILD ansible-9999.ebuild 1698 SHA256 cad10dcfe97ae70254ca98210bca5845abc59c914d696b49a0b5ad268e9159c9 SHA512 a4c5c783099b98e6c89c1d72a8b2b4eb28ba03fad21f14c7824fa37f0c0a6f7af3f3467aee40210f5be22ae9d62beef1fdd5ffac63e700160e974411a7b3ba3a WHIRLPOOL 2fe2ce0ab7e75749e59e77d418674402a43c6b90bb5a0fc626bb2a7c7efdda4c8a81662cce62e4f039e17c976bcef32158f7cc72f9908fa9e3b86f7b7c3c781a
+MISC ChangeLog 1547 SHA256 57787d7d0fa8e3ba89b08472fba050b22cfa0cb2fe9baf9f87fa8eab0bede6f0 SHA512 c4bde684e1d17ea086cbb9bf882849ed75bfd9c7f46d79b57d70dd7e4da1438740010fc68a191d67e03a9be29063ffe881c408438c1e93f96ad99aefb2c7ef76 WHIRLPOOL 82a273a7748dcf7326cc358a72ef511360bd3e0c5f60943b8c5e5c14458f8c8db7107f203d3d2096f1d9d5fb3759b5abba1002732ed68a3d8ef89669e605677a
 MISC metadata.xml 797 SHA256 4f1cd2cc212b4f25b5855d0d63962624ea62927bc336a5b8f589e2a541dfd091 SHA512 145019e574064431624824df42213b52b8f464d6ff098aec05bebb022d63b817e6e5f791e8153741850e051f5b3d4c91b20a06a4b2e05465c96ffb3dfbf5b0a7 WHIRLPOOL e5e7c98f351f2ab0e586f91fbd33f3e44f01d58459c71af2c6899ac98e71f1330bbc3309cd3803598e2d3e6e2b6dadf3424bb84894a8dbc788b03abc5fb9d4e2
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
 }