gentoo resync : 17.08.2021

4 files changed, 2 insertions, 122 deletions

diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 6da4058e634d..5cffd98e7004 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,16 +1,12 @@
 AUX awscli-1.19.47-py39.patch 2498 BLAKE2B 39f698d756422eecbb6a37bec572f00e184775b816f467d1b0275740b59678518db7ae44240476048c0f11d8d01403e8f9a03ad0f64414206fe77c15c4d695d0 SHA512 6a80d35495b63572e5e8ee6550a1c693d71adceaad79fba9d097668049a5c9d425b7eaaba008458cde8eb3e406e6e2850b6d43e6a610e9f28cb44278b231312a
 DIST awscli-1.19.112.tar.gz 2028010 BLAKE2B c5f973a2a0cf002038cdc46d0760f5e5fad942b1383f21819459d51fd3e3a17617e23d45d284345fac1760a812ffc81842068e8517bb500559a330ea8183968e SHA512 4ad9e960826baa057a2e72ddc2afce1012b766b5f691236435347c3e4ce210ee0b14003c16615262ec707d0c65b7f7f71a15fcf80a0fdfefb21ab6a28cfb1d55
 DIST awscli-1.20.15.tar.gz 2048948 BLAKE2B e7d378c9cb1752f4b7e014578d07fdc5f7bd9c14dc5fa33328a29c8fb9c9fab27f404dbfeea5952c243aeb35b0800c7840303d5f1339512d74cee2e4a5d590a1 SHA512 34c482067c3534737956520e5f6f0b3d30296f6de06969fe3ab43146a3190e36b432ea3642917c91e82659d5e79337add973f3f79216214f6b03b5cd15b363f2
-DIST awscli-1.20.18.tar.gz 2054961 BLAKE2B 0045a45638a6d4b24b876c3fa984ab8cb33eaa18bf1b8f3ceb8eb4faaffcdf3daacd141cfb4b96c56ab406c00742d823d2b772978d4a2f79b2f06a90c45411b3 SHA512 24292e57fdc4b95bd79c31fe153ba8dc1869bda842fe9e9d4b66d2bd8e0354e279d95f0dc4d656a359f58fef3a7e76c17ec80398c1f516339af2d27ac88c9b38
-DIST awscli-1.20.19.tar.gz 2055440 BLAKE2B 1f56bcc70a6c479a4a939f3eb8ab24bdc6b5b6d5220c35a4f8be04d97dc0d181716398fe6733ed1364ed700f53096195163f85f3ffb467f9edbfe37530efabcd SHA512 7f65593fe89c66cc20c5fa27f8301e5ad6db40b519ed054b052dd2023a32bfe0409c5d309480a7e4b82e70dcc200bac253414d19c4b5e54adaaf02204bfaf7b4
-DIST awscli-1.20.20.tar.gz 2055487 BLAKE2B 4478c2f5c4db5a1bcc78ee8a3a38ff8c6bfdfda80ada0dd3014739ea0132eca6027f8950fc1da52774a333d6423a186ee15932971569025ec04051470f461acc SHA512 b0c92801b8d95c59579559336cc96c6c75b74023e7e9ebb0d0fe65ccb6db2a9a97afd28d6ffb5992dc293841a345cfba474f19b5292cb70a7f6929596713d598
 DIST awscli-1.20.21.tar.gz 2055227 BLAKE2B 6448527363ca25f039fa9e461bf5f6451e2ecb308a29b3b62c2303d756476c45f60b5356bf32894d780deb8d9e459d83e2520ce09f5ea5f3b1e9435f8180d4ce SHA512 58b9323b8bdb07bd48814cf11fc03f9c4ffda01d1d0c85d4a77425ca37848a2cb3a6222b12c31e5897b348ef265cc94d842d9fd6b4a66bb3cfc8b37b038361cf
+DIST awscli-1.20.22.tar.gz 2056520 BLAKE2B 67f5dfb31592d84684956feb1007e69efb05550da5049733835a53cbc1c6b37ee8efd0e2f684740e525688e8832f11e7f2ed68312ae2fcc7013af9d8bc2bec3c SHA512 ceb1cad7920216636c57221ffe7cea204d8d6d26de0a53ead617a6a807d7565e81bb730736dcdfdbb41e3ea9a294c8e211f3cab77e69a0a8684229cc12e13207
 DIST awscli-1.20.7.tar.gz 2045304 BLAKE2B d8f086d8d2eb36645e77fa3d9ae7c196ed3a3fddcc2a0218696f92bd69e10b453be1340b965a8d8e6697bbd3c45013d72de3ed0d31b5823515a5a0092a812858 SHA512 a41bd3ebc34a65add66ef95d5194ba07907a08f7368b0fcd6551af2070c46c4a509af47d30aeadabddce19d1a61200a58faf40a7e2f759e64915cfb2826666ab
 EBUILD awscli-1.19.112.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
 EBUILD awscli-1.20.15.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.20.18.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.20.19.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.20.20.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.21.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.22.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.7.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.20.19.ebuild b/app-admin/awscli/awscli-1.20.19.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.20.19.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.20.20.ebuild b/app-admin/awscli/awscli-1.20.20.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.20.20.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.20.18.ebuild b/app-admin/awscli/awscli-1.20.22.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.20.18.ebuild
+++ b/app-admin/awscli/awscli-1.20.22.ebuild