From: Matthew Thode <prometheanfire@gentoo.org>
Date: Wed, 13 Jan 2016 19:31:27 +0000 (-0600)
Subject: app-admin/ansible: statically importing paramiko now :(
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4d85b2dba272f726de37cf8911329b0f9ed07429;p=gentoo.git

app-admin/ansible: statically importing paramiko now :(

Package-Manager: portage-2.2.26
---

diff --git a/app-admin/ansible/ansible-2.0.0.1.ebuild b/app-admin/ansible/ansible-2.0.0.1-r1.ebuild
similarity index 94%
rename from app-admin/ansible/ansible-2.0.0.1.ebuild
rename to app-admin/ansible/ansible-2.0.0.1-r1.ebuild
index 2e30874d0da7..41ee7d41fd63 100644
--- a/app-admin/ansible/ansible-2.0.0.1.ebuild
+++ b/app-admin/ansible/ansible-2.0.0.1-r1.ebuild
@@ -15,11 +15,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="keyczar paramiko test"
+IUSE="keyczar test"
 
 RDEPEND="
-	paramiko? ( dev-python/paramiko[${PYTHON_USEDEP}] )
 	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 1b2d86bc7f92..b8b7a701384c 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -17,11 +17,11 @@ EGIT_BRANCH="devel"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="keyczar paramiko test"
+IUSE="keyczar test"
 
 RDEPEND="
-	paramiko? ( dev-python/paramiko[${PYTHON_USEDEP}] )
 	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
index b99919364d81..4ee44fd1745a 100644
--- a/app-admin/ansible/metadata.xml
+++ b/app-admin/ansible/metadata.xml
@@ -20,7 +20,6 @@
   </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