gentoo auto-resync : 02:12:2023 - 11:00:10

8 files changed, 4 insertions, 446 deletions

diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a1424af507fc..55dbc617dade 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,17 +1,7 @@
-DIST aws-cli-1.29.84.gh.tar.gz 2576584 BLAKE2B c442a433b0deaacb8b0a94ecb4ce296b60eb6f364bf5626d4ccf606d35b8ad22a2859c29486c9eaa8091edc9f796d271b5b7308638d10f72f128b4548f5250bf SHA512 6f46bde5016df5d227861ed80e847a893144f290dba11c57966f6ccf043690fad42dcc11d18e1b2d27225c8b070063a2c20b8a622628bde37887e44d0e0e7fb5
 DIST aws-cli-1.30.3.gh.tar.gz 2594517 BLAKE2B 67ffda10491b734a15119ed3963735e53a66d868954e908816ef918b0adb706ef23337a4dde76758bb1fc957be8a6794106c2d26b9865a9e9dd6e11cc70c4016 SHA512 9b9474a6206cecd0d9f15aabf1c94421aabf4b0ea2d5c829e59747d5fa68093e6f79b0e554ea1dfb891774a0ab49d1143cd582521bd21735e209b40f040973cd
 DIST aws-cli-1.30.6.gh.tar.gz 2596217 BLAKE2B 3b4cbd540ede2826d212233e76a4431f090fdaa1848f3ddd5e52c3d637e8ccb6ed406072b5b4b3f62b67a29a995d984bfcf1f961915594459e52199dba2341b8 SHA512 8273d234428eb42e8845052c4122e06bb6d0693d2878296a101fa3ce72c5690787c6151aa8f819db83fe36f5263d14efd1e4b469494da8994d47d1f213c394b3
