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 2e30874d0da77ede3ec4256e8afa0a9055592360..41ee7d41fd63042f7cbe7faaee799189234fa753 100644 (file)
--- 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 1b2d86bc7f929dce943444aec8784c4feea84456..b8b7a701384c3862eba96a6b4746a59845ad7775 100644 (file)
--- 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 b99919364d81b216c6023a6b1f721ff40feb5339..4ee44fd1745ac27dbb60cbb4861efa226d0f3636 100644 (file)
--- 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