3 files changed, 95 insertions, 0 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4996fdaf6222..960c2d20b583 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 64319c5abb19..4e0fd1b00333 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,9 +1,11 @@
 DIST aws-cli-1.38.13.gh.tar.gz 2932854 BLAKE2B 197168721c41d0d79342dbf03892dd48fab2dd64bf97abffea70c7ca2a06fb79211a7a5284f680ca537a1b9330537ca0d78c5d86f6add6954db59e72a82f59e0 SHA512 d6d35aa2c6163e8d2fffd81b54f029181128894a75b47a62ab84af3e96b031a930b66568f83b3a21b8cc50c75644a223641ed9166a4814ff824f946136c374a0
 DIST aws-cli-1.38.18.gh.tar.gz 2942596 BLAKE2B 263926ed648f37eca2b1376ad26ac25c5c6d82182c5a3ce0c3511c7b6ba2958db5e6a09c5d4e7fcc702515240b30e4cec952f9f3d47f7d7dcfe5b1078fd3217e SHA512 4cc5eb7e7e1f5c81b7cfe96c09b5996fb8d2148d7b8352a9bbafb9d162fb6b60b58450c7dc0fb717e779928c2d708fa4538cb4e2c6cf6fb33d5e52952d18472f
 DIST aws-cli-1.38.19.gh.tar.gz 2942966 BLAKE2B 4fe7d22ce2cbb845b396a15f66c05057d51bb79184050c67ff6517135d3973f66df7b0967f38ff5add5e1c433dfb7841eeb0370e35b026009be8a0f37ae147b1 SHA512 715e6073c20aaecff40f89859485dd4f81f67aa20985893345fb117cd419cc05eae2307fc0166acebe17ea0f05836d36366a6145341d3eda1411ea32da79a73a
+DIST aws-cli-1.38.20.gh.tar.gz 2943124 BLAKE2B 049e6791cafba4731b3a5eb7668ce56024cdc6445c9362672e0dc80d7d013644d28780efac975e7fa103d043bb959bb9d2fc3aa929a436d32eda0625cbd640ad SHA512 dbc8a194b111be5f82973aff8331fce2bb1c768751c4ac2ac9616c1f8795ec1c17d94c608f35654f1a511253c5c112989550ac34d1d027e1194308015d0f7ea0
 DIST aws-cli-1.38.9.gh.tar.gz 2921470 BLAKE2B fb6b616095702417335be03a763a4434759c79fa1a31ec7c8c84cb59567461167b0b3c5b80baa950cd0b7298985b298c825f669b82d33ef5bd35adefe947729c SHA512 23fd65c3a0b0c8bb0cd64d52db924cddc8663671c0d80e45c9af1afb2c8558e42eed7a88d3fba2351fa1cf2d0dda1ca1b51a3baaba04b5249bd5d1551059b100
 EBUILD awscli-1.38.13.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
 EBUILD awscli-1.38.18.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
 EBUILD awscli-1.38.19.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
+EBUILD awscli-1.38.20.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
 EBUILD awscli-1.38.9.ebuild 3124 BLAKE2B 035e52b252c6e82be66ce01b02bb77556580162f4679e628c77be32fd256544ddc06781caae30bb763f949425b2545930c7704ebc509dd72588838834818bfdb SHA512 6297f03f60237a835600d4c3206600f833d1b013221ca349636360822b5d5bdb65a06a612070838605e70ad23b4bfd948461a113f63e4de106e6f8d35fb8e677
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.38.20.ebuild b/app-admin/awscli/awscli-1.38.20.ebuild
new file mode 100644
index 000000000000..88651d723a58
--- /dev/null
+++ b/app-admin/awscli/awscli-1.38.20.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 shell-completion
+
+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-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.11.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		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[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+	newzshcomp 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
+}