gentoo auto-resync : 06:07:2024 - 08:06:15

14 files changed, 167 insertions, 110 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a8044844943f..304291574162 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index fec44b4954d2..d1c022a735a4 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,11 +3,13 @@ DIST aws-cli-1.33.18.gh.tar.gz 2752774 BLAKE2B 8f78ba78c3fac623f091344fb2710ac79
 DIST aws-cli-1.33.19.gh.tar.gz 2753605 BLAKE2B 5967d0cbc2afef08f28bbf9035d867d880f07c2962001611985d6c22b61f57265daa720bb410b1d2f3204a81c19415857069da668eba10bcaf9603ea9fc998fa SHA512 95eacc803d9011bcb80e5e09243b0274f17692a4a27b434de676d295c5090cc61382665226073b6ca9af7deb6701ea303f9cf1f7b6baba850eb1a828c92dec34
 DIST aws-cli-1.33.20.gh.tar.gz 2753730 BLAKE2B f72553e9a91802dd5fcaa6f2a4dd383fd13139bd9f624762310dee5d8a69f74bfebe7fb70d0a72cf73d95ee96c33ea4ea378888ec1de103fe670593423789c6f SHA512 546584f0839db3da095b5e3b8b90a5de21187a172d8b2a9bfdd8266f6a0f5c8d1a782d7d26599ce686b2a6a9f465f2bbbd9c3ef3fd691d8a1cef87a2566b6879
 DIST aws-cli-1.33.21.gh.tar.gz 2753813 BLAKE2B 236bf4bf795e7142c38090d561ed1afc80235085d348fb7e8537588ec54c6cb745817a29f6e40b0a437a3e8c4c5546ffef1b9b7a117634057359410507af375a SHA512 834408174d7b0dd2b91b8bfcc9e628a6ab96f7883798f4bf548ba9f7acbfdd97e73aac64d6e82512cf99c9b35ffd1e19581ebfc53a7cfaebb242aa65501e431a
+DIST aws-cli-1.33.22.gh.tar.gz 2754043 BLAKE2B 8645a55cc6f0570ce0e69599e010c98019e63f2616af25467eefc0911f09148b64cdb35ba48e488801afe6aaa105f7dc54e1111acb49ed954cc036f9aaf933db SHA512 1425e1fd3df1a3639838517282f3fc6b63019e25288b38e8f56cd2316c6edb695c24a5dfb4ecf572139222bb16006fd55a9912f287c24c1bc16939bcc0f3a48a
 DIST aws-cli-1.33.9.gh.tar.gz 2744062 BLAKE2B d888e111d93ec22c6bbabf083d612b15845883e2e56814a37173f79c108e4fe25745dbba83d46f99f54e7ddcc2f471c81e3b568de7233eb7e0bb51ed25a89f7a SHA512 5bdb9873487570c841b582ee466d989705c2fc5827386356819507caa8e105b76b0101555f8a6ee485f38aaa433881470fdde5cb21f6fdc88243c92ce7c31a81
 EBUILD awscli-1.33.13.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.18.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.19.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.20.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.21.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.22.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.9.ebuild 3048 BLAKE2B 12780280e20a5681960cbfeaea03d9f3fcc292c8f1c1b2f174652dd6a76e0aad304e84a5acc67687f5585781bee6ad8568cafc6b02bf69aee39d180b1dfa7154 SHA512 805bcb6a01036c600f8a9423eda8459177d5729e11c6c9c17c4197ce06f5a0126b06cb3b760fee8f11cd81e2f962a67e982e79798aa6590099465818c3d6fc06
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.22.ebuild b/app-admin/awscli/awscli-1.33.22.ebuild
new file mode 100644
index 000000000000..a7a293c4a8e8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.22.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/helm/Manifest b/app-admin/helm/Manifest
index 516b0178f166..0e7993244946 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,10 +1,7 @@
-DIST helm-3.11.2-deps.tar.xz 125570640 BLAKE2B 7dd267c0070add0bd9ce70bc115cf9d2b427e32c5040f900ff750218aafcee331712ddc8da8c9655f06522696c5f4923a73ba8b94a13f16d09b8973d447817ad SHA512 4223461fa3d0032826387a4170492df561f828546fd4f4307ec5f2006e2abb77275382ebab57baea81767de97bcaa3642d88a022b07448e452e151d83fc04652
-DIST helm-3.12.3-deps.tar.xz 156473664 BLAKE2B 88e2e99465f977b1bec52350a3c4988a595152bacf8db0208e81b38c050ccbadb48f97e3c239ddae5fa8d16d04be5bff6d76fa09ce8fdfc73487c2a44980a2ab SHA512 211775262e51d2ebabd4bf991ba7ecc8fc0fa6b9fa06e35cb6edf127bbc21143fd04a6441759dba423950def31951067407e253b3554b9efd56b4ed93444f7ea
 DIST helm-3.13.2-deps.tar.xz 148836588 BLAKE2B 517f09305f68ef0c5ee34aecf2c5cd846a455a2fde725b4ef7befbb04bb731f8ba4c675b95d8d00be591ab02a60c707345ac4517bf235025fc3a5383ecd390cc SHA512 6785d15244fd94f884177db702436255dcee91e8d866ba5258d25d5a3d21d91c3de7b1644bf43a139d353005708c0ff615da1b09b3a18b3547efc05441d27ae2