-DIST aws-cli-1.31.0.gh.tar.gz 2599974 BLAKE2B 3ffc916e01cebd9e8532d01190324c3d8a51f13710751df530ab7ef24f759202bf41072367ffa871cf1a1c9d980d5bb4d5739fb9f5cc651e1e660a9684dad79d SHA512 d99497c945af03ac35fa19e6cce3b25b4cd13e5f7e84eef85bfd32bd9411d6ae0e41ca96117e2ea26c791b56cae19e4c92b742c83ef5cf5338f27ee287d78b8a
-DIST aws-cli-1.31.1.gh.tar.gz 2600259 BLAKE2B ebe55d0b5cd1ba730ce4ef6b6911b5d4877668c04428d59dd75a353ac55ddea4a42296399b53ce4ed119fcd7b877762adbf606b0dd114274cf4c68186577d1c1 SHA512 96a97b585ad8b47394412ed4d1494414e70ddb52788da5c2e8e977652b5fde2300b2c98b0727f19e1f305ff5b55dd428049cdd6fd3fbc746a4aec28d68c25f9d
-DIST aws-cli-1.31.2.gh.tar.gz 2602541 BLAKE2B a24a6a4d7c5714e4d54d6eaa2e77a0a642a815f917951b0aea23a91da745f78e647543b47e656cb1ceb6a952552b498b7ae6f316763bfae34ec5e84789564699 SHA512 a0e0e88210ce9be19c66981a8a9def72f1032492cbb6075afd0c4f9c753d270b82925fc2428f81811a6bc8745a2dccb7c2e1ad2291969c2139a9a40915c48542
-DIST aws-cli-1.31.4.gh.tar.gz 2604265 BLAKE2B 224072e17f2f2ce1227b4b1e704cc796d35c01b90aeab7a86ffbe561ac7d28bee9e5ce07e5c77c47db529c6ac590c4c1813405fae6a748869b04423dafc1acf1 SHA512 b0c34752417ee3fa03402db8024d781c198a54416ab93f7e934c1146c77685aaf7ca441946f392c5c5a1b8b228eee21283cb35ff9fb45ef97365bd3e22e79cb1
-DIST aws-cli-1.31.5.gh.tar.gz 2605057 BLAKE2B 8e1527dff985a21b08bc2c3d5008eac872b138928a034cd5dba33581daaa5003dbad6bb1c58e367c3eb9235588c76f32c5b15191e521722d42df967b1a380c49 SHA512 f8173536ae9435ccd83436ef3507e2fe69dbe1b37f124e7d5ee7506b4b77f847eb68b5e1105fdd2ccac60e06f06c0666b4137d8a933c352953beb24441cc4f4d
-EBUILD awscli-1.29.84.ebuild 2729 BLAKE2B ab4ab697b7133db15d9148aaed10613cde4010ff6edd0075a5cb036011f577fce75aca06c55fe101599b21758e57e74706066d79b7f503f17b86a556febf44e2 SHA512 15436fbd6b0aa43524d5db6ffb3840e4e5f00434e6c45d3c6b7c7bd2197849700c80c6527a99551ce32e9adcc55b1877b0ebdc53ccd9dda9cf63bc71332dfaf8
-EBUILD awscli-1.30.3.ebuild 2736 BLAKE2B e66384bff893ea10cb95002752b2adc2d126e1ea88a84f27e1ad9860c50098c9cfefa407fcafb84ef3ba575c669b8fb3c3b08e0ce12e50220b2d49ef7a23bd76 SHA512 ed98a9461b1edbe0f61704cdb69785d63df871a30890cb95ee1f10da78324b18e8bfe4f2c5010ea2429e09ff293ad8b7c1fbf4a3702788d9a9921701f833a730
+DIST aws-cli-1.31.6.gh.tar.gz 2605365 BLAKE2B 30e7789a2a4f47b3b4dce9fb3c8083d56ebec8501d66fa03e34309c1c9e0c6302ce79c044fb1aecd879f2784443db5a9927bfb1c22e94883709600f0e1c538b4 SHA512 5da1be164d4e52b255093c0685b4add43a21b2f0259a6ad9b6e6bc1c7bbb17e1ee0db0f6b29ff0227b301d7f66e1d63b3d92047ccef5578b9de6b5579319be6c
+EBUILD awscli-1.30.3.ebuild 2729 BLAKE2B ab4ab697b7133db15d9148aaed10613cde4010ff6edd0075a5cb036011f577fce75aca06c55fe101599b21758e57e74706066d79b7f503f17b86a556febf44e2 SHA512 15436fbd6b0aa43524d5db6ffb3840e4e5f00434e6c45d3c6b7c7bd2197849700c80c6527a99551ce32e9adcc55b1877b0ebdc53ccd9dda9cf63bc71332dfaf8
 EBUILD awscli-1.30.6.ebuild 2751 BLAKE2B 8a51dd7be20208a7fde6fb8836e136abeb6f3e679e43fb8bd6e817df6b7eed1183079b9a170dc1d4034a0167a05b3ad7d2c2c867dc33f483316c1fc972126a17 SHA512 48eea9498ca084097d04d2853bc75bcf1e89a6e7c0a6a1f44b2df3006f8ba0b2a610f10b44152c42e797a8664dcb17c51531b004278eaef0b69184d2b326c9ac
