6 files changed, 93 insertions, 180 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 49ecff808b8f..ec0f5bc1b491 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 4033165bffc5..f3eda619867c 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -8,6 +8,7 @@ DIST aws-cli-1.35.0.gh.tar.gz 2806480 BLAKE2B d607933a9baa0e50ab8d809e0ecb68681e
 DIST aws-cli-1.35.1.gh.tar.gz 2806870 BLAKE2B 93728164035382e95bc3a181b2f36b1c6509abf7084efa8210518ddd1d5c38343b860eef5e69e0faf6119445060c9281a29c5e6c623b8ab5d25f5cefb85d989b SHA512 86ddb82f2d22e5c330a6cac58568eda63065f4b77621534040203866825e97df583d1d5637b7b12f8ffac68e9f42e79d2c0a1f3abb192c121a8fc8bf773fc5e5
 DIST aws-cli-1.35.2.gh.tar.gz 2807621 BLAKE2B edaa14c648871d2d769ba90305d6c545710ade9c4724cd698c32b9c83a0611808e6fbae1dc052da5656804314dcc34479cddfac770997e2123c6afcabe82cb64 SHA512 148a203860e03a630bfcd4a6f1bc39be70bc9180e06fc6f7380d1a7678365a4d94de89f138bec7430575bfd84ab490020d72a735796b41a91f2caf4164abeee8
 DIST aws-cli-1.35.3.gh.tar.gz 2807624 BLAKE2B 31e2be1970828517b20e6fafc3d4d2c759ff95c5cfee3ed4f1544d15e5f239559db84b5a5989e041cf075d2b237a973725126b3dd459733ffdce533d9162b30f SHA512 37379490fcb86a1973f040730b4b34b572a24be6f51c42476e10db9a83121da36eb4d0cf0e57015212a97471b9d2b9bd892dee654c2585c2d166ff4f7b74516c
+DIST aws-cli-1.35.4.gh.tar.gz 2808228 BLAKE2B 14156c4bd8fe25e192ce55f0d6e9349a9b21d5aa059453c4217481fe5c2f294950e20eaac9f6701ae1832f022642bf55da10477ad987cb1124e044c8d6705e46 SHA512 6073dc611eef727776e487d53693b7150160b3b1fb5e1e83ca37bcee3602c944affb7f378c627de5dc1da239510d3ed2a4b76d434bc0d70a0743f51550ffa9f1
 EBUILD awscli-1.34.19.ebuild 3023 BLAKE2B d02d93dd9b37902da1a0555b84ef0fab8f1179c2983d783717f9e2f3cd55d72b07ed1164c263aec3706f6a69d1265ecf439ae95ff273c215416ba73a117ae0a6 SHA512 d9e7f35c8346a432ea2b6067908620b0cc6527fa21e5c8c5bfef2878fe656603a0cd8fbc7479e3ff4dbad655eb8d19622097409de3f80a55986104932103f1e1
 EBUILD awscli-1.34.24.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.29.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
@@ -18,4 +19,5 @@ EBUILD awscli-1.35.0.ebuild 3032 BLAKE2B 9a661418bff83e0179259efa93dddefd5f74368
 EBUILD awscli-1.35.1.ebuild 3032 BLAKE2B 9a661418bff83e0179259efa93dddefd5f743681f8f6858bf6121e5f97e7454396cb7471807faa8747e34e63ee6ff3aa26dbb98cd213bff9aff3ddaad91b1c77 SHA512 b283c5794d8a084464c6cff8d348d1352ec08a96735245bb77676b9572b523b3b462ff0304960d8c481df9a71380a236a44687c1a3fc3f69b1ea812618df05f4
 EBUILD awscli-1.35.2.ebuild 3032 BLAKE2B 9a661418bff83e0179259efa93dddefd5f743681f8f6858bf6121e5f97e7454396cb7471807faa8747e34e63ee6ff3aa26dbb98cd213bff9aff3ddaad91b1c77 SHA512 b283c5794d8a084464c6cff8d348d1352ec08a96735245bb77676b9572b523b3b462ff0304960d8c481df9a71380a236a44687c1a3fc3f69b1ea812618df05f4
 EBUILD awscli-1.35.3.ebuild 3141 BLAKE2B 5c14d1ada2a8692c95bc6975412782283583a98ea26a5ae45940f7451aabac59b5cbe4f384fdcf1ebf8bf0face6924215f7b0c1c40c1c2dcb8efa1c043b40a05 SHA512 14a538a63dc521fb224d0f2c2e5e24093fa1195266bb6e00780b2e9268d319eba20db9db6c9327bde131b756076de9f673865d4f49954b7779a5df360a995c34