-DIST k8s-helm-3.11.2.tar.gz 733884 BLAKE2B 2077927a61b8dcbf5907f8b2760445c8f846c186d504fc9bc9037fdafa4ad15cd8ccaaed3033be7d96cc3e05c74c283bf84c69d666721fef43198c44529db681 SHA512 32b251abf520692490e5dc9affa33b73955540a90854c84cc645364be8a4ca7afa1a9bf356a19be1efba6d35d36ef69f7b420402f73b96790f04635e9e881756
-DIST k8s-helm-3.12.3.tar.gz 721672 BLAKE2B d426d77e8fc8bb4ccd149e05bb3ee6f2ac38260a609bd2a5301a6318b961fb2ac19cd30f0c1372eaad67c5b8d301e356f310653ed8a682eba77d980cb0bf35e7 SHA512 25015a8ce8f04887ebb3add1a151670ff500c24b5b8933cfe3a956db1478483902a9c9c5bf57887b9f4b891e8d479752d9422ee68b43b9140fa0edc37cf38753
+DIST helm-3.15.2-deps.tar.xz 69934404 BLAKE2B 2a27c63c52f88e8b02e3db44d3ab8e0d5a0c4d46aa6ac0b97255cae475f4bea1c7f9223e9a53b1196c78d1ed093fe110c39e1cd96e31e7a3b5bf69470dec29c9 SHA512 5d6890ff3208cd0075128a44419f3652f17bbf6c84975c6dd54cba0d444dee05bf71254832f4cac0a9292e1918ad5c3372f4df14cf4dc5cadb532f5da2bf672a
 DIST k8s-helm-3.13.2.tar.gz 718707 BLAKE2B 10fa4c7212eeb9bfd3bbe1f3881c67ae0de83ec8931c20cb2fb5e35b5a10207fc9960d21e81c0796e6e37353fd4a2e5afe325bbaadd6d28afaff6d7b68b7f1ae SHA512 989bdc7f3a0ab5c460a8882c2bbd07c0736dee506e3247c0cc0bd9830a321d187f26ef51954c7b81307bd1064754f805be3e5980c5be7eefe4a954f254722902