-EBUILD awscli-1.31.0.ebuild 2751 BLAKE2B 56ad4d6b07ecffc35a75959f4045c6c7d9ebd0e4dde78a229c3f3af09b3c08e3cd54e637f292bc1fd02e172b1ffcdbc796718b501dd59cdd5176571b2f17ad1e SHA512 a74e2b8f63a9899ae32162f5b1fc6d6c67e960d431e31244c92357a2de276f8b0a621ce06dc7efff952eae2b846ad94443b67fc8425ad4c3509d7a4bbf685fbc
-EBUILD awscli-1.31.1.ebuild 2751 BLAKE2B 56ad4d6b07ecffc35a75959f4045c6c7d9ebd0e4dde78a229c3f3af09b3c08e3cd54e637f292bc1fd02e172b1ffcdbc796718b501dd59cdd5176571b2f17ad1e SHA512 a74e2b8f63a9899ae32162f5b1fc6d6c67e960d431e31244c92357a2de276f8b0a621ce06dc7efff952eae2b846ad94443b67fc8425ad4c3509d7a4bbf685fbc
-EBUILD awscli-1.31.2.ebuild 2751 BLAKE2B 56ad4d6b07ecffc35a75959f4045c6c7d9ebd0e4dde78a229c3f3af09b3c08e3cd54e637f292bc1fd02e172b1ffcdbc796718b501dd59cdd5176571b2f17ad1e SHA512 a74e2b8f63a9899ae32162f5b1fc6d6c67e960d431e31244c92357a2de276f8b0a621ce06dc7efff952eae2b846ad94443b67fc8425ad4c3509d7a4bbf685fbc
-EBUILD awscli-1.31.4.ebuild 2870 BLAKE2B 0f04852324dac59dbc0f8587268a00dbc9c89815eab9391af22c2b9294d5890e70cdd2ace78ad388048546954db0aa37efe6d0d2304529c2fd51ebcb4bb2bc88 SHA512 907955cc560559f84aa6ed1c1969c7e409bbf2edf7ebeea7c1d95bdc2dccadc2a344d09c76ab8fcac2cacaea97ac39a606f6319976d37b4ef36548ee44c28e7f
-EBUILD awscli-1.31.5.ebuild 2870 BLAKE2B 0f04852324dac59dbc0f8587268a00dbc9c89815eab9391af22c2b9294d5890e70cdd2ace78ad388048546954db0aa37efe6d0d2304529c2fd51ebcb4bb2bc88 SHA512 907955cc560559f84aa6ed1c1969c7e409bbf2edf7ebeea7c1d95bdc2dccadc2a344d09c76ab8fcac2cacaea97ac39a606f6319976d37b4ef36548ee44c28e7f
+EBUILD awscli-1.31.6.ebuild 2870 BLAKE2B 0f04852324dac59dbc0f8587268a00dbc9c89815eab9391af22c2b9294d5890e70cdd2ace78ad388048546954db0aa37efe6d0d2304529c2fd51ebcb4bb2bc88 SHA512 907955cc560559f84aa6ed1c1969c7e409bbf2edf7ebeea7c1d95bdc2dccadc2a344d09c76ab8fcac2cacaea97ac39a606f6319976d37b4ef36548ee44c28e7f
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.84.ebuild b/app-admin/awscli/awscli-1.29.84.ebuild
deleted file mode 100644
index 41e916b44553..000000000000
--- a/app-admin/awscli/awscli-1.29.84.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 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.7.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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	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
-}
diff --git a/app-admin/awscli/awscli-1.30.3.ebuild b/app-admin/awscli/awscli-1.30.3.ebuild
index e5b1ee0667a3..41e916b44553 100644
--- a/app-admin/awscli/awscli-1.30.3.ebuild
+++ b/app-admin/awscli/awscli-1.30.3.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+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.31.0.ebuild b/app-admin/awscli/awscli-1.31.0.ebuild
deleted file mode 100644
index 509293927af1..000000000000
--- a/app-admin/awscli/awscli-1.31.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 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.8.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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	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
-}
diff --git a/app-admin/awscli/awscli-1.31.1.ebuild b/app-admin/awscli/awscli-1.31.1.ebuild
deleted file mode 100644
index 509293927af1..000000000000
--- a/app-admin/awscli/awscli-1.31.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 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.8.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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	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
-}
diff --git a/app-admin/awscli/awscli-1.31.2.ebuild b/app-admin/awscli/awscli-1.31.2.ebuild
deleted file mode 100644
index 509293927af1..000000000000
--- a/app-admin/awscli/awscli-1.31.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 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.8.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/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/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	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
-}
diff --git a/app-admin/awscli/awscli-1.31.5.ebuild b/app-admin/awscli/awscli-1.31.5.ebuild
deleted file mode 100644
index 18db68f93233..000000000000
--- a/app-admin/awscli/awscli-1.31.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 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.8.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/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
-}
diff --git a/app-admin/awscli/awscli-1.31.4.ebuild b/app-admin/awscli/awscli-1.31.6.ebuild
index 18db68f93233..18db68f93233 100644
--- a/app-admin/awscli/awscli-1.31.4.ebuild
+++ b/app-admin/awscli/awscli-1.31.6.ebuild