gentoo auto-resync : 10:07:2024 - 12:25:06

5 files changed, 94 insertions, 2 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 225eb62c3b57..aa1b1c5b1fd4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 2f1d5942d689..a5087c9a4696 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.33.13.gh.tar.gz 2751169 BLAKE2B b849f4c5c0eac5092c3f163c4344a7bee
 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.23.gh.tar.gz 2753877 BLAKE2B e7babf49849a43a6f69b029ff3e27bcc1014498dfcc0a3711ca71aea7f992a3ac16ee21804767314d8141e7413a107227a66de45a83ea478782ef2b9028249a3 SHA512 22a81a95f2fea6ffd180c4003e074655cc6470e949ab4b99120dae17778fedbd56d11fcceb51f8d89eec4ef6a1b659cc986abf34fa26cd77cd5a58b59342f4aa
+DIST aws-cli-1.33.24.gh.tar.gz 2754563 BLAKE2B c2e2e8e939929909da58e055bc97d65fc4f6df254e596dd8aac57c2bf82dabba9eeb29c9c8c8d8fd1ccd22d8c7fe20127b9801963f127b5ba008c6918e1307c5 SHA512 d830150f802fd093076041f113bb052d9049828d02cd03d161f386e326ff7b56d151189d9e33f3d1e4e7871f6fdf5624f205962353e92436c0782b4f8effc127
 EBUILD awscli-1.33.13.ebuild 3048 BLAKE2B 12780280e20a5681960cbfeaea03d9f3fcc292c8f1c1b2f174652dd6a76e0aad304e84a5acc67687f5585781bee6ad8568cafc6b02bf69aee39d180b1dfa7154 SHA512 805bcb6a01036c600f8a9423eda8459177d5729e11c6c9c17c4197ce06f5a0126b06cb3b760fee8f11cd81e2f962a67e982e79798aa6590099465818c3d6fc06
 EBUILD awscli-1.33.18.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.22.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 EBUILD awscli-1.33.23.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
+EBUILD awscli-1.33.24.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.24.ebuild b/app-admin/awscli/awscli-1.33.24.ebuild
new file mode 100644
index 000000000000..c212ce9cac21
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.24.ebuild
@@ -0,0 +1,90 @@
+# 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+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/monit/Manifest b/app-admin/monit/Manifest
index 7b65f165f6cc..a17e29d8871c 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -9,5 +9,5 @@ DIST monit-5.33.0.tar.gz 1502487 BLAKE2B 770474f010067fe6388622e764a0d032495589d
 EBUILD monit-5.29.0.ebuild 1265 BLAKE2B 5d51ce60c3ce56ff0d5499740e2ea0864145d4aed3fd1410bffeec4c184c7831bd22a277d12505cf7a12399b9a0d1ee157e0e64655910adf53adedaf195335a0 SHA512 03f9d3f8cd9e8fd8bfcbbdceaf0bb8a4cc2ce49ed80aaf0b006e1688f533867e20a73016e8e211b70bda3353aed30c483f150088d1f49825f975bd8960ce5ee7
 EBUILD monit-5.31.0.ebuild 1268 BLAKE2B 42e698df57fc83659cce8e9e4f9d5c14b158616fbfedbf3bf06a96c664014969769ce8fa581e64fd5b4d4f52ff8de44de916cd73d47a6571df55973a463b710c SHA512 8a54d32095c4df03557c02282c0b4042f719758912f78f2b068b8df186e03e1921d6d6885130fc2bdc80dc896f439632328cf9c29636c5bd300764ff63034aaf
 EBUILD monit-5.32.0.ebuild 1268 BLAKE2B 42e698df57fc83659cce8e9e4f9d5c14b158616fbfedbf3bf06a96c664014969769ce8fa581e64fd5b4d4f52ff8de44de916cd73d47a6571df55973a463b710c SHA512 8a54d32095c4df03557c02282c0b4042f719758912f78f2b068b8df186e03e1921d6d6885130fc2bdc80dc896f439632328cf9c29636c5bd300764ff63034aaf
-EBUILD monit-5.33.0.ebuild 1268 BLAKE2B 42e698df57fc83659cce8e9e4f9d5c14b158616fbfedbf3bf06a96c664014969769ce8fa581e64fd5b4d4f52ff8de44de916cd73d47a6571df55973a463b710c SHA512 8a54d32095c4df03557c02282c0b4042f719758912f78f2b068b8df186e03e1921d6d6885130fc2bdc80dc896f439632328cf9c29636c5bd300764ff63034aaf
+EBUILD monit-5.33.0.ebuild 1265 BLAKE2B d96df7b758a63361c3d22650380152f71b8226c64ac9d8997627d0582eba722115e07ae6d50500e233c0331ea388b47d1b13c6469e81f35590d04c9289ebbb28 SHA512 bbae7158790630ce300325ff7b4ad7799a22bf161485e1a4114a728384b0180746a5ac097769f5d342705e013afa4cc0c76343d61e78a7614bb7ecca38fdee84
 MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
diff --git a/app-admin/monit/monit-5.33.0.ebuild b/app-admin/monit/monit-5.33.0.ebuild
index 253ee81a7bac..8c444b2a8595 100644
--- a/app-admin/monit/monit-5.33.0.ebuild
+++ b/app-admin/monit/monit-5.33.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
 IUSE="ipv6 pam ssl"
 
 RDEPEND="sys-libs/zlib:=