gentoo resync : 16.01.2021

8 files changed, 363 insertions, 3 deletions

diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0509451f7d75..9c1a64a243a5 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,12 +4,24 @@ DIST awscli-1.22.24.tar.gz 2128390 BLAKE2B 6b23a629a66e6f962b953fdc89ab1e8153080
 DIST awscli-1.22.25.tar.gz 2130417 BLAKE2B 1c150feb135d662cbae1e51cd0cd41744472d8a33ff84948ef1a1d6e49ea36ec5e9d85a6f8176d928dc3d1a74961bf6116e4bb01e4256c7cf01059bfb7e3db66 SHA512 0055805213057247fad6a13cb9cd9a90796723411999a55aa7bcd9f7b014709127654313877833a1257a14a2a61770232d142943c5dfae91ee1d9de91efd81d5
 DIST awscli-1.22.26.tar.gz 2131318 BLAKE2B 87651dc3a75bf0ca57142fb394b90ff3f60fbde724b7f6586c213fbf03169d5f4638133362b925a32235e518d7c8b56dea54a0bd224d4562a482e6303c7f81fb SHA512 276a137a3826922dc56316c59f46b1a741f57b5037a0a6345ece3732d31715e3fbf36faaa09b8969b161be2d54ef106c0cfd7bd6c3a3a31a540b8b42f9cf364c
 DIST awscli-1.22.29.tar.gz 2132978 BLAKE2B 67dd83bfd9799c3a49bc2439b29b581e21cd57c6d4c93f8b3073bfd83b0d6ebbc95abc074b6257407f03b2f98253ef099dd1a2a853c093338b2435a17bf9d02e SHA512 61b2117125031e945a2aaa4d20325d8cee0a56d7b5cdb9726f0d951b1bd0eedefc6264be8a1a890c9dfa4869500222a15a9b62f2935cf59f168bdd3d0022fba0
+DIST awscli-1.22.31.tar.gz 2134102 BLAKE2B e1918352146b3176c8fc60cc6338a69b04a28023bb46c6c4a9af6cfdf1304a3c4813dfa798a990123052c761f64929b07d7e25d13f04d9e8bafdeedc04a6e28e SHA512 57a18437aa7780861257499b810c72c49dda7d9db391f3b5ac8c8509c153075e216e1dabaa67486b8ae08e008fafe400b865a20d32c43136d6af987a315cfb9c
+DIST awscli-1.22.32.tar.gz 2135177 BLAKE2B 1e99a887e3b90c8fa81547677b4827f50afdad26136a02f225c66702f2f705ee140616cb3ebf407fc4c9bfd242df5cdefe35cf582c565ce1715fde229246173d SHA512 2df81763fbd2314fffe392b35e61f55451063d440a9aa8a62e36977faa49b808d2c0db9bed71c1d73696e53797d8f8f689942e9dd4636a4b6aec3e8f1f16297c
+DIST awscli-1.22.33.tar.gz 2146397 BLAKE2B d78f92b077141d7204b2e3c7b2eda589e4430f633c469eefa10f59e2b801d67fc833dcffd55efed379136ea050dfe03f72ef3061e1e3e98a372e61d44f0879cd SHA512 a3474eace16aa90017d985d6f9fc4d927ed27e727bb2e4bbfeda48f0be7d63c9d3648e95904252739a2a94a5d5822c855e2b6b840dad3b6c88da273ec92c9bb7
+DIST awscli-1.22.34.tar.gz 2146588 BLAKE2B 794fc2b579126e9c37eaca6aeb8f750cf91769e05ef7222b579e286ef6248d05d49e372abb5af63e1827f804127bfbd78cfe767b715a7f907e26e9c0af6f08a2 SHA512 5fc5f4f929fb64b494422db794cbd4dd2e8adf3d0a3436bc2368a2e9d036bac42e29beab13ee5f00c46b97bc875dbb3f1a7af684006a9dd96be7fcc61ff282fc
+DIST awscli-1.22.35.tar.gz 2147435 BLAKE2B 24fdb6d273dfeddeb7ef8adb15fad843a25edae0cc6dfd37465c294421de6cda0c0c0d49c931f5c2b28ac337d44c3be63f6fd15e7ce84ed493baa0a5c5aa8cc7 SHA512 64f297981987f8f6ab75c43f645624f1794b411f82885e3784c3dd55da0e0ed98ab6395edea7319cbc2c7a320451a6722bd558431a3acb1b7aaf94c2521b4c2d
+DIST awscli-1.22.37.tar.gz 2148283 BLAKE2B 0355bac3b0710af5ce6938a59c1e93115fb109f5aa6b05fe7bd2b5341a11c9e4bf35b826addaa1a7f8e404fd58c15cd2056802c192abe6d5acfc4ff4facd42fc SHA512 3cb1acead139329774565a5aed818eb2bc1e444627d6448c1c31eb431a6aae1e07af273c8b24a1910522764d5898946629197606e0b2762fb89d1bc163641d73
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
 EBUILD awscli-1.22.14.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
-EBUILD awscli-1.22.23.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
+EBUILD awscli-1.22.23.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.24.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.25.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.26.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.29.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.31.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.32.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.33.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.34.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.35.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.37.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
 EBUILD awscli-1.22.5.ebuild 1546 BLAKE2B 7d465d3ae8da32c1d1ba98b059be12fb7b3401a2d843043ad23823ab80a56bdde0575dcfe48efcf91112c4a8d8f12d19f800ae4f6cc4efa841466994b3835b5f SHA512 61e24518229ae0d07f46c3b06efa3116b8fbec78efdc489d4e74d89a29b3e307ea89799490d4149b718066e93e55b7801c49c3da8bc2d954fe4f0deaa898056d
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.22.23.ebuild b/app-admin/awscli/awscli-1.22.23.ebuild
index 85073515ab9a..7decc9d63a2b 100644
--- a/app-admin/awscli/awscli-1.22.23.ebuild
+++ b/app-admin/awscli/awscli-1.22.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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.22.31.ebuild b/app-admin/awscli/awscli-1.22.31.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.31.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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.32.ebuild b/app-admin/awscli/awscli-1.22.32.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.32.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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.33.ebuild b/app-admin/awscli/awscli-1.22.33.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.33.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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.34.ebuild b/app-admin/awscli/awscli-1.22.34.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.34.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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.35.ebuild b/app-admin/awscli/awscli-1.22.35.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.35.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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.37.ebuild b/app-admin/awscli/awscli-1.22.37.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.37.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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
+}