gentoo auto-resync : 03:11:2024 - 03:04:03

8 files changed, 4 insertions, 397 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2c71baf8ebff..203c83b04497 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 158d83258951..fcf5c4b9ac66 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
 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.16.gh.tar.gz 2811312 BLAKE2B 0d3a243ecd9b1759fcecdb427693270136e6c00b6eeae592481eaf8a32bbf641659e096c7eb19fe550b05a1c2f4f79300191c3716c551bf0dd25a9bd41d6aeb6 SHA512 02caaac48ca08a97a3cd82a672fb2dcd4b66666a7b4de34c3420ee66c10c79aa10672603997f941a8c462c8094cc6c014aefbba5109f6cee75a546426ea00439
-DIST aws-cli-1.35.17.gh.tar.gz 2814594 BLAKE2B 031bfa16aa8d1478a2c1b146a38182ee776869b3c512c51e4ae234f495c538cd941c7853ede3b28ef262637e56ffa32c95c130f4ece3d2495d2e993a5f4840fe SHA512 e0a873df808e2bfac61e2ed3b56c7da8d9f0b975839f9cad7dc4df5f2bb8c68d200694053b00da203fd5a4fb80cbd61742f0f2ec0cb544aa037e82b95466f99b
-DIST aws-cli-1.35.18.gh.tar.gz 2816574 BLAKE2B 79f4fce1109cfc15248fa7c1aefc4c99127b881077c33204934a088ebf095745a1a7144a51c1e02acd3171ce207455fb47124508df30c2714b61109454e60157 SHA512 426bd2e2a8bb71c450fc90887096adebedc0ed885a9450d960b5d3ba7c335fcfbd18cb358c0b3f6b204568ac84804ec8ae36f4517e0dc6e78bd286c342d2de86
-DIST aws-cli-1.35.19.gh.tar.gz 2817293 BLAKE2B 4aeb6071c6c9974018ac62132d793473bb2a4fe4e4f9690e142c0ae45df575b52712dd7856d041296694508efa4508c279b23bd62c4ca5921449efe4091093c2 SHA512 76be1417ce7b99feeab75c1a4c3e81b62c82d50297fb3fbf631c92a6857084c0da6b1116a2bfd5a1b2e4d3aa1e8eaaff8987f4eaa491ef2fc59674bfd1efb6dd
-DIST aws-cli-1.35.5.gh.tar.gz 2808789 BLAKE2B 545c76bd349485fbf2dc5565317678904c99443e2e6dc2e12fa9de122327d8aa0e8b9579cec37afe2e949a0c31c48e0977e52d701ffc212182c692769c35a948 SHA512 2a9c86f1a63b657d3c95f8a65020ea7837ded9f5147ce31a535f59b9d9c1c91c3354a82286c25252da7d5b7c48c1898f594be0cb9e1ba54c6768133543fcba50
-EBUILD awscli-1.35.10.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
+DIST aws-cli-1.35.20.gh.tar.gz 2817368 BLAKE2B 92c86af16eb29a22c437491c938c08d4a2745067ed923c52f271de3fd249b8fc35d4f7aa9a6e523279c463f619294096b5e88d9800a53fc9d3c3a9ddeae1e507 SHA512 d2a1aafd3aba9441b6560e1a197c1c65c3597883ac93cd8c29e1c88f03cd554039ffaacd8df10392189de5ed0b11169b2d32c8a5513ab70cc0a9f331eb87813a
+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.16.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.17.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.18.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.19.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.5.ebuild 3134 BLAKE2B c2ddd86359d913936a50c8800f366e44108dcfe932ee27ce6749120f8c99299386663d819486e9c20c11933170bea250e601505dd12504d39802b36f3f6e7d68 SHA512 58b0c974de9872309ad7f53bc515855f8755d468d4cdd42f7f04d2e9e22c2a410a8fcedda4d1c1b87a7d342f89056b75bc0d704eeef9fc93c699bb8bcadc14f2
+EBUILD awscli-1.35.20.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.35.10.ebuild b/app-admin/awscli/awscli-1.35.10.ebuild
index 0fc6192a8587..7ea16f8ee0dc 100644
--- a/app-admin/awscli/awscli-1.35.10.ebuild
+++ b/app-admin/awscli/awscli-1.35.10.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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 ))"
diff --git a/app-admin/awscli/awscli-1.35.17.ebuild b/app-admin/awscli/awscli-1.35.17.ebuild
deleted file mode 100644
index 0fc6192a8587..000000000000
--- a/app-admin/awscli/awscli-1.35.17.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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
-}
diff --git a/app-admin/awscli/awscli-1.35.18.ebuild b/app-admin/awscli/awscli-1.35.18.ebuild
deleted file mode 100644
index 0fc6192a8587..000000000000
--- a/app-admin/awscli/awscli-1.35.18.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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
-}
diff --git a/app-admin/awscli/awscli-1.35.19.ebuild b/app-admin/awscli/awscli-1.35.19.ebuild
deleted file mode 100644
index 0fc6192a8587..000000000000
--- a/app-admin/awscli/awscli-1.35.19.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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
-}
diff --git a/app-admin/awscli/awscli-1.35.16.ebuild b/app-admin/awscli/awscli-1.35.20.ebuild
index 0fc6192a8587..0fc6192a8587 100644
--- a/app-admin/awscli/awscli-1.35.16.ebuild
+++ b/app-admin/awscli/awscli-1.35.20.ebuild
diff --git a/app-admin/awscli/awscli-1.35.5.ebuild b/app-admin/awscli/awscli-1.35.5.ebuild
deleted file mode 100644
index acc47104059b..000000000000
--- a/app-admin/awscli/awscli-1.35.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-		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
-}