gentoo resync : 17.07.2021

8 files changed, 8 insertions, 188 deletions

diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 2d045e6a76d4..66feb79c0f1f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,16 +1,10 @@
 AUX awscli-1.19.47-py39.patch 2498 BLAKE2B 39f698d756422eecbb6a37bec572f00e184775b816f467d1b0275740b59678518db7ae44240476048c0f11d8d01403e8f9a03ad0f64414206fe77c15c4d695d0 SHA512 6a80d35495b63572e5e8ee6550a1c693d71adceaad79fba9d097668049a5c9d425b7eaaba008458cde8eb3e406e6e2850b6d43e6a610e9f28cb44278b231312a
 DIST awscli-1.19.104.tar.gz 2024567 BLAKE2B 82662ffe6a05dd329210ff84962e1ad37ece63a8f964c3c6bb293f53fea3af151bb088150260b3b279730871b7e962f2c580385b21a56a8bc2f86b437fab92d4 SHA512 444e533219e23b5151bab29d2d65deb8de9008b883b08ae553dd322b3f4e96d3836fedabc7be0393303ea146a0b8ad8220d4f4de458bca00303dc0798e543840
-DIST awscli-1.19.105.tar.gz 2024530 BLAKE2B 8d05c41aa76338f30edf8640923250fa3d3954e942243552338837ec163f987c583573269d94a63f47f48fbb0beab4c6265e9197b465563374e4afb45ae20843 SHA512 73207ca67d490df705022844e6d025d051a276698204fcf82171e0075f5db2c347de0634cffc48fbd210314d66fd79c61d4129003ddbd6db698adc710fbb2068
-DIST awscli-1.19.106.tar.gz 2025184 BLAKE2B ee1006df7feef7ca3dcae3625a5e318dd1d5ed70a3c0c30fffd431fa41713f1932d2750edd2fd251513eaa631f93c6c9d4ab2e0bb052f246b5b13e48c355646a SHA512 404b7d14622f1250f3cc5ea290dd796fb99aeb141101ca55bb672375d09fb4fccb67c2d926f0a3f7e5efc4c48022197a0de20e59590d4758e5fe0975c63f2bb5
-DIST awscli-1.19.107.tar.gz 2025880 BLAKE2B bbb307072a63a9722496aaae52c2f9fbc2743b8a4fdc2fffdb2b4e9b6be9013868a2130211ef9ab427bc2180ad1d19209fd6411d8cde26a5f02db7f3c643297b SHA512 69ebd9f3397230a7c49ef551258b38e8c66b370f70a8e050fa9c721dd5ebca3a9e0da70c2804417eba4e68bd7620fa2d2802d007369e5cd0bee49bfc512b7853
-DIST awscli-1.19.108.tar.gz 2026311 BLAKE2B 7404fb3010fa122bf210133667696df0e83c0c5d5adc717b75995cd95077f4ebcdd53375e687dce7d52eb1ef264110302f049897c18b7856be9d5e5a24f50ff3 SHA512 f061de7c7cc926f3fc5dc41a33068c8d575e1027f50099c148e80b5be55497508b44b11821e7f675e73bbcbfef12539e4d73afcd6a849d6ad7fc4f72b857b4d7
-DIST awscli-1.19.109.tar.gz 2026658 BLAKE2B 3ec642d44057795519e9e94ce73a6b26b42976018355f029ad7ec5fd6515497c725aad5872b3e061ff15cb7263823577bb3dfd1f43c3f1617ee996c982e722b0 SHA512 71c419359a12b159b06a7f769dbaaea8d5be0de4b71fb002bf3dd4c26810354038fc1057155235b26ad43b3af258e141c139cc84654e11650aa33d013381a192
-DIST awscli-1.19.97.tar.gz 2020143 BLAKE2B 2dac6f59a04a958b09e0f8b7d056583015762df78ed1349b55c6301d3189e1100bd8ab98445ded3ccc0ddbf1148ddf0475086704f123b0db1ccfd1cacb6b4680 SHA512 4e4e0f34ba02819232427f7571a4b10d22b167788d758c9ac43749607ea7a4c498259fcc5c69fb32d66faffc535a5b3045006168b64506f2b0f9fbbaa804e387
-EBUILD awscli-1.19.104.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.105.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.106.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.107.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.108.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.109.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.97.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
+DIST awscli-1.19.112.tar.gz 2028010 BLAKE2B c5f973a2a0cf002038cdc46d0760f5e5fad942b1383f21819459d51fd3e3a17617e23d45d284345fac1760a812ffc81842068e8517bb500559a330ea8183968e SHA512 4ad9e960826baa057a2e72ddc2afce1012b766b5f691236435347c3e4ce210ee0b14003c16615262ec707d0c65b7f7f71a15fcf80a0fdfefb21ab6a28cfb1d55
+DIST awscli-1.20.0.tar.gz 2028152 BLAKE2B d746335fc3414e773fbf3cb60b68ea1242162c7fb6f9e8222bec1bff992ec08e7239b9279de70551d05a99b2bd2743e8e2b8f65e01655574a542660fbb4a6ad7 SHA512 0aa478e9c28afa922958881f2f7795c6925e342964fb171176c81bce1fc4a0529dc9eb2fefaa05b670376781671e1531bbfe5114d0f0a748c964c5ace2c79ee4
+DIST awscli-1.20.1.tar.gz 2028927 BLAKE2B bd535f1eba64987c8389c8003b90a1361e95db00a62f13138b35d0f4b6a5130b2e52e38663f4560bf58fe6b86e668ee142a0228001d8cde583d096ce81612264 SHA512 b704ff3f482dd2ccfdf78d01ccff214c9cb9f7b12b1af0a7c615b9567a931a8bc47a444dd8f136a958346750a60fb03a084993a7deb0c234448a9889918c97e6
+EBUILD awscli-1.19.104.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
+EBUILD awscli-1.19.112.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.0.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.1.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.19.104.ebuild b/app-admin/awscli/awscli-1.19.104.ebuild
index ff429f8d3a3e..4221a0155f55 100644
--- a/app-admin/awscli/awscli-1.19.104.ebuild
+++ b/app-admin/awscli/awscli-1.19.104.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/aws-cli-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.19.108.ebuild b/app-admin/awscli/awscli-1.19.108.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.108.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.109.ebuild b/app-admin/awscli/awscli-1.19.109.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.109.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.105.ebuild b/app-admin/awscli/awscli-1.19.112.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.105.ebuild
+++ b/app-admin/awscli/awscli-1.19.112.ebuild
diff --git a/app-admin/awscli/awscli-1.19.97.ebuild b/app-admin/awscli/awscli-1.19.97.ebuild
deleted file mode 100644
index 4221a0155f55..000000000000
--- a/app-admin/awscli/awscli-1.19.97.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.106.ebuild b/app-admin/awscli/awscli-1.20.0.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.106.ebuild
+++ b/app-admin/awscli/awscli-1.20.0.ebuild
diff --git a/app-admin/awscli/awscli-1.19.107.ebuild b/app-admin/awscli/awscli-1.20.1.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.107.ebuild
+++ b/app-admin/awscli/awscli-1.20.1.ebuild