gentoo resync : 05.12.2021

12 files changed, 136 insertions, 210 deletions

diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 74c01627b6d7..cad10df37e4a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,21 +1,17 @@
-DIST awscli-1.20.53.tar.gz 2081402 BLAKE2B 88d56df063ae6473122913e4713e17bfd8c32961477b8e723ed3c0c0b7dc72ccc4dfd8d897699e2060a2b65a198b96eccf77accdac9a21510aa56dba5423b76e SHA512 48576b535bdf6b9e6397eadd589c41eeec480d2eaf3035ca6e64bd86984aba9170a83b71c0f7f3f64cfaebaf5104fe3adcdaebace5166343fb3b772f5ad8ccfd
-DIST awscli-1.20.60.tar.gz 2090278 BLAKE2B 107d4d34730769fe18729cc2a42a574c8b66d0715eabc67c1a236d828ee7623387ece4dd8b3a80818b68be7439ffb74ba2c48bac74323b2a9e960f53c0508bf3 SHA512 7c4a1d79434ca2497d814dace68b537e5bc120f03d4f63cf74280d8c83d4c68273d9c0b16e90b477c91e49498468e1717ba6ba1b057590fd89c0c2cc82b90383
-DIST awscli-1.20.65.tar.gz 2091702 BLAKE2B e8295cf4e859c1e642077f4014fdea333292e98e22bbcb58a87da174687af8ebdf693a94f04949119d544daaf6fb9bfe4388444d9ec8a24c0e8b67d202e75753 SHA512 dd943682d10212179ebba959b8919a07ba0b548c5f24f735c69c05f9e1c27efa3f74c45d9702b96c4e556a6b436947d34da88291fc5718386891a3425a738c84
 DIST awscli-1.21.12.tar.gz 2097963 BLAKE2B e752cb1369be9ee26b517ba1226d3e16fad0a075c7f82eb1fcce3a3076aa67c5dcf4bdefcc6c29166ac7a96a2aa59da24636ddf1d3eb9bd21f3f05e665581de3 SHA512 90f39476b86ce97c0b47910b2d5cf5c512f142c1bf1620d0fa2384bfb40e54f812269e7f1ff72951ee13f37e6c918061c2d592b4e96e46116032810e1eb6bcb1
