5 files changed, 96 insertions, 7 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 934fd91b5f1e..031e8af45366 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f9e5f9e9ea04..43c1a318ae06 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.32.117.gh.tar.gz 2732508 BLAKE2B 699d7596ea0e417f624f72e801d2c6e5
 DIST aws-cli-1.33.4.gh.tar.gz 2740224 BLAKE2B 40fb26f895a28e41e45c861194ca959490d1675e2f9926bbcb5b092d4496b20be3e68f4eb370ffef541bd607c41181d34caa4e5674fc262b60cd882401530153 SHA512 faeced07895fc891803136061839d499b372cbf89e6e642e2782120d2b1a50486e01ae07ba7ee04c9fe84ffefd0e329e000d76f38f5839b048bbfdab59a64785
 DIST aws-cli-1.33.5.gh.tar.gz 2740011 BLAKE2B 24fecba55afd540859ef1096859bb7e6dc0c482cf7c85073308e68953314ecedd5e6dae2486c55014e068a864ad6e1c9bfa7222f4b0d4f8f2ddd706b29960146 SHA512 71715622e20b337056a720be2cbb0b473320fab785031a10d7b2cd8b45bc3b9d1682c456180e1210a13ac4dc669807326418f0619ba1b1d7941df3b9b26503cc
 DIST aws-cli-1.33.6.gh.tar.gz 2741326 BLAKE2B 538a9312dabbf208d3cc3642e7dd97552263dbddf5fa5630fe2170abb9700c26ecc473771884e25d626a25a9003a58a020e6922480035b76ea3cc0ff1b646ded SHA512 142bcc69e5a4ab6a46fca4189161b0f265cb0a8005ed3e80faed891d8176d69a9ab6d6667d695f92f7651bba0273e414140427f1d04375e9b7847fc1b992f810
+DIST aws-cli-1.33.7.gh.tar.gz 2741892 BLAKE2B 10ed7e314dc2d8dee2f59044366fca0a594f0b47943e62ac8bef8cfb9c243988f36c569a216eb264a65b8cf88e273528ca0102fdbe99046ce3e04f7a78169239 SHA512 efa9f18b7c8d6f5d61dc69fb0a8e6aadcbc380c72d8193143abdec3cf51cf793250ac5a2426d36de40369b30cf7322e6a6844534ec436285fed4c77ff2fb36fb
 EBUILD awscli-1.32.113.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.117.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.33.4.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.5.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.6.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.7.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.7.ebuild b/app-admin/awscli/awscli-1.33.7.ebuild
new file mode 100644
index 000000000000..a7a293c4a8e8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.7.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..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/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
index 8cea52214b2e..91a30953ead1 100644
--- a/app-admin/syslog-summary/Manifest
+++ b/app-admin/syslog-summary/Manifest
@@ -2,5 +2,5 @@ AUX syslog-summary-1.14-fix-ignore-code.patch 306 BLAKE2B e319592affd7f13c88cd4e
 AUX syslog-summary-1.14-py3.patch 3982 BLAKE2B e468d0312a9a83b5f6a779223169cb95ad1dc86419c3e82bd5cc6b8955894fcca59723f48ab3b9c3bdc1bfad2b7d9b4524d1da40524432fe58e7391ee808560a SHA512 e3b806e31c4d4456c771f35203a164f85e1859d4885b8ccee35b22856e9628f668f05b5d0ef621c8e41e652d2365670a901ed99a582ff7d8b78452d3b1a209fc
 AUX syslog-summary-1.14-remove-file-magic.patch 836 BLAKE2B a4b2d7d40ab7c15ac33325c97d8bea3df7d7f824c3d301a6be764ac0a5ce9721fd7d6dbdd6a6f48432931fdfca7a2f1cf141eab897e8bdfa1eba20f2f9485153 SHA512 1f860cb96cf5eef124217c8253264fe24f6b7fde3d078d2f41e419490bdb3d9d4df6fed7c9b8cc68a855dfc06f81dfdc4c7e868d9812ed1a306ac65cbc97f833
 DIST syslog-summary-1.14.gh.tar.gz 7380 BLAKE2B eae488de0490416864eb20c8d36d06707214163bed2bb510e53653a169df75a181732ea439530f174c7d74e08b515c45e630b96983e78e975024b420a738faf1 SHA512 dab82f9d5e0e452d880e7e503c1de148d902c461abaf6fc1a0768516bd010c6a4e5cdbb61fd1d6e0283d55c8de9a11d02bd5828fab31cae98b59ca336a7f1a73
-EBUILD syslog-summary-1.14-r5.ebuild 915 BLAKE2B 5cc4af1d2e57b354a784a281e2f293a84b724febf7ec0ce053e2f1444793da084b837930af2d9ab198d1a09f9925fba0bbc12c3123a64926d24bd2a3a2e7be16 SHA512 6a0bac3ad4a6193db7d6abfce6609a248711be6bc6f9e3482a355176316ee8f7e3b48dd204c371e232fd0e74b11ae0844f759eb6d47dae1b6d1aa5aa87572ce6
+EBUILD syslog-summary-1.14-r5.ebuild 897 BLAKE2B 5e914fa95f403224cabaf7b748c2643320b26f9f4a38ee0cd20b7ff74dc07f43d75353573d95b18fd44fb014d846abccbee964eff9db8744299caa730730e5dc SHA512 894fe96a98d1929342dac1d40cace8bcff330db9d784244029677c1ff9c6aabf1e0f34591d60f06a1ac65b8d16c75a885c1535191235b4b6231bec2ba823fe1d
 MISC metadata.xml 520 BLAKE2B 026de4750d61ac614fdfd94a34b70c50e4ff1f164fe47573709ee11f0b97e56f59f7f898806301c3cebfcd42950f12665262e0c54359493e9681c89deaedeb89 SHA512 a4f7e6ddc67653e86aa6ddf96a92d5fb7c544f8448bb6234bf8d705487dc72b1838e13419bf13e5670e4a50ccd701693734bba2d9608951d6c8a81a186149afc
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
index b90a328f094b..24c908b81558 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-single-r1
 
@@ -14,11 +14,8 @@ SRC_URI="https://github.com/dpaleino/syslog-summary/archive/refs/tags/${PV}.tar.
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(