From e6777daf743073d72eaed8ac321cdd58ea78541b Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Tue, 12 Jan 2016 11:09:19 -0600
Subject: [PATCH] app-admin/ansible: bup and upadte 9999

Package-Manager: portage-2.2.26
---
 app-admin/ansible/Manifest             |  1 +
 app-admin/ansible/ansible-2.0.0.ebuild | 60 ++++++++++++++++++++++++++
 app-admin/ansible/ansible-9999.ebuild  | 32 ++++++--------
 app-admin/ansible/metadata.xml         |  4 ++
 4 files changed, 79 insertions(+), 18 deletions(-)
 create mode 100644 app-admin/ansible/ansible-2.0.0.ebuild

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index bd11ba009e20..e33a7c5bedf7 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1 +1,2 @@
 DIST ansible-1.9.4.tar.gz 937120 SHA256 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 SHA512 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586 WHIRLPOOL 0b88a27f690ff940eae1969ff163d8f8c26df038d2e9aa76694bdba1448ac9cbe8123795d0787e528c6d22cf66cc01d6b89add8e3e97bbb107a3f1a96860fd8e
+DIST ansible-2.0.0.0.tar.gz 1512605 SHA256 63a9386ae96bd6ae3e87b9e9fecef3f3f919f333ed8db22292e37df7643cb3f6 SHA512 7902033e0eda5c768aec159b3a1d9e0f3c9b480c426dcddd053fc608c5e986cf417068f71627efb03fd83392e29dfbcf4487c87430ffd599908b43d079b047d7 WHIRLPOOL ca818ccc1c217e98be7475ca78bad3b4bdb6c728f4a5ae11ed0b7e6f26476ae0217edb284f1c034948c066dca2817a4a0107c1771f53d03b05ec2ee895060abb
diff --git a/app-admin/ansible/ansible-2.0.0.ebuild b/app-admin/ansible/ansible-2.0.0.ebuild
new file mode 100644
index 000000000000..00c636683a85
--- /dev/null
+++ b/app-admin/ansible/ansible-2.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+# the version here is special because upstream did a 2.0.0 release on accident one time...
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.0.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="keyczar paramiko test"
+
+RDEPEND="
+	paramiko? ( dev-python/paramiko[${PYTHON_USEDEP}] )
+	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	EXAMPLES=( examples )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+
+	newenvd "${FILESDIR}"/${PN}.env 95ansible
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 4284a69a020e..1b2d86bc7f92 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,26 +6,28 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-r3 readme.gentoo
+inherit distutils-r1 eutils git-r3
 
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="http://ansible.com/"
-SRC_URI=""
+# the version here is special because upstream did a 2.0.0 release on accident one time...
 EGIT_REPO_URI="git://github.com/ansible/ansible.git"
 EGIT_BRANCH="devel"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="keyczar paramiko test"
 
 RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
+	paramiko? ( dev-python/paramiko[${PYTHON_USEDEP}] )
+	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/keyczar[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
@@ -33,9 +35,12 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
@@ -58,12 +63,3 @@ python_install_all() {
 
 	newenvd "${FILESDIR}"/${PN}.env 95ansible
 }
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	optfeature "Alternative ssh transport" dev-python/paramiko
-}
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
index 366ed317ae16..c1a50002164c 100644
--- a/app-admin/ansible/metadata.xml
+++ b/app-admin/ansible/metadata.xml
@@ -18,6 +18,10 @@
     <remote-id type="github">ansible/ansible</remote-id>
     <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
   </upstream>
+	<use>
+		<flag name="keyczar">Enable accelerated mode for old ssh clients/servers</flag>
+		<flag name="paramiko">Enable the use of the paramiko transport, an alternitive to ssh</flag>
+	</use>
   <longdescription lang="en">
 Radically simple deployment, model-driven configuration management, and 
 command execution framework.
-- 
2.26.2