7 files changed, 142 insertions, 3 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2c3cff43427f..26da796766df 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index abf89cbf4f01..3f46e2fcaac3 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.33.31.gh.tar.gz 2765982 BLAKE2B 424422520aada1a5ab21843e61d502793
 DIST aws-cli-1.33.35.gh.tar.gz 2768498 BLAKE2B d925c1a63a73bda27711d2f930d0832ea17e012d62d634330cef16f1962cbcbeb9149a5ef14765af04bfbc4b49c6160a319e02a3eab475473a2fe46ab27da305 SHA512 5804947acc002cd9f53b94865542d4f4708116a3a31dafd6a217e84d2222ff973b6c6af0237272d52d9d15e0eaf7f243ef577c1a1b3c2f18e845857886d9f2c1
 DIST aws-cli-1.33.40.gh.tar.gz 2769444 BLAKE2B a26e26cb4694460e36fe2d9730092db33aff74e436642f3de5f94dc2fcbb594bb1ef2db425584359f50d0ae37be8be6034a0e722968a0ea4179e888b2f23be7c SHA512 d19d762a1ca0b02f3076d9241be19755f74c2b228cdb258f873d73dc91f25730b40e4a82bed3cb77e94b30ba34e1260629a3af6e7a7b7df108522d21103f34bb
 DIST aws-cli-1.33.41.gh.tar.gz 2769886 BLAKE2B fa6ea3d7349b1fb5a7ed4e0d8a4b2dcec717d97c471976ee57637552939e0af5b6ed2d7577a73dedb51a2dce634920ee7413178390047e58d00a5d48592fbcbf SHA512 82efb569286f5dd64b6d63b177224eab389713b9a6b81c928b471df91d65bac70fa9931de49f3f776c4660f79c614dbdc8b5d35d77f85511e42b5eb1cf5c8d6e
+DIST aws-cli-1.33.42.gh.tar.gz 2770522 BLAKE2B 2a5a61ee0359a443c59330b5d5f939622e0ca36503ee4b3f343228f3aadff3741e43203b18b38c342fd838f1c624b6059746d56af9ba4065e8aeb570db1139d0 SHA512 bfdc55ab0d462d24769054bd5cad4af80da1ee6b4dd657a6f6a0c4543741cc93a36c7cef3176c3062e8ebbab6dc54d051e46ea09eb5bf39cf443ec0a18660441
 EBUILD awscli-1.33.31.ebuild 3048 BLAKE2B 4002d52c91dbcd135f95485348470378b344c96349c05b8cf1424900a18cbe82683c050253b47d845dcf0d4373ed97946287f1e403e5d2a7e0b2646449257a4b SHA512 ec71ff0fdf28ff024763abb7e7f603521b109f027cb56c2806ab6bf50c71a02947cbf067d112451093df8ae6c786585effe20c5c980138d7a8149219d59edfff
 EBUILD awscli-1.33.35.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 EBUILD awscli-1.33.40.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 EBUILD awscli-1.33.41.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
+EBUILD awscli-1.33.42.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.42.ebuild b/app-admin/awscli/awscli-1.33.42.ebuild
new file mode 100644
index 000000000000..c212ce9cac21
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.42.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/cdist/Manifest b/app-admin/cdist/Manifest
index 9a8939188335..0a894fdd5265 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,3 +1,3 @@
-DIST cdist-7.0.0.tar.gz 1395298 BLAKE2B 0dc11302b4a63e24f31d598df63dc5da784cb01d57ade9b67da277b7c27f66b4c31891ce710c3acdc100e92500b0e80e22cf01882b1669fa714d70c44879f7f0 SHA512 bd87b52603443bc9ffd81785a73bc07387e0555da34b04f97619beb39a1bfcf488b84a6a37fac4fe49b9b002080c5f20a50b3f08ac3665c6c2143a4aa4ee47b7
-EBUILD cdist-7.0.0-r1.ebuild 755 BLAKE2B 46cfe8e4b5ab3e6d0faf04562b136aeee4ac3349a1c07941b471fddfe3a61e0b1d560221b6ee4c6582e0d6662f4177cef671df17be478d9b65c71538a06a29f3 SHA512 674007b62cdb8b021d9e9a690cae0f53d6500def0fa56692878b3ef2debd9e344728f82469a8be4cc1601252edf08765e7cb97db7b3ae4a2eed5c8e7793b83b9
+DIST cdist-7.0.0.ug.tar.gz 1397360 BLAKE2B 52975321d75a39677a1b299fce84c0e194bf6a11925492862ed10c108367b617d67cce035cc89291e54119ebfcb32e87f81f3b3c5ee19e249a7310303016ea87 SHA512 88c6f7ff68c42dc7db37a5df1fa48ee06b1dc505ec78148bc65923dab68c9dbcf302dc2fb7197f43202ffbcb11c3a82b7303398a805b445f18e43b6fec30c813
+EBUILD cdist-7.0.0-r1.ebuild 758 BLAKE2B f7a6d26e02a6f608f22c20c2ecd2ddbbcd21e8364fde6a47bf4dbfe8f6f187806407c6ff256045d5fed7f8c439ac9a681ebbe0009987f1d995656ce5c5cd16b3 SHA512 85f1f4d3f344feecb5e0850b376c70fc0347d3e0977ee9363140144c0b52036fa29e60b2dc980b501a038d80261765eb30dcb659816dca0f7478e5468419a672
 MISC metadata.xml 236 BLAKE2B 354b036d8fa34ea50195ab2125b113da315ba5254902cebee161e7b8710904dee7a9ae42bddd0b3b6cedb8021bbb60a35c705d993f2065ad9a8d662a0efb8c3a SHA512 dbdc16a1739daf1ed58da5e6ff4bac4a03d52b2ab62e47c6db96ff4d8bf4080b4c2f3a02e566152eacc0a54afa69b18e3d8fbfd0f47361774e78f4d41656462c
