app-admin/ansible: 2.3.1.0 stable amd64 and x86 and cleanup

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index fb28f16016d8d2b5eb95caa3b16b2231674cdb23..bcc9f9164eef2c0c9b880947b82dfd522435d2cd 100644 (file)
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,3 +1 @@
-DIST ansible-2.3.0.0-pycryptodome.patch 32449 SHA256 a87d712305160ef8a559bf9e27d7fe4361889f45da5ba501c4a9ae8c6c58e504 SHA512 f52611275262d772b2e44b858c59590ab18ed29c22899c0d8b47f3a21c71aebff9aab1a2284bdf44fbc47b63c3836851db1c065bafe0b6883bb582a98cf4d0a4 WHIRLPOOL bd344c2507eb8576a114e5618d182b90443a92d4cd57f27310eb495dbba123853503c64c69338a02ce680b615862c819985913f2860e3dde670ef929dcd5761f
-DIST ansible-2.3.0.0.tar.gz 4251730 SHA256 299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458 SHA512 88ac28befefd7a70c36d8c33bc1aba1b0a5ffdea4bddd0b9e6c5488c70057662812208c221e47721c5a194fc30282a33490f196a719d9eb6d9b1e7dcfd1ff941 WHIRLPOOL a6a622f17476c07e3446a7b09631027797ade04f7d1571e0eafccc2736390deabfcdd36fa1e849d209eb7ab5f1e3e86f2b6e7dd3032db1743665165c1dc710ba
 DIST ansible-2.3.1.0.tar.gz 4263357 SHA256 cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5 SHA512 7b4b33c56a15c41d756f095944d7a0dbf894557350879430df21061b717b9574aae624a276bf7e1a13d043b718aeaccac1ce510a3cb085983311ddf06fa832bc WHIRLPOOL 5552ff64e8cac722a705bd1e72465c8bfe583a1c5efc587ca141b34eaa35d2af0ea2e1084a072ecb7dbb28d59d7f56e47c4c73f9e3e0f7f2451ef4e7134ad1af

diff --git a/app-admin/ansible/ansible-2.3.0.0-r1.ebuild b/app-admin/ansible/ansible-2.3.0.0-r1.ebuild
deleted file mode 100644 (file)
index e813dc5..0000000
--- a/app-admin/ansible/ansible-2.3.0.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="http://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-       dev-python/paramiko[${PYTHON_USEDEP}]
-       <dev-python/jinja-2.9[${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}]
-       >=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=( "${FILESDIR}/CVE-2017-7481.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.0.0-r2.ebuild b/app-admin/ansible/ansible-2.3.0.0-r2.ebuild
deleted file mode 100644 (file)
index 000bb85..0000000
--- a/app-admin/ansible/ansible-2.3.0.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="http://releases.ansible.com/${PN}/${P}.tar.gz
-        mirror://gentoo/${P}-pycryptodome.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-       dev-python/paramiko[${PYTHON_USEDEP}]
-       <dev-python/jinja-2.9[${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=( "${FILESDIR}/CVE-2017-7481.patch"
-         "${DISTDIR}/${P}-pycryptodome.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.1.0.ebuild b/app-admin/ansible/ansible-2.3.1.0.ebuild
index a1704fce31a31e209f59801da4b5dd494e378555..79f0274da90759ccdbb53b20251db3adbb9a7c32 100644 (file)
--- a/app-admin/ansible/ansible-2.3.1.0.ebuild
+++ b/app-admin/ansible/ansible-2.3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="