-DIST awscli-1.21.5.tar.gz 2095418 BLAKE2B 152d0ac70e9e0120fb9b10451904af52035bce84168c055695e7dc93e56648bd7689f20ac0ecdbdfc54ccb846d51b33027d2e9ee09c5e5d1e915c0ec05b0fbfe SHA512 e3063252a50fc6033669a0ff80f82d73764a6728d623d75a27f0652e779cbeb452454d887bf5bd70199a7394df40f9758b14619778c6428a164d590e6c8aaa89
-DIST awscli-1.22.1.tar.gz 2109309 BLAKE2B 24be9fca3f767745eb2bd8dd77389410a95e583c8b9fb701122c666cd190393aa32299ec2c62f19a917a235853cc6dbde5324ad665c11ec3d54f596584d19470 SHA512 b653a63f1db2f4cfeba0ef463596bd9b7d40a76b06bbeb9671eba9e14cd27f3283ba222ad97172d8399f2c9a8f8fa39f59a25a1e5f8832cba6694f26262797bc
-DIST awscli-1.22.2.tar.gz 2109538 BLAKE2B 09ba6020093a80f1505bf945f0e0946cc37368a9ef1425e1ff20cfe3b19d9cb346f52f22513c58e8820a1454dd296474efaeef6349060819bb29dce972216549 SHA512 64a32f6ae4961f20c52801bcc654fbeb2a84e2bcf582e701ab266ffd61a67b1122a2dcb469ae43c363b87b8b79b59c78738adef7c4677d19c5a7bb4dcb11764b
-DIST awscli-1.22.3.tar.gz 2109828 BLAKE2B 48424e51dc05a3a23be5b8e0d71b2a9cc946e740862553e52272213ca30c0b2a863b160bd6301b6dad647369c0ee9de5f99cb6cd882000ee32cc7d89401efe2a SHA512 34ca06dc9261580937e752db42374ce104f79dfa982a553e3c11b196f6d59036ae674ff28e7176e26fe7489685e10b45c5fe4dbb0ed806e898d6e2e300bde5ab
-DIST awscli-1.22.4.tar.gz 2110097 BLAKE2B 501c73e6f251081267977920f9844aeb5ebad342414eb9136dc5e873695ceef6886945c90ac7db4e4f70983c73a49e05af13329ee6a1a8a309b631ea7867c577 SHA512 0fb9fe0d43ab0faab3ee6d527d872790a603c208030113a2fe3346fc476dc97198cbd4866e89f29e690756a267f956ba82043c160705e24a4305bc4efa2afacf
+DIST awscli-1.22.14.tar.gz 2120655 BLAKE2B ffba1bea0574830e6eb3e343b5d83a308e19b557ddde981066b93008062c0702bfba47b7ff7ddc86d4f148606cce8089e81525c54a11eef23906ef1df6303af7 SHA512 0585d8f4842b23065a14cd1f73a7ee810d705ab4d2480591ebf13b640d7501ec784fb2000cdc685cbc6c4e996b7d68763ed79d2122bd61e07a0f97822c925d12
+DIST awscli-1.22.15.tar.gz 2121382 BLAKE2B 849a40f41382a8bbff235791848056791fb636bebf4e0a870804378a39d427db432dff9ede40f93cfcdb0a6d944f213040fe4ef4337e6dc778475860efb0a965 SHA512 380d79f5ecd6c728fc526f8b4384740f8b08ff704d71507dd536f650de103740814ed421132bdb78c86d4da1f05b0ed61b1ff661f15fa4617e9d96e217d07673
+DIST awscli-1.22.17.tar.gz 2123827 BLAKE2B e721c09ed07afcde2026b58623ecfeafd2433dbff7beabcad46aa87659e9817613b647210799ac2c6a070c77169d815e592bed0b94441b69318c3287412aaf02 SHA512 84fd1a8f7904766cbae6180591762bd4531e88b3d404bb97198d96cb99bd89923d7c1809b5d6675f2cfcad143e64bbc05359cf9cfcad9fdc245a007a7525e2cf
+DIST awscli-1.22.18.tar.gz 2124899 BLAKE2B bf1960c9b24e0f4581e5d495e68b0c4ed69f0d0de29e77709cc9ab50dbf6099a2244d917ec5162cb30f76f30a38a8ae0477f3424a28a9d276afd46b31a8807e1 SHA512 80abf1ff0c89abf308c840856c67888f39220d05b04032f3ae8c9efeb98d6fafb67bbcce804c36515337d0e1b3c6405d7a85fd42cca59030002bb62c89f56070
+DIST awscli-1.22.19.tar.gz 2125676 BLAKE2B 9ff59cf2eb220452744b221a1419f82adc849bb69355ee2716112e87be98e6945af1bdeb8c643ee553003842546677bcc3aca625bfc7c003a539b2b0b0d06743 SHA512 4cbaceeb4db0e3b22327b934f703f3015ccfc368d5e308bd1e5692423b8b802c2ad8ac68ee918dbedb82cd7c5e1209c4aae78c26bed898b9c58c125277001308
+DIST awscli-1.22.20.tar.gz 2126171 BLAKE2B 93c906ae19a1e11eca78e29e4eee99307465e92f22f1fc4ae26552decfc593c928ed036af62bc697404f7e76bb91b039887133df7351911da36693bcb6bd9530 SHA512 80939328c313d201ccfd691962b49c1960805b30b9ee04440c71194ee16b06a6c4190a122a78f5fd925ecbe45d53e89e7921052ad81dfaada4e7a7b9b5d26680
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
-EBUILD awscli-1.20.53-r1.ebuild 1351 BLAKE2B 573f4936fc569bfadb330cc29319fc990addee02316f71251fab0c88b76e5de5d67ae9a56d3565b746797899a500d1c8ab5cb84d8c92241afcceb6da23136ca8 SHA512 ea23e1d80d811ff18482ffd933efef06b652f947fad5e4e622104f1dfe2e3a9b2f4a1967dec56a6800e799826490cd2dd804aed47feccbf2001a46be2a6e71d5
-EBUILD awscli-1.20.60.ebuild 1353 BLAKE2B a9b4a2fb5e73bb2b8b141f40626bc7eddc8b7dc3affa6be66aadfebc6764d642e783ecd9a1520261fb1a2805f9d62aa22ac340b6e9257f3f50ccb5da681ec41e SHA512 d89f8acc72fcc029e4bf2351fc45f8f611906afa61abccd27b9686235522338782c26a539e1a7234e55325f4bbc50e29be001b7dd99c252afd70fb916cc4ec54
-EBUILD awscli-1.20.65.ebuild 1353 BLAKE2B a9b4a2fb5e73bb2b8b141f40626bc7eddc8b7dc3affa6be66aadfebc6764d642e783ecd9a1520261fb1a2805f9d62aa22ac340b6e9257f3f50ccb5da681ec41e SHA512 d89f8acc72fcc029e4bf2351fc45f8f611906afa61abccd27b9686235522338782c26a539e1a7234e55325f4bbc50e29be001b7dd99c252afd70fb916cc4ec54
-EBUILD awscli-1.21.12.ebuild 1353 BLAKE2B a9b4a2fb5e73bb2b8b141f40626bc7eddc8b7dc3affa6be66aadfebc6764d642e783ecd9a1520261fb1a2805f9d62aa22ac340b6e9257f3f50ccb5da681ec41e SHA512 d89f8acc72fcc029e4bf2351fc45f8f611906afa61abccd27b9686235522338782c26a539e1a7234e55325f4bbc50e29be001b7dd99c252afd70fb916cc4ec54
-EBUILD awscli-1.21.5.ebuild 1353 BLAKE2B a9b4a2fb5e73bb2b8b141f40626bc7eddc8b7dc3affa6be66aadfebc6764d642e783ecd9a1520261fb1a2805f9d62aa22ac340b6e9257f3f50ccb5da681ec41e SHA512 d89f8acc72fcc029e4bf2351fc45f8f611906afa61abccd27b9686235522338782c26a539e1a7234e55325f4bbc50e29be001b7dd99c252afd70fb916cc4ec54
-EBUILD awscli-1.22.1.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
-EBUILD awscli-1.22.2.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
-EBUILD awscli-1.22.3.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
-EBUILD awscli-1.22.4.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
+EBUILD awscli-1.21.12.ebuild 1351 BLAKE2B 573f4936fc569bfadb330cc29319fc990addee02316f71251fab0c88b76e5de5d67ae9a56d3565b746797899a500d1c8ab5cb84d8c92241afcceb6da23136ca8 SHA512 ea23e1d80d811ff18482ffd933efef06b652f947fad5e4e622104f1dfe2e3a9b2f4a1967dec56a6800e799826490cd2dd804aed47feccbf2001a46be2a6e71d5
+EBUILD awscli-1.22.14.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
+EBUILD awscli-1.22.15.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
+EBUILD awscli-1.22.17.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
+EBUILD awscli-1.22.18.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
+EBUILD awscli-1.22.19.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
+EBUILD awscli-1.22.20.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.5.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.20.53-r1.ebuild b/app-admin/awscli/awscli-1.20.53-r1.ebuild
deleted file mode 100644
index 834715bb0207..000000000000
--- a/app-admin/awscli/awscli-1.20.53-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-1.23[${PYTHON_USEDEP}]
-	>=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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.60.ebuild b/app-admin/awscli/awscli-1.20.60.ebuild
deleted file mode 100644
index 4ebbf30e24ca..000000000000
--- a/app-admin/awscli/awscli-1.20.60.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-1.23[${PYTHON_USEDEP}]
-	>=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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.65.ebuild b/app-admin/awscli/awscli-1.20.65.ebuild
deleted file mode 100644
index 4ebbf30e24ca..000000000000
--- a/app-admin/awscli/awscli-1.20.65.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-1.23[${PYTHON_USEDEP}]
-	>=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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.21.12.ebuild b/app-admin/awscli/awscli-1.21.12.ebuild
index 4ebbf30e24ca..834715bb0207 100644
--- a/app-admin/awscli/awscli-1.21.12.ebuild
+++ b/app-admin/awscli/awscli-1.21.12.ebuild
@@ -14,7 +14,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.21.5.ebuild b/app-admin/awscli/awscli-1.21.5.ebuild
deleted file mode 100644
index 4ebbf30e24ca..000000000000
--- a/app-admin/awscli/awscli-1.21.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-1.23[${PYTHON_USEDEP}]
-	>=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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.22.1.ebuild b/app-admin/awscli/awscli-1.22.14.ebuild
index d4b09dbaa2ec..d4b09dbaa2ec 100644
--- a/app-admin/awscli/awscli-1.22.1.ebuild
+++ b/app-admin/awscli/awscli-1.22.14.ebuild
diff --git a/app-admin/awscli/awscli-1.22.2.ebuild b/app-admin/awscli/awscli-1.22.15.ebuild
index d4b09dbaa2ec..85073515ab9a 100644
--- a/app-admin/awscli/awscli-1.22.2.ebuild
+++ b/app-admin/awscli/awscli-1.22.15.ebuild
@@ -35,6 +35,8 @@ src_prepare() {
 		-e 's:from botocore[.]vendored import:import:' \
 		-e 's:from botocore[.]vendored[.]:from :' \
 		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
 	distutils-r1_src_prepare
 }
 
