3 files changed, 100 insertions, 0 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c134d2428469..5beaecb1e903 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index fcf5c4b9ac66..bea18599ad9d 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.35.10.gh.tar.gz 2811446 BLAKE2B 3151e107099821ffa3978d4a0175bf96ab9f789bb122f941cf28cac5115d1e6b97272b73e56633910721cfae0684266b7d311886e6fb414330ff9e4791581b4c SHA512 85be98b3e80e2af85acb0ac982cc85bad6789f6e051c95b7df5cc3eb313c677d6a66117a3418bc44f9c03ee6385b68b401839d4b9a609caa65fc59e8ddb55624
 DIST aws-cli-1.35.15.gh.tar.gz 2810766 BLAKE2B 18a8464acede1801a533da89191c31309944123f092a08790d79f1a05d57be9540385e9acac75240c6595573685fbb3046ff3e85530881e25f54bc4213b944c6 SHA512 def601f10f9e4afe3b17b98bdeab58b3fe78b2171d5cc4bbe5892ae8fc348a1bb3467ef8051f6005091708df3c9e3bd85751cedf372f8730ee3197b6e833a652
 DIST aws-cli-1.35.20.gh.tar.gz 2817368 BLAKE2B 92c86af16eb29a22c437491c938c08d4a2745067ed923c52f271de3fd249b8fc35d4f7aa9a6e523279c463f619294096b5e88d9800a53fc9d3c3a9ddeae1e507 SHA512 d2a1aafd3aba9441b6560e1a197c1c65c3597883ac93cd8c29e1c88f03cd554039ffaacd8df10392189de5ed0b11169b2d32c8a5513ab70cc0a9f331eb87813a
+DIST aws-cli-1.35.21.gh.tar.gz 2817837 BLAKE2B 3dd29e42ddcb46e2da10739de00218c8bd493ce02221c94d67a8ab901921a2530780bf2b08a8d8463b81d69da3001af5ac886a1b93b4596efa2092520d979c63 SHA512 e216824e5453ca8bf21968703172bf13f728899bd07b5a1c7f910926385d884a82549f886c687da016af52918b4a3cbf41b9d485a8577d3c8bca7382333598dd
 EBUILD awscli-1.35.10.ebuild 3240 BLAKE2B 89fc679334ea535c78d19b48324652d5d867d9348e002ed52dc3a9e2da19aac3d97b4b1584ed43f0233ecdbd40f8d68def7b89fcd94e0c947cec1b4f47d68be3 SHA512 c9c9827b23178d1a976c1292704f5c28df75d7fddea370baa37c385b783299e4f4f72eea597a54e81656844ef41d8419cc21e49558806d512662eccf4da60ef1
 EBUILD awscli-1.35.15.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
 EBUILD awscli-1.35.20.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
+EBUILD awscli-1.35.21.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.35.21.ebuild b/app-admin/awscli/awscli-1.35.21.ebuild
new file mode 100644
index 000000000000..0fc6192a8587
--- /dev/null
+++ b/app-admin/awscli/awscli-1.35.21.ebuild
@@ -0,0 +1,98 @@
+# 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..13} )
+
+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.(z+34)
+BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
+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/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[@]}" )
+	case ${EPYTHON} in
+		python3.13*)
+			EPYTEST_DESELECT+=(
+				# flaky (some ordering?)
+				tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+			)
+			;;
+	esac
+	# 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
+}