-EBUILD helm-3.11.2.ebuild 1030 BLAKE2B 09ae66be54ef7c2e7cd416069b62385ffe162998d4a04555ac700cdc3b2b26005a93dbf193c3538ab40ce3acb372e6258a782423da47c814ba56b8eaaf6ae40d SHA512 7239b3d8fea590d062b0d00737c7fd632588c8e618b64c0cdd92e2c0e6782a197eb0aef78e0a2a8c6d73e5bf0f2e8034915027451e9471421337a1b06d087158
-EBUILD helm-3.12.3.ebuild 1031 BLAKE2B 5f81b3f1bb47ade0f126d115b1254872cfd2d83e2a7580ed90d57028638372e4a970a53e9720a926f7d261ee7cb0eac7a94dc4b3e684d5cff157839958332d95 SHA512 68a984b5c14b558a61ba47b43efa5a3f8ec9cc30554a7a21339ddfc93b6c193d1bb0f8db2eaec16393f53e1b26967452996802be650557a10ce5acc41c43786b
-EBUILD helm-3.13.2.ebuild 1031 BLAKE2B 979f21dda6e975eaf58af9f097c240867b02225982b54a7cd00cfd21c15b430a7f5107dbe570627ca8999193e477c7b1976d7e96983a8ffe5119383ac6e9d7c7 SHA512 fbc09264b8ea065c0c48d11c550c75ad0d0078888ef14e36fc833290d24007dca0bbeb307f094ca16546afc12ee7a8bb36472f44d1d3f22e5aef50f602ff3616
+DIST k8s-helm-3.15.2.tar.gz 732780 BLAKE2B b62a9064393378ec459fc9b1b81795c21af98d272388b831a07cb38254aafbd378149733916a6985ff816c4c2da67036fe81adca41be32cb96b16d348e797a3e SHA512 bf37ac419d3a8b98e8c7ca81e6e6e9fd1dab0a3b1c4824e3e98040859790ebb2bf4d1a972333a5d28e56d3f3d64590a34acc6af44bb56b7ac1fbfdcba3a5c0c5
+EBUILD helm-3.13.2.ebuild 1030 BLAKE2B 1d03c4d3ea7ee2aca2a263a64c2ef2339c5f77ee25b721ba280a5090dcdc045df6b99624cd451f289e4b98e1744db869ca801f027d4a9e511e2e1afa55eda051 SHA512 613545e914ba0fc4d6703df0120318b1f978880710739f9247ae9f7fcddf2076d29c3611bac69e18c428dcf4ba792d6de1fd6fb33ca60ce14f18ab0a98dea6a9
+EBUILD helm-3.15.2.ebuild 994 BLAKE2B 7e219571112288448a12c6f0bb339bb08d8a8a8d2cecffd1953b84cce21f3673ca4397e500cff98e86fb3eee21447f296e1af49c0f7be896cd28035ff20650ab SHA512 cea56ad2af32d9e3c7e9686b0095969c7ec6654d772fdda5bc8bf0b98ed8e201fcfdc94f659795adf2f704724675d58e1c6826fd4df7740525212cc2c09f038b
 MISC metadata.xml 323 BLAKE2B 5001082c76e55c24c27deced68a33a8fc8c9514b65116aa076ade0bacab00103a19e0807af8187b7bd8b761e64f20c4fab74b998e0f9ec473fb8d2bc9cbe4412 SHA512 a039551d398af15db8fb487b058ad569731376c51f8a23c245e4c14cd8924b960a2dcb286618c9365d21d219a271f1e0c6bcab712cf88920f4fc7fded832d800
