gentoo auto-resync : 15:12:2024 - 02:02:03

8 files changed, 4 insertions, 392 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d05f2dfa99c2..8bec17285143 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index fae0cc493bd7..b8ae23d32fb7 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
 DIST aws-cli-1.36.12.gh.tar.gz 2842234 BLAKE2B b9f333d7fa8b7aa9c0452b6da87c3b097f1b5027f1f9c36888448f5e5763a93696e1d25cca167a17d9ab7332c5491be500a44462eed44c18f886ec9f0816a248 SHA512 b7797a29230628201d808958c4f9660768646f1c1a3f53c39c09791fb8ff0cbfab000b950abc87541ff9e54723b726913a487cf5f164c8b82e609fd92dae7b14
 DIST aws-cli-1.36.17.gh.tar.gz 2849378 BLAKE2B 67e79717e6ad2cdc62f79fdc6ab370e091677fff4e3f2a7872fc0f49e49e53cc395c50a5fd7ed1c46481dcc4f9b4425651bf0c09adc9f769f039647c5b33f794 SHA512 82412802be0056eaa791f725579151dab2fedbf1c6bbf5461cdde016e0d8adc977ae1fb6796696d844706f92d3a4c4bb6424e7a0e7b5a0d7b0a0c2e0070b774f
-DIST aws-cli-1.36.18.gh.tar.gz 2849802 BLAKE2B c3986340d3772e9a76cdb34b39cefcb2fa5b9a784119d02f567ee8bf2b6e872e7ae4f3ec93f36322e6af91e0e8c0f3f24302fff3fa691e8f3902f246b840f802 SHA512 830e5288f3eaf9505cd2ead20bd44e4f59c876831b9a86198532554ea03a88ebd2ef060a196bad373fdf24c7eb3bb654a8322e43601843a1a1bca72d49e81870
-DIST aws-cli-1.36.19.gh.tar.gz 2850770 BLAKE2B 0eabde9e9f355491fc5de2030b46d4cb568c1665ade8814357d295d6d8f3b1faf9ea68fc9ab3101c627630af5559e7ec6096771d84f865c9ec62f015554f6508 SHA512 40c1103011566f0363f6e9ceeb86d3610f6fc857401ae2167b690cb4e7bf50dc4169c864ac7899b4b29d6ec9cf39679f1e1dcdb8883b274b70beb4add9c170e0
-DIST aws-cli-1.36.20.gh.tar.gz 2851211 BLAKE2B a2ccd9fe5dda2e0f0135b4cd9bd87f33b880a3a6d4aadd234691705c84882b7315644e2efb519d8fc356abe638816f94b1e763ef116eb672f16e01f613cee42c SHA512 89237fda738a6b3fde9d412165554068c8882490b7a9ba3ae60226fb6f43d76ad8db894f9c39d9527294820bf36ed98d526f797901b9ca8a771669f65439cae8
-DIST aws-cli-1.36.21.gh.tar.gz 2852985 BLAKE2B 5e3571eedadd8c47a96408261f449df579e94062a99c8fbb6ebf57aedec2834dbb62230775968108c19dd6f28f09014c6d8fe1a70c1f89bb0ea53fb0ecf9f55c SHA512 5d325c7ec2e6e46311e9122cad69e8e566cf665e10fb8c74b1652e40c7c08bb8787a035748b23bdd42212efe18bd2069a433633126d1ce542ec4f4685ed3a83f
-DIST aws-cli-1.36.9.gh.tar.gz 2836018 BLAKE2B aada8a63f5bedd5aeeddd56fe18bb49ae1763ba5c737f72aa2f2e00b57fa4e1ab52ec266ca6883859ec633ec2b1658383426809870ba1372d86f9d8e0a055ac6 SHA512 ec47c26012027071732d60f9bd8b3322c1c75b2362dffe7affd8cd6d70732e6239bfbb6531759a247bcb2f29613a88b196d10f405302d25a05ada7968bd7574e
-EBUILD awscli-1.36.12.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
+DIST aws-cli-1.36.22.gh.tar.gz 2853997 BLAKE2B a9f309c157595edd37e87834e7b67c16c04edb8f9f2381e8dd2335cc932b2071f7cfd24ca4abd16100ef1de21adb7f502af911d71c20459e0321a9375a49ec0e SHA512 05ee5d22f5f552ba0e7eaf4a1a88bcb3a2cb8db30315fdbf04d9c9c1c69b07ae3a8727e1dca1b154d9dad4bf89aa5950c0f369a965f92ec99f7e0251665f13eb
+EBUILD awscli-1.36.12.ebuild 3179 BLAKE2B b08625a4293f13915f076119919380f482a550799f0b4a8ba37f413fb23314bd5f8ee153658520d17560e91fc464ffdb0bc61f444dda692627baa6ddc80fd97b SHA512 2acdae36bf23c5c4c4bf23ca22ef04df62e76f08fc3ecc9acf6ba28bd4c6b9bd325f301123c9cb5694b62991cf41bfcff797ce4c72ae07e0d7c490df02adae4c
 EBUILD awscli-1.36.17.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.18.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.19.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.20.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.21.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.9.ebuild 3179 BLAKE2B b08625a4293f13915f076119919380f482a550799f0b4a8ba37f413fb23314bd5f8ee153658520d17560e91fc464ffdb0bc61f444dda692627baa6ddc80fd97b SHA512 2acdae36bf23c5c4c4bf23ca22ef04df62e76f08fc3ecc9acf6ba28bd4c6b9bd325f301123c9cb5694b62991cf41bfcff797ce4c72ae07e0d7c490df02adae4c
+EBUILD awscli-1.36.22.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.36.12.ebuild b/app-admin/awscli/awscli-1.36.12.ebuild
index 2960403cf7e0..df478e59dd61 100644
--- a/app-admin/awscli/awscli-1.36.12.ebuild
+++ b/app-admin/awscli/awscli-1.36.12.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-1).(z+59)
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
diff --git a/app-admin/awscli/awscli-1.36.19.ebuild b/app-admin/awscli/awscli-1.36.19.ebuild
deleted file mode 100644
index 2960403cf7e0..000000000000
--- a/app-admin/awscli/awscli-1.36.19.ebuild
+++ /dev/null
@@ -1,95 +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-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-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[@]}"
-
-		# 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
-
-	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.36.20.ebuild b/app-admin/awscli/awscli-1.36.20.ebuild
deleted file mode 100644
index 2960403cf7e0..000000000000
--- a/app-admin/awscli/awscli-1.36.20.ebuild
+++ /dev/null
@@ -1,95 +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-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-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[@]}"
-
-		# 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
-
-	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.36.21.ebuild b/app-admin/awscli/awscli-1.36.21.ebuild
deleted file mode 100644
index 2960403cf7e0..000000000000
--- a/app-admin/awscli/awscli-1.36.21.ebuild
+++ /dev/null
@@ -1,95 +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-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-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[@]}"
-
-		# 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
-
-	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.36.18.ebuild b/app-admin/awscli/awscli-1.36.22.ebuild
index 2960403cf7e0..2960403cf7e0 100644
--- a/app-admin/awscli/awscli-1.36.18.ebuild
+++ b/app-admin/awscli/awscli-1.36.22.ebuild
diff --git a/app-admin/awscli/awscli-1.36.9.ebuild b/app-admin/awscli/awscli-1.36.9.ebuild
deleted file mode 100644
index df478e59dd61..000000000000
--- a/app-admin/awscli/awscli-1.36.9.ebuild
+++ /dev/null
@@ -1,95 +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-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-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[@]}"
-
-		# 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
-
-	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
-}