+EBUILD awscli-1.35.4.ebuild 3141 BLAKE2B 5c14d1ada2a8692c95bc6975412782283583a98ea26a5ae45940f7451aabac59b5cbe4f384fdcf1ebf8bf0face6924215f7b0c1c40c1c2dcb8efa1c043b40a05 SHA512 14a538a63dc521fb224d0f2c2e5e24093fa1195266bb6e00780b2e9268d319eba20db9db6c9327bde131b756076de9f673865d4f49954b7779a5df360a995c34
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.35.4.ebuild b/app-admin/awscli/awscli-1.35.4.ebuild
new file mode 100644
index 000000000000..49e2e891cd54
--- /dev/null
+++ b/app-admin/awscli/awscli-1.35.4.ebuild
@@ -0,0 +1,91 @@
+# 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.(z+34)
+BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
+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/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+		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/vault/Manifest b/app-admin/vault/Manifest
index fd77b381e0b2..0058bfdd051c 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -4,26 +4,19 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.14.5-vendor.tar.gz 71839384 BLAKE2B 845416db5d69c400d5e9603bd42b2d73112b1cea884a03ac1345afad627b0d8ed0ff983d97b3086ed69462713cc706aa67f46164df4c1e4e3226aafb66cf0e89 SHA512 ac55e4f9b76ac80eb0f82e5d63ed234c65a9b5c737fcb6f7ad8c9cb9dbe303b6d18a11b329f8223d9fbdcea1a7ee982c622184537fce45fe005df89b8392bbe5
-DIST vault-1.14.5-webui.tar.xz 1670796 BLAKE2B 8629de337f2c708553752409a1c8ddc94e421adb34c7b31116f4154e06eed6e7ffb0355cd7ff91d7ec42f1fb1a35737732d530a8587cf515a0636b0a5dbffb38 SHA512 32ff0d720282f0539288f3ee111b91d43b9098bd4ea309d11f638c9f0c4a0a9276fe2f940573d9d664dcea33945f08ac33488ad05d37b372042e859b6d2f7e97
 DIST vault-1.14.9-vendor.tar.gz 71845081 BLAKE2B ea25a6ba8ac293971170688b4ce3845ba19a5af746c3d96860420d74f8c0af33ea118a47d17117dbd520675739c44ed76118ef126c5b53e4c4adb0924cda58d5 SHA512 00ff45f986889d17ebe59c27aeaf8132270e5f06883bf84ce10721c9e2943a25ad8b86be3271991c824369ad5545258b3c01600f1dda06487751ff806b1d76b9
 DIST vault-1.14.9-webui.tar.xz 1677212 BLAKE2B db4da051a8c0a62e99c1f2070f3c022fc934350b255d21b360b3b3b53555942f1ac6c4ef15ed7d8a2519f05752406add63837317615afb387b0fc407f5ab8410 SHA512 2f54dd24fb9a4e2e774dd4212a605126a9d4e4975a97a01c88c94bce8e6f10174fe07235d402dd43ae31aacf4371f77272e4446d972d2e7304745186b0e6dbb7
 DIST vault-1.15.6-deps.tar.xz 20736608 BLAKE2B 53e21d0664f9bbd8c851a486334e04d3b3151aaee709c8fe88ab4969a81ebd4562cf3a350e383647140bd4826a0aa75b34ef136c81920b868dff7ae6f0522e37 SHA512 c1c24c2c646a441c551849af2d3165fc15db2b61f261608f44b7371214cdef0e76263b5b2f295c19606057e80316b4864fff64bc5603b99901fc8a5d900c6550
 DIST vault-1.15.6-webui.tar.xz 1721320 BLAKE2B 3f2d31767c6086e7b17f7445f0cff34ce4ebd7a6a1daeaede96443758096a6b8b94b971af5a74e8bcfb2c95c07b496b1babf3f8ce82f9b360fafe5a4d5138cac SHA512 6a532258a5c7734863967926d95699b2611959177b9dbf4e60cff115331237e65f3dbc41e842443ee5af9020c69280b27a511f887528dc914f9d9e642f9a3a63
 DIST vault-1.15.6.tar.gz 31923253 BLAKE2B 8a4e7b9d8d6753b6f717c6699b2d4822cecff299e3cebd8945d3c34232ff77611611d4e6259ab9c9c4ff91a2e52b7eef707df7da68960be36c314ceba18b124b SHA512 52be0e47f3028f9c1f3ce5d2a72356c955f20fcaf6e8396a6d5938226d72cd8353bed398ba66a6821fc609aaed465e82c3449aeaa0dfaabe80ff0412a73779b3