diff --git a/app-admin/awscli/awscli-1.22.3.ebuild b/app-admin/awscli/awscli-1.22.17.ebuild
index d4b09dbaa2ec..85073515ab9a 100644
--- a/app-admin/awscli/awscli-1.22.3.ebuild
+++ b/app-admin/awscli/awscli-1.22.17.ebuild
@@ -35,6 +35,8 @@ src_prepare() {
 		-e 's:from botocore[.]vendored import:import:' \
 		-e 's:from botocore[.]vendored[.]:from :' \
 		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
 	distutils-r1_src_prepare
 }
 
diff --git a/app-admin/awscli/awscli-1.22.4.ebuild b/app-admin/awscli/awscli-1.22.18.ebuild
index d4b09dbaa2ec..85073515ab9a 100644
--- a/app-admin/awscli/awscli-1.22.4.ebuild
+++ b/app-admin/awscli/awscli-1.22.18.ebuild
@@ -35,6 +35,8 @@ src_prepare() {
 		-e 's:from botocore[.]vendored import:import:' \
 		-e 's:from botocore[.]vendored[.]:from :' \
 		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
 	distutils-r1_src_prepare
 }
 
diff --git a/app-admin/awscli/awscli-1.22.19.ebuild b/app-admin/awscli/awscli-1.22.19.ebuild
new file mode 100644
index 000000000000..85073515ab9a
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.19.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}]
+"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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.22.20.ebuild b/app-admin/awscli/awscli-1.22.20.ebuild
new file mode 100644
index 000000000000..85073515ab9a
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.20.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}]
+"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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
+}