3 files changed, 91 insertions, 0 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index fe4ed7da061f..2cb21b54928e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 7f6b2d00b83e..24a7f7978e62 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.32.11.gh.tar.gz 2620959 BLAKE2B 8eab3362ec14ec50ae4f00862456e702a
 DIST aws-cli-1.32.14.gh.tar.gz 2622299 BLAKE2B 0b7a29c756c2bdccc6bb5ef4953c2f05db05c2929c2671fc8b24cf410272b4bd1a25262f34b40db658a0e7921aae933d92b34be011832558ed286966f7473f2f SHA512 e7847d63337cbcc10a62fc5b36aa4ed32b89de0c22116f8b1a618387f4d6308a9df8bba2b6e0353cf9af39e69c32e168515461c867c3141a29846b5f9fc6ad7e
 DIST aws-cli-1.32.18.gh.tar.gz 2626034 BLAKE2B 3d60094c5b6e70f8df57ada95e269cb710975b36724eadc2fcac07733099a8bf063e7198cd90af382e3a8480ad6d173143daed3e03b5c18a529a1b3227d3126f SHA512 ab161193d52c21751fe3515eae1182adeb23a6d8198d85e922674c6af6a64c4efb68975a38a5ec36957eb62350437b5e3d6a6b9c36dc4a6b4ae4bebc4d92fdf6
 DIST aws-cli-1.32.19.gh.tar.gz 2626167 BLAKE2B edab59c82b40fd70d021529c211f1377d77548aeebc8c2b62b2c8e39f5f05782f8d8d23383d8b05d824a4cc95531dc665c8fc6636b28316a6136e767216eaf8a SHA512 ac0c5bf4d2a001a318db87ff4928cf07a6224bdc7d2702b7030858c2c176c0fa4eb1e47485684727a09ea9e7ff089d81acc85ffde16d6391449d2ea844c58f53
+DIST aws-cli-1.32.20.gh.tar.gz 2627246 BLAKE2B 9aac8aea2150ba3f1b32837aa643e040baaee9ce9020169eac73119580a95a4866af8935a6cdd887c94780615b02e79cf8ff98c4b9a59db4269cc4b34e50851a SHA512 9bc259de53ab0d3d21f5d3343eeab37a9fca85f1eb6fd6d2133802ce5ef0563e774ae500374697a82d5adfa543c1007ad095482ddbbbc6261deb70af782643ee
 EBUILD awscli-1.32.11.ebuild 2864 BLAKE2B 5bf1ffd344887c79c3e7baf37dfd7a00bac095342f0128d71407661ecd248843c2ec368ab0e7b7be0a7ff2c928faa01fa7c0eaad2163488752862f0cf6cd256c SHA512 eb2788ab3d268538d6a93a35d5f424cdfb6b69f5858c8ec1cbf91a3a7134f40aeabf5514cde51c81842646b795051a6cceebb3c46a14fe32431029aa3451d4ff
 EBUILD awscli-1.32.14.ebuild 2871 BLAKE2B d3d947d0b8fcc7f665d3ae2f1456abf977b123e672a0ba9fa3282affc71e649efc073394b2f2e8023f0c0cf891e37737e62edbeead64c99c46ec7262ad1996fd SHA512 edbc32e9f407a678964dc09b002133a33b07143d07dade702075a0c498faf6563ca77b92e3d4d9d3f9b017d7073ed8237f8c6cd89d2ee3c27033393d2b4b1e3a
 EBUILD awscli-1.32.18.ebuild 2871 BLAKE2B d3d947d0b8fcc7f665d3ae2f1456abf977b123e672a0ba9fa3282affc71e649efc073394b2f2e8023f0c0cf891e37737e62edbeead64c99c46ec7262ad1996fd SHA512 edbc32e9f407a678964dc09b002133a33b07143d07dade702075a0c498faf6563ca77b92e3d4d9d3f9b017d7073ed8237f8c6cd89d2ee3c27033393d2b4b1e3a
 EBUILD awscli-1.32.19.ebuild 2871 BLAKE2B d3d947d0b8fcc7f665d3ae2f1456abf977b123e672a0ba9fa3282affc71e649efc073394b2f2e8023f0c0cf891e37737e62edbeead64c99c46ec7262ad1996fd SHA512 edbc32e9f407a678964dc09b002133a33b07143d07dade702075a0c498faf6563ca77b92e3d4d9d3f9b017d7073ed8237f8c6cd89d2ee3c27033393d2b4b1e3a
+EBUILD awscli-1.32.20.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.20.ebuild b/app-admin/awscli/awscli-1.32.20.ebuild
new file mode 100644
index 000000000000..18c949df1583
--- /dev/null
+++ b/app-admin/awscli/awscli-1.32.20.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests 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() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# 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
+}