-DIST vault-1.16.1-deps.tar.xz 21476528 BLAKE2B 2ba0bd2165ce41bfae6fb56a0ff97fe4ed30ac5e16f30ceba14d618e30851b9bb31a964cf5035cd4089baf87c2cda5acd17558bb363acbbcc371ddf47b453c73 SHA512 a0262f421eacfc729a0bc98c137a580d3ca7b384b5b7a8e3bb81cc27b0791b81fdb9005ff9721159cccaf49f2ec6e86dafe7f4e2dde4b5c8d806a8bf1c68de2c
-DIST vault-1.16.1-webui.tar.xz 2213524 BLAKE2B 40c0811c84c849beba934f110afa21fe1ebe60f9a01750fcb4c6442f6a8ef28babd4c32157e6bb3eaf7545b683a81122f445a1a0d717cf7442a678e87206f67a SHA512 ca25ffaa85445070310fad9d5a05d6ff477729d64707a4da8bc433781d7f2283e18e680a9a06d6aa37496a21b148ac3bdc5eb3f475246ee3fe3cf4a8db096ffb
-DIST vault-1.16.1.tar.gz 32997180 BLAKE2B e8c6ccf19ce2c48eee1b4b7544c6d164bd98be3d06a08397b06049bbb6aed9304df592bcb5103e943a629aca4c2e83f661b16469e3353c022e3ca552fa1afedb SHA512 e970004343abb2792aeea4db55a002d1c18701d309caab4a49e3f387028083b70dfa67b7ff34b60c5d4d34ffa8ac3bef308b7218a0344dffde3b000b0e5d43a9
 DIST vault-1.16.3-deps.tar.xz 21492052 BLAKE2B 5800105ab4f005c9569b4fd9eee567c706d2c0e1d0fbb937af6e3348f06f2a6e8ea7c159a738d04c266d577a5b1e7419735ffae410a106aac4b65740f55c7979 SHA512 9e4d515dad7862f56fef8822852b6989b52b494a786a38b74ce85af60b3f562738f3af5bf1497e5af0c07b42aaff407c1d39c3bd3f18d1f646998b7ac0b100a2
 DIST vault-1.16.3-webui.tar.xz 2180172 BLAKE2B b1d8d59c462f7cd60ec5ef5878320591290c1655d1b1727508541faf45e5fe3c6085ff8fb66b3b82d95ca74cc1ee800fed09f0db7eb98580f7cc135a3eebfe6e SHA512 61ead17ceed96f7dda7439e292d0c0497d65c8938491f70927064ed647276ae41ffa35777e2a119dee116233baca9575b82e3e53cbeb9b622eb34f1563f4e164
 DIST vault-1.16.3.tar.gz 33353350 BLAKE2B b185b9ad6b1e30da4ca2c2e9425a606e19fbda0b4ac529fb8410d2bff5a215eafe62d12c5c9988423ba7185a0456b7a5e364a466abe00ba9e45b57d59fd115d8 SHA512 b68189b978155168c42bac3e867abc44fcd4b6e9f680bd6951b99208536f1225013e8d336711ea17b9700b0ec75758dd2678e583811918e278849f306ddc9c2e
 DIST vault-1.17.3-deps.tar.xz 21557340 BLAKE2B ba26c3921999c76e51d1548472a6e49d9be316f099ca2213879aa384ac6b70a2716d12b8950be56263f78343e8b09708905a03421eceb67e400544241a185a55 SHA512 6aa16d78459ffab1d5356291f196a40c9efc646baa1b10d191ab5d40d712d296e0c89b396afa16719716d178557b970278949967ba0bcacaf77d0b3bfb837e10
 DIST vault-1.17.3-webui.tar.xz 2196772 BLAKE2B c66ce1dcae83b18afb1bc4a76a1c69191d8bec6b7c1f392f58a66df423120a9d38a3b3c5222ae8ad0a960c6100e5dc3acaa11e4bfc04e2a43bf4df68fc036f47 SHA512 b9983126e403c5d4fcfdb25f02deaafe461c490ba67d5295cfdd35c69112e02677fe56e9b50cebe51afc6e896febdb5f6fac7431944f41d3bad38bad4a7670d1
 DIST vault-1.17.3.tar.gz 33565884 BLAKE2B cc39312ada9d889feda72d7659dfab56c53d4351882fcba1d52beed4cb41d387cec3b160413b63b3d031e0b23fe21d95b6d8cce438c274a5f39e4386a8d0b3c8 SHA512 e5d2f25b77e4d50f5f51cd5e2a6060745e147be328e68a9c51c142a40d83b446a6ccc27fe1414ba10f0abf8a37818b369b4d3245d44b0afb0ddf84a0e51c0995