diff --git a/app-admin/helm/helm-3.11.2.ebuild b/app-admin/helm/helm-3.11.2.ebuild
deleted file mode 100644
index 4f4a89ee621a..000000000000
--- a/app-admin/helm/helm-3.11.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-GIT_COMMIT=912ebc1cd10d38d340f048efaf0abda047c3468e
-GIT_SHA=912ebc1c
-MY_PV=${PV/_rc/-rc.}
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/helm/helm https://helm.sh"
-SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv"
-
-RESTRICT=" test"
-
-src_compile() {
-	emake \
-		GOFLAGS="${GOFLAGS}" \
-		LDFLAGS="" \
-		GIT_COMMIT=${GIT_COMMIT} \
-		GIT_SHA=${GIT_SHA} \
-		GIT_TAG=v${MY_PV} \
-		GIT_DIRTY=clean \
-		build
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/app-admin/helm/helm-3.13.2.ebuild b/app-admin/helm/helm-3.13.2.ebuild
index c82d02143876..2e6be981ee17 100644
--- a/app-admin/helm/helm-3.13.2.ebuild
+++ b/app-admin/helm/helm-3.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv"
 
 RESTRICT=" test"
 
diff --git a/app-admin/helm/helm-3.12.3.ebuild b/app-admin/helm/helm-3.15.2.ebuild
index c73593f6e142..8432f2b538c6 100644
--- a/app-admin/helm/helm-3.12.3.ebuild
+++ b/app-admin/helm/helm-3.15.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 go-module
-GIT_COMMIT=3a31588ad33fe3b89af5a2a54ee1d25bfe6eaa5e
-GIT_SHA=3a31588a
+inherit shell-completion go-module
+GIT_COMMIT=1a500d5625419a524fdae4b33de351cc4f58ec35
+GIT_SHA=1a500d56
 MY_PV=${PV/_rc/-rc.}
 
 DESCRIPTION="Kubernetes Package Manager"
@@ -33,8 +33,7 @@ src_compile() {
 
 src_install() {
 	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
+	newzshcomp ${PN}.zsh _${PN}
 
 	dobin bin/${PN}
 	dodoc README.md
diff --git a/app-admin/logmon/Manifest b/app-admin/logmon/Manifest
index 937f85d18c16..4914e2de78e2 100644
--- a/app-admin/logmon/Manifest
+++ b/app-admin/logmon/Manifest
@@ -2,6 +2,8 @@ AUX logmon-0.4.4-char2int.diff 169 BLAKE2B a4408e7ed72b4e035f7becbbcf57e43751a33
 AUX logmon-0.4.4-gcc43.patch 211 BLAKE2B baf51fb3464d371cd884f6951fb5889df46efe36e0e5ff94012d31cff291bb83c40f9b5f178e16bbd27bb1a5d5b2ef601e0fd49c5936769dcd7f2d6bbaff7ab5 SHA512 8e5594fc769b1fe3807cc296e50dd2ae6f5035d60d6dc2faf586467d8693c1d7565f671025e2b588948abf27b2942d02f5afcdbeb02f4c60a3ce02f6acdfcd08
 AUX logmon-0.4.4-maintainer-mode.patch 284 BLAKE2B aecdf044dd1a91911edf87343a55718008db8d63eca95755fa71ae65175b8cca858cbddf1147b9f4e241adec18c59911f7d96bd27e81c65a610626644ccf58e9 SHA512 5720b1db0f9c449f02aee075cc677e83e0393b33ae990e6b88aa5d0b637b28d69d11b7813360f899510cf1a7d39b30d17117fccc1ceae2cf88aebb509eadb600
 AUX logmon-0.4.4-tinfo.patch 247 BLAKE2B ba5a762c187940fc86f7ae6845d221451a0158bbef85314f24a418d02f426460f5c8a5194eff9d6e413b41291444d7638c859ff7e9409540b6b0eb1152daa152 SHA512 3d11e8c19aff181a6886c6dd14cfe3956d1bc60c3919e9c1a1ce693111c407f9c631113386381c4391ccf4d81bdd6625fc255c7608c7f688880e22e84e9e1af7
-DIST LogMon-0.4.4.tar.bz2 65975 BLAKE2B 67f7dee996d18ef398dfbdf56c9092d2906f562aa245de0dc481eaa5c17edd8c9b300f234363641d6911cfe7b6d8c736a354e5f424eec948f0d520bb01e047ca SHA512 9ddbccfea0cae3d7fa6ffa9576f0030b6fb66e0dca152fb5242e7bd19ce319e922264720fa44f6b65319f8b25ad9e208a01434b94c629fa737bdd82ea22a4fac
-EBUILD logmon-0.4.4-r1.ebuild 976 BLAKE2B 8356638ec373714cadc15a9a84c9829a34ce1cc931fab4d3e8f6e903504949c5123e5e8334795959a68928c01cca326f4df5c0fb40c7a6786855fb17cea66888 SHA512 b00d3b3933c117e8f8bb974814e48aa93c7fcbae1a95c30fb7d23b4bbf9631c88eb1e05dcba2603e87684494260fdcfb1b2d49d76364bbf47540ea042073fa36
+DIST LogMon-0.4.4.tar.bz2 66904 BLAKE2B 2b4ba55a4a4924580d0ad1c3e7320ceb36919e9d6eab23e6fc4e03085f878db1ae49c7fb69986fbe266387c85be859a34834e2d5c81c3bdd7e116bd6710e63e2 SHA512 4d75e9664a92a196eb2d0b4e3673b87adf9d4b53d4d99c1c8a72620637f005422af4d2a008e861ea03772c1007d510fd4a9b1c9847b024af6711959680ac6edc
+DIST logmon-0.4.4.r1.tar.bz2 66904 BLAKE2B 2b4ba55a4a4924580d0ad1c3e7320ceb36919e9d6eab23e6fc4e03085f878db1ae49c7fb69986fbe266387c85be859a34834e2d5c81c3bdd7e116bd6710e63e2 SHA512 4d75e9664a92a196eb2d0b4e3673b87adf9d4b53d4d99c1c8a72620637f005422af4d2a008e861ea03772c1007d510fd4a9b1c9847b024af6711959680ac6edc
+EBUILD logmon-0.4.4-r1.ebuild 1002 BLAKE2B 9d45b5b3585766fb055947310111526524ce36f295b86ad93d92f4a671d6733cfcb1d663c75d7db21a67c6a162a5e41aa0e86f411f0813a070c9155c140910df SHA512 557b97b61035bfb68adee65746dcbfb3b071fc01416154a9548d9c4809cf78dc95f5bccb2c7cc63758a93226f65ae8745b7d08d6c843f907be962ab182561eeb
+EBUILD logmon-0.4.4-r2.ebuild 987 BLAKE2B 1a0f9be64daf7bd188e3c67418e55771ba2c1d3a8b4e7d1a7d196d93caf8c77873ee0c12b87323472c33e0d6e1fc0ce95f9bc4b8b9ae1d583faf8828d51971b6 SHA512 cae58678878a1d6d11869d742bc5b4c07b35d32544060a71340ecb297b543644e395902d7c46deb4b090a50b5f46a3e91173188f4c47d784a7efe774e29b45f1
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-admin/logmon/logmon-0.4.4-r1.ebuild b/app-admin/logmon/logmon-0.4.4-r1.ebuild
index 9aaa2ca57d66..a572ede4cc80 100644
--- a/app-admin/logmon/logmon-0.4.4-r1.ebuild
+++ b/app-admin/logmon/logmon-0.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ inherit autotools flag-o-matic
 MY_P="LogMon-${PV}"
 DESCRIPTION="Split-screen terminal/ncurses based log viewer"
 HOMEPAGE="http://www.edespot.com/logmon/"
-SRC_URI="http://www.edespot.com/code/LogMon/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.edespot.com/logmon/files/${MY_P}.tar.bz2 -> ${P}.r1.tar.bz2"
+S="${WORKDIR}/${PV}/${MY_P}"
 
 LICENSE="Artistic"
 SLOT="0"
diff --git a/app-admin/logmon/logmon-0.4.4-r2.ebuild b/app-admin/logmon/logmon-0.4.4-r2.ebuild
new file mode 100644
index 000000000000..79b173210a7c
--- /dev/null
+++ b/app-admin/logmon/logmon-0.4.4-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="LogMon-${PV}"
+DESCRIPTION="Split-screen terminal/ncurses based log viewer"
+HOMEPAGE="http://www.edespot.com/logmon/"
+SRC_URI="http://www.edespot.com/logmon/files/${MY_P}.tar.bz2"
+S="${WORKDIR}/${PV}/${MY_P}"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Bug 119403 - should be in upstream next release
+	"${FILESDIR}"/${P}-char2int.diff
+
+	# Bug 250602, gcc43 fix
+	"${FILESDIR}"/${P}-gcc43.patch
+
+	# Fixes maintainer-mode detected.
+	"${FILESDIR}"/${P}-maintainer-mode.patch
+
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	# Uses removed 'register' keyword, bug #894206
+	append-cxxflags -std=c++14
+
+	econf
+}
+
+src_install() {
+	dobin logmon
+
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 683247e971ac..c2f42589f221 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,10 +1,7 @@
-DIST terraform-1.7.2-deps.tar.xz 334339964 BLAKE2B 1f1e8b41dd164bb92271d8a29a8ec31a9aa34272c3ce8530518b0a2fdc1706a97581f6096b8bc564aa1291e6c53c1a5833a32af841fcc410b0c9880412a5edee SHA512 f8979165039a1c928a5de4759b96155b1c76ffa9ff5dd21081007f0b695f52b035d6cc8925cddfa20da3e252120642b2e58db3b76c47b4ccc845022440ac550b
-DIST terraform-1.7.2.tar.gz 6135908 BLAKE2B 252fbc41171a00c5077d7f07af25d912507215d1dd51be2c73b79a185a60c2eb486e5dd6ffd55bce06e1d2996b908930b5dc3cd73069fe78f7ac2e75cf144c26 SHA512 e9843cfa4a1f830fac10908257d05d08a6490edd9caeb8b83b45a6d1d282f98b6db0d07a4b2bc12439a76c0eb6a0bd0ab343a30cd92de6670c1ad9473d51c6d1
-DIST terraform-1.7.5-deps.tar.xz 107757204 BLAKE2B 07f788ed4d97724190e2201e5e66318ee2906a4dbf680a7359c329f388f8e9a82dd45dcda874cceb1d51df4af0c6ce0d6de517522bdf24e753db19db32b34dda SHA512 988be8a5b2adad5300d67f1b6861f2fc15285910af5982e4215aebb443414e0445acd3f9de5d6bb569453f2478f146b93a0d79ecc6979173ba22d1f5902f7a97
-DIST terraform-1.7.5.tar.gz 6137112 BLAKE2B 8cf8c1ebd2ee79ba0332ebe8b5614700dfe3bcf2f74a52a72cf971da35a1b5c32d3ed611f9e3ff5360215529ef94804b5acee2041a7d4240749c4f866251af36 SHA512 344942400cee43e2ba0c6de933f618b7dc5a7997567e613bf420d7da1f6314f7f9a42ffc32b27974d86f8a7f867f67727f1472ea120510df16d73061b11166fe
 DIST terraform-1.8.4-deps.tar.xz 107840308 BLAKE2B 414f8e4bb6c72aa8bb0d5ed040c49c572aac0a50932f2ca3c0eddc6973f5fd21775c2db394d21628bd7bd302900fb28f4713ecf9835b5bce40c15ec6fb34bf4b SHA512 3491fc9e789444882acfcc4a8374cb3e49f6fe128d66f53339145b7fa6b75e73c8d5d294ee03b0e96af746dc0cbc6c2e0bce1d149df1c881c686000431b22428
 DIST terraform-1.8.4.tar.gz 6307332 BLAKE2B d26d62e4e99bf0e0b23277c7343e6da0281bb3b9bdfbe6b74277bc6a2ef9b8cb2e374b204ecdd933819a5576bde44115998ac030d7b801d8dd40a390d9df40dd SHA512 0babc6400a8e49ebcc734cf7ff4377ae91fb90f1e77b56e8fdc288203e1708b8f7c5c16e4aa64a720ab4b4c191959d0cfdfda1aa3514c36e806c8d5b7f65b663
-EBUILD terraform-1.7.2.ebuild 876 BLAKE2B 841a5d7654dd92da6e4ecf4473d9daeb6085026ddcd42adcc5c1992b2ddd3931e4c52e8a5922df3a9ca325cc1353eee0ab5698285ca9268852b29bf95c14ef5c SHA512 2a70783aed35558ab923f3bdef52aec9f889989cc3f9e12d6673e9ed2c8fd9f83d6eb27e6310c30ad2435b0cd988e8aac29f5a6eb1a3c15d74186b2994694674
-EBUILD terraform-1.7.5.ebuild 877 BLAKE2B ed81e582aaf9f0da4617e628176f86712272eec094ee4d19c7374c0a247248efb24e2f3688b3db40da85fa170db1de3011ede5240a109168d31f15a69298dd4f SHA512 e443ae4e74edb1cb95279590d4b733376d636f67a6d36757a7f8cafa236576d7e19cab06310b149c175ba19f6c7d049a8fd8cfe8d902a7b6327aef1cc043af85
-EBUILD terraform-1.8.4.ebuild 877 BLAKE2B ed81e582aaf9f0da4617e628176f86712272eec094ee4d19c7374c0a247248efb24e2f3688b3db40da85fa170db1de3011ede5240a109168d31f15a69298dd4f SHA512 e443ae4e74edb1cb95279590d4b733376d636f67a6d36757a7f8cafa236576d7e19cab06310b149c175ba19f6c7d049a8fd8cfe8d902a7b6327aef1cc043af85
+DIST terraform-1.9.1-deps.tar.xz 108273656 BLAKE2B 6bad479e0217eeafcb5f7c75926d1dcdc50873f34d194d4829a1277a06ab81a4ff4f5945ab8ba628f40475fc93e9375a165e08f99b4bc685f3d150cfbddc0a71 SHA512 0016d5bd19a34032daf58cbb8d42ba3a2209cb295f6e20c484f45b70daf3283dd2de213446ec7cc088df24ce1d825b4ab8c064b2162739356f815cab7b61cbb2
+DIST terraform-1.9.1.tar.gz 6563160 BLAKE2B 3f9d8992ca15ddd0fe225fbdb6dc194dcc42dd1700edf739f80b4fe1aef5dcdbbb560a525f0f5564562d0e299cbabbf542c54d49160fb1c8ff674421200f39de SHA512 bbc4d03807f714902300e0a461653c137cebdcaadca879da8834fc232955d2f700711541641f05337946c755e9963010034998bff76a84aa1ac65fa6ae6871ec
+EBUILD terraform-1.8.4.ebuild 876 BLAKE2B 841a5d7654dd92da6e4ecf4473d9daeb6085026ddcd42adcc5c1992b2ddd3931e4c52e8a5922df3a9ca325cc1353eee0ab5698285ca9268852b29bf95c14ef5c SHA512 2a70783aed35558ab923f3bdef52aec9f889989cc3f9e12d6673e9ed2c8fd9f83d6eb27e6310c30ad2435b0cd988e8aac29f5a6eb1a3c15d74186b2994694674
+EBUILD terraform-1.9.1.ebuild 877 BLAKE2B ed81e582aaf9f0da4617e628176f86712272eec094ee4d19c7374c0a247248efb24e2f3688b3db40da85fa170db1de3011ede5240a109168d31f15a69298dd4f SHA512 e443ae4e74edb1cb95279590d4b733376d636f67a6d36757a7f8cafa236576d7e19cab06310b149c175ba19f6c7d049a8fd8cfe8d902a7b6327aef1cc043af85
 MISC metadata.xml 1076 BLAKE2B 85b510c328c94106cb16527407d4694f6acc80d5aaa7ed677efc438be3522e52befc910b5b8805d2d1705bf1b0b220ed631e40bdbb1297779e96917158977f1a SHA512 06a6e462631d6ae026a127ea4c3f1cba4d84651d03011e08fa028adf2fbcb7dfbcd003d132d4a0ae58b7addafa5588270c3155d0cc400a3730628bd8bd716d95
diff --git a/app-admin/terraform/terraform-1.7.2.ebuild b/app-admin/terraform/terraform-1.7.2.ebuild
deleted file mode 100644
index 78692f4a1150..000000000000
--- a/app-admin/terraform/terraform-1.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="BUSL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-BDEPEND="dev-go/gox
-	>=dev-lang/go-1.21.5"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	export CGO_ENABLED=0
-	gox \
-		-os=$(go env GOOS) \
-		-arch=$(go env GOARCH) \
-		-output bin/terraform \
-		-verbose \
-		. || die
-}
-
-src_install() {
-	dobin bin/*
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-1.8.4.ebuild b/app-admin/terraform/terraform-1.8.4.ebuild
index 6366b8f6f5db..78692f4a1150 100644
--- a/app-admin/terraform/terraform-1.8.4.ebuild
+++ b/app-admin/terraform/terraform-1.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="BUSL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 BDEPEND="dev-go/gox
 	>=dev-lang/go-1.21.5"
diff --git a/app-admin/terraform/terraform-1.7.5.ebuild b/app-admin/terraform/terraform-1.9.1.ebuild
index 6366b8f6f5db..6366b8f6f5db 100644
--- a/app-admin/terraform/terraform-1.7.5.ebuild
+++ b/app-admin/terraform/terraform-1.9.1.ebuild