diff --git a/app-admin/cdist/cdist-7.0.0-r1.ebuild b/app-admin/cdist/cdist-7.0.0-r1.ebuild
index 7186e9fecd36..6cac7dd5a870 100644
--- a/app-admin/cdist/cdist-7.0.0-r1.ebuild
+++ b/app-admin/cdist/cdist-7.0.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="A usable configuration management system"
 HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
-SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/archive/${PV}.tar.gz -> ${P}.ug.tar.gz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3+"
diff --git a/app-admin/linode-cli/Manifest b/app-admin/linode-cli/Manifest
index 363bf907c1d2..89093c877a92 100644
--- a/app-admin/linode-cli/Manifest
+++ b/app-admin/linode-cli/Manifest
@@ -1,3 +1,5 @@
 DIST linode_cli-5.50.0.tar.gz 146902 BLAKE2B ebe83454f06bc281a91dcc276db7378779d73717ca49bbcc81fe59e61c6eb448d7a7bde9e5482bb21ca05c0484001f86dab4b4296011ecbb156c13b38573f7ea SHA512 3fb95f76c19f17f897ebce3bfb6d32de1f9a2ed2d8ba9078180e465acbe20b873a59092809a2c766c326e0c5e27c983c84aef9ae7c210004f51b2b62225694e1
+DIST linode_cli-5.51.0.tar.gz 154535 BLAKE2B 7cd59795bed698ec73510d7881a2768f31fb405619e991608b711433cc971aa024d173b54a184b96aa7de9db879593fd358d5b4cdd140c699f941ad19f29bdd4 SHA512 ca9fad8af34e84993c8be9d6f253955389df32d42e6a881b72b2445a71951b5d2458e8580189fdc26d3c870ff7af20fce71a4a838aeb0d96380b0588e1f34146
 EBUILD linode-cli-5.50.0.ebuild 1338 BLAKE2B 8cdcd6d7ad933ac3ee00ad19a9f900961de75404b4e9b36f8043cca9e76e6db846c1ec4a9490901edd15cba501fcf9671a808444f144962b63574c60281343cd SHA512 396a0108dfddab2e2c5ba57caec6d599d3723807cce301a2545415f0e0c625e6f0c0e846b2b243bba459695928c360c35ed04ea027ac236c450530458c6893d9
+EBUILD linode-cli-5.51.0.ebuild 1338 BLAKE2B 8cdcd6d7ad933ac3ee00ad19a9f900961de75404b4e9b36f8043cca9e76e6db846c1ec4a9490901edd15cba501fcf9671a808444f144962b63574c60281343cd SHA512 396a0108dfddab2e2c5ba57caec6d599d3723807cce301a2545415f0e0c625e6f0c0e846b2b243bba459695928c360c35ed04ea027ac236c450530458c6893d9
 MISC metadata.xml 483 BLAKE2B 7b3a4b824e16ba32424777359d0daf09d17cc498a06f9ce5acfd7baec80ffea26220145676f37edfe46302257fd0a2bc5071d60f955dc19cda582419b2027f5c SHA512 33c8fae2235a7a6d2653a4db3341b2d69e390ed6dfa33868dd7e6b3a384f78013ae3c42a91d8eddd25929086f7705ce0869a34e28eedadb497e286ae59570be4
diff --git a/app-admin/linode-cli/linode-cli-5.51.0.ebuild b/app-admin/linode-cli/linode-cli-5.51.0.ebuild
new file mode 100644
index 000000000000..21d1ca44d811
--- /dev/null
+++ b/app-admin/linode-cli/linode-cli-5.51.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi shell-completion
+
+DESCRIPTION="Official command-line interface for interacting with the Linode API"
+HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Tests require network, a linode account and an API key.
+# WARNING: tests will incur costs and will wipe the account.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/boto3[${PYTHON_USEDEP}]
+	>=dev-python/linode-metadata-0.3[${PYTHON_USEDEP}]
+	dev-python/openapi3[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	PYTHONPATH=. ${EPYTHON} linodecli completion bash > "${T}/${PN}".bash || die
+	PYTHONPATH=. ${EPYTHON} linodecli completion fish > "${T}/${PN}".fish || die
+
+	newbashcomp "${T}/${PN}".bash ${PN}
+	newfishcomp "${T}/${PN}".fish ${PN}
+
+	dosym ${PN} "$(get_bashcompdir)"/linode
+	dosym ${PN} "$(get_bashcompdir)"/lin
+	dosym ${PN} "$(get_fishcompdir)"/linode
+	dosym ${PN} "$(get_fishcompdir)"/lin
+}