gentoo auto-resync : 20:07:2024 - 12:29:37

3 files changed, 2 insertions, 94 deletions

diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 689679643b21..467fa648019a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,9 +1,7 @@
-DIST aws-cli-1.33.18.gh.tar.gz 2752774 BLAKE2B 8f78ba78c3fac623f091344fb2710ac79440d3bf96e0c33168bdf5d6c6d705318c8ea82d769eef4fb82840e8e94998b65b81999831c75be9a1924fac7be37aa4 SHA512 e0444118ab02fcba91cc1f078db80176da97abee64d2cd38875281c8344930fa63b89d1b59f43ed7690c432fc0d36273e7f4d2e0c947ae56a13ec6f42dea6ec9
 DIST aws-cli-1.33.22.gh.tar.gz 2754043 BLAKE2B 8645a55cc6f0570ce0e69599e010c98019e63f2616af25467eefc0911f09148b64cdb35ba48e488801afe6aaa105f7dc54e1111acb49ed954cc036f9aaf933db SHA512 1425e1fd3df1a3639838517282f3fc6b63019e25288b38e8f56cd2316c6edb695c24a5dfb4ecf572139222bb16006fd55a9912f287c24c1bc16939bcc0f3a48a
 DIST aws-cli-1.33.26.gh.tar.gz 2757281 BLAKE2B 04d88160203ff9cfc0c0f22dd9d57c70e95289af769b4639708bc6a760d32b324fe4785def2cfdf17abadfbfd04a2ef974979dd3b9ac6342bea230a297b7c022 SHA512 e4ce9037042edfdeb36a8bfd74f7998664838598af066cf324245ddc04555037f0ff7b69f1e2dbf0cb727932ef9a6c0feef8acafaed00e5b0c94b1b9e59a6c2d
 DIST aws-cli-1.33.27.gh.tar.gz 2758530 BLAKE2B c40db2483f0561078d1dc191e1d8c97bae0d0ab00f0ca11db796213567943f7dd816143340c6c9b9c28012d2881d860948138cc41b37555b7416a5289c7a5cd8 SHA512 3716ef6b5ab7db33496f31445d6ec404b89fc8a3fec564dd6644d43d4ea0db12aadcce545a481e955a166000386d8183e801780b6ac16e03bbea0f5ed9a495c5
-EBUILD awscli-1.33.18.ebuild 3048 BLAKE2B 12780280e20a5681960cbfeaea03d9f3fcc292c8f1c1b2f174652dd6a76e0aad304e84a5acc67687f5585781bee6ad8568cafc6b02bf69aee39d180b1dfa7154 SHA512 805bcb6a01036c600f8a9423eda8459177d5729e11c6c9c17c4197ce06f5a0126b06cb3b760fee8f11cd81e2f962a67e982e79798aa6590099465818c3d6fc06
-EBUILD awscli-1.33.22.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
+EBUILD awscli-1.33.22.ebuild 3048 BLAKE2B 4002d52c91dbcd135f95485348470378b344c96349c05b8cf1424900a18cbe82683c050253b47d845dcf0d4373ed97946287f1e403e5d2a7e0b2646449257a4b SHA512 ec71ff0fdf28ff024763abb7e7f603521b109f027cb56c2806ab6bf50c71a02947cbf067d112451093df8ae6c786585effe20c5c980138d7a8149219d59edfff
 EBUILD awscli-1.33.26.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 EBUILD awscli-1.33.27.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.18.ebuild b/app-admin/awscli/awscli-1.33.18.ebuild
deleted file mode 100644
index 1da3fc6b9535..000000000000
--- a/app-admin/awscli/awscli-1.33.18.ebuild
+++ /dev/null
@@ -1,90 +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..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+1).(z+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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[@]}" )
-	# 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.33.22.ebuild b/app-admin/awscli/awscli-1.33.22.ebuild
index c212ce9cac21..350b274749f3 100644
--- a/app-admin/awscli/awscli-1.33.22.ebuild
+++ b/app-admin/awscli/awscli-1.33.22.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+118), sigh
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"