From 45a2dd363d1049d6b762d6c7e04a08701ae5b498 Mon Sep 17 00:00:00 2001
From: Ferenc Erki <erkiferenc@gmail.com>
Date: Fri, 8 Sep 2017 13:37:53 +0200
Subject: app-admin/ansible: add netaddr dependency

Otherwise it complains about `AnsibleFilterError: The ipv4 filter requires
python-netaddr be installed on the ansible controller`

Package-Manager: Portage-2.3.6, Repoman-2.3.1
---
 app-admin/ansible/ansible-2.3.2.0-r1.ebuild        | 64 ---------------------
 ...ible-2.3.2.0-r2.ebuildansible-2.3.2.0-r1.ebuild | 65 ++++++++++++++++++++++
 app-admin/ansible/ansible-9999.ebuild              |  1 +
 3 files changed, 66 insertions(+), 64 deletions(-)
 delete mode 100644 app-admin/ansible/ansible-2.3.2.0-r1.ebuild
 create mode 100644 app-admin/ansible/ansible-2.3.2.0-r2.ebuildansible-2.3.2.0-r1.ebuild

(limited to 'app-admin')

diff --git a/app-admin/ansible/ansible-2.3.2.0-r1.ebuild b/app-admin/ansible/ansible-2.3.2.0-r1.ebuild
deleted file mode 100644
index b51950900bf1..000000000000
--- a/app-admin/ansible/ansible-2.3.2.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/ansible/ansible-2.3.2.0-pycryptodome.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${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}]
-	>=dev-python/packaging-16.6[${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"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-2.3.2.0-pycryptodome.patch"
-	"${FILESDIR}/${PN}-2.3.2.0-fix_key_error.patch"
-	)
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-}
diff --git a/app-admin/ansible/ansible-2.3.2.0-r2.ebuildansible-2.3.2.0-r1.ebuild b/app-admin/ansible/ansible-2.3.2.0-r2.ebuildansible-2.3.2.0-r1.ebuild
new file mode 100644
index 000000000000..aff0f1b8ef36
--- /dev/null
+++ b/app-admin/ansible/ansible-2.3.2.0-r2.ebuildansible-2.3.2.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/ansible/ansible-2.3.2.0-pycryptodome.patch"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	)
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${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"
+
+PATCHES=(
+	"${DISTDIR}/${PN}-2.3.2.0-pycryptodome.patch"
+	"${FILESDIR}/${PN}-2.3.2.0-fix_key_error.patch"
+	)
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	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 b0d2a5c8be6a..114b173baeee 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
 	app-text/asciidoc
 	net-misc/sshpass
 	virtual/ssh
-- 
cgit v1.2.3-65-gdbad