From 9e746d3c13151bb08cc0ad40685b99485f9e4cd5 Mon Sep 17 00:00:00 2001
From: Sergey Popov <pinkbyte@gentoo.org>
Date: Thu, 14 Jan 2016 14:55:46 +0300
Subject: app-admin/ansible: do not install obsolete env file

Package-Manager: portage-2.2.26
---
 app-admin/ansible/ansible-2.0.0.1-r1.ebuild | 59 -----------------------------
 app-admin/ansible/ansible-2.0.0.1-r2.ebuild | 57 ++++++++++++++++++++++++++++
 app-admin/ansible/ansible-9999.ebuild       |  2 -
 3 files changed, 57 insertions(+), 61 deletions(-)
 delete mode 100644 app-admin/ansible/ansible-2.0.0.1-r1.ebuild
 create mode 100644 app-admin/ansible/ansible-2.0.0.1-r2.ebuild

(limited to 'app-admin/ansible')

diff --git a/app-admin/ansible/ansible-2.0.0.1-r1.ebuild b/app-admin/ansible/ansible-2.0.0.1-r1.ebuild
deleted file mode 100644
index 41ee7d41fd63..000000000000
--- a/app-admin/ansible/ansible-2.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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 versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="keyczar test"
-
-RDEPEND="
-	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}]
-	>=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-2.0.0.1-r2.ebuild b/app-admin/ansible/ansible-2.0.0.1-r2.ebuild
new file mode 100644
index 000000000000..ddf6e660fb03
--- /dev/null
+++ b/app-admin/ansible/ansible-2.0.0.1-r2.ebuild
@@ -0,0 +1,57 @@
+# 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 versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="keyczar test"
+
+RDEPEND="
+	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}]
+	>=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
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index b8b7a701384c..656b4c7583aa 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -60,6 +60,4 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	doman docs/man/man1/*.1
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
 }
-- 
cgit v1.2.3-65-gdbad