gentoo resync : 26.11.2017

3 files changed, 11 insertions, 70 deletions

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 3a4ce5e4e06c..7792e45c85c9 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,13 +1,10 @@
-AUX ansible-2.3.2.0-fix_key_error.patch 2733 SHA256 de439ac7f94ec49747ebf9531bab5c2b2d6f706f5c0327ae3b980f58ba8d10de SHA512 fc124b19d7fd2d60ab6d7f5185e23334740ca549a8d06eb093ac194e8f17ca92cb0a64735726e9313d026985182e33eea7f1c56a511aba938216cafa0810ca7e WHIRLPOOL 12d04ce7063c7e8688e49714e92fe7f9b828f119efd0abadfccc83d4199e808b6e9ce744f95a130216f7787099bd9745016921d213dc048dd6d34e8a9bcdea71
-DIST ansible-2.3.2.0-pycryptodome.patch 32472 SHA256 0e204895f8e16e030517dcda40c95c40b20cfe1641e077c15d80ff8fc4b0579a SHA512 cf2b1528176a12e8e48001155d8f2351e1c4914df56ae8b8542a48ccee4158c23ed1eda537ac500f1b71553aa84c574b8297398a82c4c0721ed6f9d08ad5257d WHIRLPOOL 24c9971b643da1cc5321ffe13f1b1ce27f42ab4c273b51ea532746564c0112ce5884072245e282d1525057c2d4117a5fe67d0d305f1a23d1feb9d3d464f1ec11
-DIST ansible-2.3.2.0.tar.gz 4319664 SHA256 0563b425279422487f12616ef719f6e558373b258dcf47e548d119be8d3168eb SHA512 458506da8ae65a80b442834c6047f02eb92acf9f7dd4465c63b4360c4c4817a0f7c48c92a614b91760a54d036ed13f417edf3524bb8a34a8a53ceb11efc928ac WHIRLPOOL 3ce907ba1a08e4d7cbca3c49429f4315f7cfea828806cb4710e2cce6d681a60514f9ca65e702da08a3ae6fc96cc969af73a17d3224e57996ec947438642693c6
-DIST ansible-2.4.0.0.tar.gz 6623856 SHA256 1a276fee7f72d4e6601a7994879e8467edb763dacc3e215258cfe71350b77c76 SHA512 78717b19599bdd46a7285b0b2a4c9d0d5b4cb86fd41dcf0b3340cf65945a55fae4508097058098fbeab871422c31d4f37ab4cd149abfd0af5add6004f65a207b WHIRLPOOL ef957f6b03558f3fd2f711b0551405b1991ec9f404e033e4d9ee074dad07735a651a01d8191d3d111f5e65017621f18711955465547966235048214b3b7bbe85
-DIST ansible-2.4.1.0.tar.gz 6675552 SHA256 da61afb29cc5bd6bc4737a2da06e673fb6fccc3ae2685130d19ab3a8e404fb6a SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d WHIRLPOOL 47fafd256e4d4a74ff6619406b595168ff7ecdf6c0ee0a48d67047d1e29707f46ec6bbd0200fa59f09f8e111c470a597f0533e63a63ca17264511fda77f4a306
-EBUILD ansible-2.3.2.0-r2.ebuild 1675 SHA256 c95a67e676514236d5fb25b6a89f1b16c2b13bd6556b860b0c5dbbcbd3989204 SHA512 7f6c8f28056800aeaf82403de41ef5971b8ea4977b2642f6531132b58e22aa7ff81d49b18f2d57261dbfebaf68e1ed625fa7331ac4cc5f489d2e68de274fe81c WHIRLPOOL 18a3ecd6b0be621ff0083ae94e3dab09191476713a93b932b8d84720ca2b8eb5cdd9b3d4834fe34984e6f786d1c34358d946c79a8ea8a182c1dce8edf1f0414b
-EBUILD ansible-2.4.0.0.ebuild 1422 SHA256 b2dcb4888b3b80c08d1dea667f1d42b07e064ae6e5f446c1431e29fd4358e676 SHA512 227aabc8dfff8bdd0322ee083627daa823a2ffc1897b9abf15d725eda1de89348faa95749f7a0ba77a8f81dcd07c098c7f154508a8426c46a714aa067229ac86 WHIRLPOOL 8881836a053741e3ff838bbd8be534a64cd62ea06ef41b2567bf96399322020e642ee06006acb2643a4435edab54797492a1cfc72c5da48628740a4dfe8c1684
-EBUILD ansible-2.4.1.0-r1.ebuild 1443 SHA256 1551e0c509af271ccdd19bafa6d4fc57cb0a3c961842784ca1bde8bac4d40d67 SHA512 e6ee03e4e356c5063117791a17305d51786f4d3fdbb2d4a856165c743495dadd368aef2fccc224fc3401d1979ab27afbf7623e8d9d2afc6dbc184f956c8df2ae WHIRLPOOL df32df1a2fa8fa3de0016bbbb0ae06d9d69a7f17f7bde0b16d749522fb0e97c5e9bfec3087c4cef2adb7cfb41aa9b2a0a9ebd6568860bd3feca3f6ed177862c6
-EBUILD ansible-2.4.1.0.ebuild 1424 SHA256 554bb873f35f07ba8d1f5b95c910e6396637fdbcf71c41d86e90fc1736ae7b40 SHA512 c5e793a5519429e77994af31a65583b010a12b9959a59c835e2c6131a9d2453257ba82c9199f8ee29284042590dca81bc1f5be9dc9c725769ae4958bfc7a8941 WHIRLPOOL f9c4c7f2cc5390aa98493ea364855948f26338c14dda788a53cdd24a00378bb7ff1e23760f4f945beb18ea98100d3de6b1e355ac59e0ac1c68229fedc721b93b
-EBUILD ansible-9999.ebuild 1512 SHA256 1fe1068d4e982bac357521240af284c9c78981e4d567cda3e35e417491480820 SHA512 69428f04ff25266dc74805609796b6f36b3e2d6bfefae8c7c5b1202fc015b890cf8fec4754a5664e611e2d7f0a9d7e7a014b7be5909097611f5e894a33a38012 WHIRLPOOL 0c9b5709c9eab87af48431ecc1905577cab972310e81b6d1fb5664090777ec0d945669c20fb2cf7c2712641fd8039ac869c36d461a85c4c65ed64752ecfa7913
-MISC ChangeLog 9769 SHA256 199baf005e4d3f8d68566cea3ff4b6410b202cce107ab90504981dac00dd34b5 SHA512 d0f84e1dcbd3628c26e0df2d80ff829cf146f3ab8e6f355c8dc187b2ad5e4be9a1e60f22176e669548f2d355c9659dbeccafcf096de47d52c50842d1b65afac4 WHIRLPOOL b6dba8621dc6d3da894e717f48d9c5ec844c885d594976ef2a759898ba1a9e49db0172b358c0e161e615ee71ab42bc7ddf51a7b77db29e41eed6f5e768d4f5ac
-MISC ChangeLog-2015 11597 SHA256 88b37db76a87a55c7ac0afd355e215dcb788a0217a70561d8a5bdac8af71415c SHA512 25b912511f5763eb335b67a5adf194800b131440c0170b7cb37772e07ee926a2df530586ab77f8963f95b1176e5309de3f5597e7bb57df80f5e025afe83969c4 WHIRLPOOL bee785f57512f313a52908c3e93984138fde5b67ed2f800e6fa7438d6a4fa9517c05aed9326f2b922e6eb89fe4e2ea2f98f4e5a44b5a55747b6ef8fbe4ed0540
-MISC metadata.xml 952 SHA256 7af861810098fe67b07c557dfbe0a898153e0ddc355ff1872550c5ca95004275 SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7 WHIRLPOOL 7f86dd2d6d69882b80b729e1eb9fccf86bca4ac8e3ba2ca46bbd4409411883fa59de0cf58b1a1f7183f88099cda2cb8eb1c6d05b661ab64a01edda7dc9ccdda3
+AUX ansible-2.3.2.0-fix_key_error.patch 2733 BLAKE2B 0ce0c7f6bdd8f42f3796847d16037d667c53c0cc1855d1f0d6101e44425bc4edbf724153ec5e3744621aed18d042b0bce075496dd552ecff3037f1e7738a36ad SHA512 fc124b19d7fd2d60ab6d7f5185e23334740ca549a8d06eb093ac194e8f17ca92cb0a64735726e9313d026985182e33eea7f1c56a511aba938216cafa0810ca7e
+DIST ansible-2.3.2.0-pycryptodome.patch 32472 BLAKE2B 7e46379063586ac29b62afebe225faeeaacdcd15d03e9ac2d241c2581cde4b87a586efb8ca01eb3a00a245676fd176469789187992c4aa6c0ab4d9859b31b9eb SHA512 cf2b1528176a12e8e48001155d8f2351e1c4914df56ae8b8542a48ccee4158c23ed1eda537ac500f1b71553aa84c574b8297398a82c4c0721ed6f9d08ad5257d
+DIST ansible-2.3.2.0.tar.gz 4319664 BLAKE2B e31ecd6652b58ca83a2b4533cb76422b29825ce33aac29eb02567851b19986b80323a6f6c2783a72a9cfc86f691d27a8dd7f24c19b753daa9adc28a7f9885584 SHA512 458506da8ae65a80b442834c6047f02eb92acf9f7dd4465c63b4360c4c4817a0f7c48c92a614b91760a54d036ed13f417edf3524bb8a34a8a53ceb11efc928ac
+DIST ansible-2.4.0.0.tar.gz 6623856 BLAKE2B 7b70173ddb81e1dbb4862e7918fd5aeff2bf8ec0ad1d38b4f6b683e1c178188c409bdfad840c033b42eddea0cb5be4328b85dbc9c9921f08d3f35f5e5a7ab235 SHA512 78717b19599bdd46a7285b0b2a4c9d0d5b4cb86fd41dcf0b3340cf65945a55fae4508097058098fbeab871422c31d4f37ab4cd149abfd0af5add6004f65a207b
+DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d
+EBUILD ansible-2.3.2.0-r2.ebuild 1675 BLAKE2B cd0fa9f8f6fb31fca682303deda3580601feaee948a33f216c29ff06901f320eb6ff048cfa4aff58daace856b8d67b583794575d11d79a5be0980b4768e089cd SHA512 7f6c8f28056800aeaf82403de41ef5971b8ea4977b2642f6531132b58e22aa7ff81d49b18f2d57261dbfebaf68e1ed625fa7331ac4cc5f489d2e68de274fe81c
+EBUILD ansible-2.4.0.0.ebuild 1422 BLAKE2B 55b6658da5a65b1a9ee082a3999290cd742b4a9ef5776578aa78411e877f48851b99c612eaa28187c5fa8b15109a8dc9bd6d290e7615c1667988cbfa50f723bc SHA512 227aabc8dfff8bdd0322ee083627daa823a2ffc1897b9abf15d725eda1de89348faa95749f7a0ba77a8f81dcd07c098c7f154508a8426c46a714aa067229ac86
+EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c
+EBUILD ansible-9999.ebuild 1512 BLAKE2B 03254235d8b9ca79a612c59b004324d0b208b0619ea9648c08e311f13aec4fa83f94bc265665ed729e1bcb2810fae5fd222484dee4bd90624d25aee1f97236d5 SHA512 69428f04ff25266dc74805609796b6f36b3e2d6bfefae8c7c5b1202fc015b890cf8fec4754a5664e611e2d7f0a9d7e7a014b7be5909097611f5e894a33a38012
+MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.4.1.0-r1.ebuild b/app-admin/ansible/ansible-2.4.1.0-r1.ebuild
index 682eaf4749b0..c152c19afeb7 100644
--- a/app-admin/ansible/ansible-2.4.1.0-r1.ebuild
+++ b/app-admin/ansible/ansible-2.4.1.0-r1.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="
diff --git a/app-admin/ansible/ansible-2.4.1.0.ebuild b/app-admin/ansible/ansible-2.4.1.0.ebuild
deleted file mode 100644
index bc2eb3c1c4fc..000000000000
--- a/app-admin/ansible/ansible-2.4.1.0.ebuild
+++ /dev/null
@@ -1,56 +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"
-
-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/cryptography[${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"
-
-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
-}