-EBUILD vault-1.14.5.ebuild 2095 BLAKE2B 9381f523b1b70fff142571c5e61627cf211c60b3b5f061b1a7a3dbaa26b0531fc86f430370f5eb48a2a65881a19a1f3142b5dbe21311bc51d9d51bb5163c7227 SHA512 dd949037626cec46c7cc35e3811befb80b78d2a7cba1d91d36d8878f3dea50188a7fb26268e0f26162cfa6206fcd35db8016a6dc1ebf266ed3c65847218ae0dd
 EBUILD vault-1.14.9.ebuild 2094 BLAKE2B 3472fc7a0868be220400af480b23a0f774599224d7acbe89417af075ca7ec2d20fcbe62eaec295216ab3db10d5650eeaedece2dc303a06e15dcbf16079ea5648 SHA512 2b267dcab689aaf9d3116c2bcdfe011efb5ad5ac3200a6818d2f31c1834453700dfa7dea6a95ebe7a878557aa5185676ad59135660d3a3fc56271595e355d874
 EBUILD vault-1.15.6.ebuild 2216 BLAKE2B 95e6fa34e25f679998994fe02378d21f870e31e1f1ceac250eebcd219ff459bae217af95fca55544aa3b2934495635eaeeea4493ab09b31c29fa5f6ae6d11cba SHA512 269544c6cdfe28d330b3c0d7924afbb25faf721353cdc4d95b2d4e77ef36b15e26e0b838a9f28e37da0ba1af756c74887455edecae23a7fa539bc9cce9eb5205
-EBUILD vault-1.16.1.ebuild 2246 BLAKE2B 109a10163de80fb8bec933dd2ac5767a414dd5727fea8ad7b3d400f8157468d4c32b709e6728a0db354bb24000ab2cbbd030a525809d2201f41f15e17a05825d SHA512 3a3cfd01cf461c5ad4cc3f0f4ebed94d8423ace283d0b0137005fa29068a0dd3dd66744fabfedac6a93ebaaeb9b7c6dad65c02b9006cbb1ce0e68c95eb78c995
 EBUILD vault-1.16.3.ebuild 2243 BLAKE2B 21a7a98f4fb91b6da0480720f5339e04acc729585cc82389e3c602fd5326a4eeb1383a35fbe3458db7fe060ba990af62ae966e0ff185c73a928eaac98b79c96a SHA512 5d8abce718bb9a05566668b6991ee4e22e7e5df69b160659edcd6ee39a912b441ffe4a3afe0d68adc2841ee6858f316c6b543e655e99bbaff09a29addd9514b4
 EBUILD vault-1.17.3.ebuild 2167 BLAKE2B 03c7f5f4f4f3602ecf11a3a6c9f303e8736adc65c3fd4d0802b75008fc5ae0177631bd082060e683a8864d5e2d313101740d479852eb8387049872354d5bddc4 SHA512 08d21b150ef033130c641aa702f4742177fe7677f4ae49dd1134c13d79f0ed97d2bd1627095ddcee9d069cb2cdd4b2cd5c928ab4866281cc28f80102c5812b8e
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.14.5.ebuild b/app-admin/vault/vault-1.14.5.ebuild
deleted file mode 100644
index 8158ce887ad1..000000000000
--- a/app-admin/vault/vault-1.14.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="+webui"
-
-BDEPEND="
-	app-arch/zip
-	dev-go/gox
-	>=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT="test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
-		rm -rf "${S}/http/web_ui" || die
-		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
-			die "mv failed"
-	else
-		mkdir -p "${S}/http/web_ui" || die
-		touch "${S}/http/web_ui/no_web_ui" || die
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake bin
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/vault/vault-1.16.1.ebuild b/app-admin/vault/vault-1.16.1.ebuild
deleted file mode 100644
index 9956d1f746c1..000000000000
--- a/app-admin/vault/vault-1.16.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" webui? ( https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )"
-SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="BUSL-1.1 MPL-2.0"
-LICENSE+=" Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-IUSE="+webui"
-
-BDEPEND="
-	app-arch/zip
-	dev-go/gox
-	>=dev-lang/go-1.21"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT="test"
-S=${WORKDIR}/${P}
-PATCHES=("${FILESDIR}/${PN}-1.15.6-stubmaker-outside-git-repo-24678.patch")
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
-		rm -rf "${S}/http/web_ui" || die
-		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
-			die "mv failed"
-	else
-		mkdir -p "${S}/http/web_ui" || die
-		touch "${S}/http/web_ui/no_web_ui" || die
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake bin
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}