gentoo auto-resync : 02:02:2025 - 22:43:16

8 files changed, 68 insertions, 275 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4cec47aa4dcf..7efd94b83151 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 7964793e66f7..7bddfd5ca827 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,8 @@
 DIST eselect-1.4.27.tar.xz 184464 BLAKE2B 718874f4d0651194f361ca3202e5140982812bf486c8efe82354944d55206b0113fa135992203e8baa00019c3fd773a90ddaf67157c16f4ac2d69965d9822fbd SHA512 f534785fc1f79869840f420b4ab2b2bf35593c504cce878a6d3d07f75012cf32288009ea9ac2a5607dba216a794110a64c5f2c54d5d8a3c641328489cecc024b
 DIST eselect-1.4.28.tar.xz 184692 BLAKE2B 86d1bbc0cb618f6edf49753c9f2be0f67670590ae55b8d2a8824940a5efa8462e395e1ee7f42379bd4ea64ea74f775a78e0a3a23ed565c67c3485f7e4e2d7a83 SHA512 26ac77465e2d6ab5193083c350cfd027d73ecd6d2702fc5f3db90373e92bf3722aead99c9b00b540c7972761620a485941c897854fe110454a4c6897f3f92868
+DIST eselect-1.4.29.tar.xz 185948 BLAKE2B bb387a14c81d5ff5bf2e6e703465b24140b047f1464dee3c7fc0a125c9d94544a9afd801b42d2902dd6dee1af705f7dcfad854286d7e243a0f654cec35ab8eea SHA512 0466be2634f9d632d628cb11793d604002d989c222758ed33259c6b1dede80765d80f782242b22704e890bde84b2e1e3b3fb3d31574812cc803aad64ba8e7cf6
 EBUILD eselect-1.4.27-r1.ebuild 1623 BLAKE2B e726694e11f72453b340b7a70729ed7b2c03f0a51d80071936beb9b2f446713825aef826c3236c0133b3de7d1bb9c46fadca3055a0d0b9b21fc78f5a1feac11f SHA512 b913328169b23831ba3175f19b70996282764072f272b25274ae0316a8c07c2b0fe7e1c9bdc5569797f99dbfd6e33bfe3ccf9f5e3237455d3f36c7a75e279787
 EBUILD eselect-1.4.28.ebuild 1631 BLAKE2B 46dbb4adca1614e08dce046af43abe38169181156529956bec5de405ca5d4b46842cbf57f4fa36c803b9f74bec6b641d7370bfa74b766f8a752f738d16ed5fc1 SHA512 438086a2293452b5c9ef3e3c5d6ab4189d0bfd59fc93bcd2c8acdb298cd2fb1ba750d82c721127d74104f7505d1cf78c0ab0b3a9e865edcae8a09d06a3eb00f5
+EBUILD eselect-1.4.29.ebuild 1631 BLAKE2B 33d225009318469c2c6f8cda876c6cea7df12792d3bf1e1e1c1e8d5dbc00ffcebce9265af14c96b31809235ccf377d0f587e9f4594eacabedd709af09757d944 SHA512 ef8723fd8d1bd3b50c195dfa77f9c79cfbf86ea715d5c93b188530803455cdc42d40c73223430b91b2b9d50c5c206f71a6cd7758cac2497cc44cb4729ae41831
 EBUILD eselect-9999.ebuild 1389 BLAKE2B 5657bfdec0764b44159ddce806abf88f9b77e41cebcd0ff3f809f6678b0770ea48dc5f8cd267e34737aea4c8dd83e18dbc715d2ea65b0621a0ce5085efb92b81 SHA512 30134502391dd4e911a6a25f5fb1e1ccb7cffe7d70acf1629c2caec467a61dabd93604f247d37a2cf24dcd0d9f693c276b54d6ce0a48325738b64f2c1b0b166f
 MISC metadata.xml 347 BLAKE2B 58c9ec8100f46cbb91dfcc6fc6f223e4d45553f401fe7312e36c0260c433a5842b07f894cef7dfd6c518ee5b664d86e3a4d434892ad3ea9c78c26c6f621e3063 SHA512 1963bcefd43ff52163c81a03bac522ca792688ff5317691ac30ec4375c6da4ebbf07f96da7bc1ecaa9554cee18c9f51f8b867e7e15bb652bdc7eee542f4a8d2b
diff --git a/app-admin/eselect/eselect-1.4.29.ebuild b/app-admin/eselect/eselect-1.4.29.ebuild
new file mode 100644
index 000000000000..2755cd4663f7
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.29.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Packages sharing a common release tarball:
+# app-admin/eselect
+# app-emacs/eselect-mode
+# Please bump and mark them stable together!
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc emacs vim-syntax"
+
+# coreutils for realpath
+DEPEND="sys-apps/coreutils
+	sys-apps/sed"
+RDEPEND="${DEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+BDEPEND="doc? ( dev-python/docutils )"
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 7895c455754e..a8153d45fb02 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -4,27 +4,16 @@ 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.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.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
-DIST vault-1.18.2-deps.tar.xz 21937960 BLAKE2B 8ddd265e4f37d7b2b7b0f5365ed53b176f1eaa4c06a3592acc35eaeed11f4bfa28d8f03c6438711f0019be2e576cc51d37a0fc13fc162d56fc30e4d5586fb969 SHA512 20a91d1fe52ffb99c613e5e2a0cbc1ca3abedf68f41eb7e87770b8d37b0ec762684535996bf342410cb9cd6593d7d3fad9f8f95f4a79f94cff27b24cf697016c
-DIST vault-1.18.2-webui.tar.xz 2225548 BLAKE2B 195fe6d5bfdb99deda96522d9f02c6b3cb831c26ac5f61b5b9003e52056527754c4c04402cd19eccbd241b5c826fed74bbd01933171f08c9b121de187b6c1b44 SHA512 760ffe2830232ab5ea3327b1aa425c191f152cabb8d3dc7b09fbfff66a7af8a6119ac13e96b27c3ce5f2d3bf24b97cff45a1ce291974f6fbaa0e9f8b45d16892
-DIST vault-1.18.2.tar.gz 35471171 BLAKE2B 012e2a4d3093397a7823e20d5c8d844559f48a906421643106a63de2894e5a226d2072560350e11161e030b6a561b4786428113117c06eb0742edab84df7456d SHA512 46123b5c111e37e7915716bbfd294bf1eb7441bfcab62cda90c0f89efcd8bb6de39933c271a550e21922b7a728745004960de9ab6835c1206469b6146dd791c7
 DIST vault-1.18.3-deps.tar.xz 36926612 BLAKE2B f1a7c7333bc403df9bea93c0b128e5cd2606688a2af0995e55375dcd11d56471fad842043ddc5d2d70e0795d58e6ba9e6686cbdabaa5bb2b20f148af2fe33ada SHA512 aa3e7d42a4182101f13c74ec48e9c0d848d1d733a694856a8f1ed042d6d6f5a36479dd846defa3fe11eb8f39dad20e62718392e237bfd8b0e6e5005872e22824
 DIST vault-1.18.3-webui.tar.xz 2224888 BLAKE2B 0b41e9b238f87803aa770d84c08e95c4714c27fafa0d94490fb70e5a06a4a6c9c0cd70beb8721005f1d30c2371ca22eb620e5990ec6d9b73e2077e150e0198bc SHA512 4fcecd2685aaec934073fd7930d156b3507f31a95006f06bb7291f384279b60c1b2f453b317e097c608bf735833b606750c62c68aa4d72d86d5273b668029231
 DIST vault-1.18.3.tar.gz 35908756 BLAKE2B d3241849fb6e7f9c21865a44543220d6ca9b82ad848cd7ad6f0e6d6c9675d2fd2cf64427ac2de445e29cff9d0cfbbcfd727d78c91ca655586382c6c368fb0711 SHA512 5d407efaddb760cba69b8a4905aba74f94db19a852206efe3cbbb90589ba87af43720041ee4416d646ae0d1442625172904046f4a353ec9e813eef59813bc538
-EBUILD vault-1.14.9.ebuild 2094 BLAKE2B 3472fc7a0868be220400af480b23a0f774599224d7acbe89417af075ca7ec2d20fcbe62eaec295216ab3db10d5650eeaedece2dc303a06e15dcbf16079ea5648 SHA512 2b267dcab689aaf9d3116c2bcdfe011efb5ad5ac3200a6818d2f31c1834453700dfa7dea6a95ebe7a878557aa5185676ad59135660d3a3fc56271595e355d874
+DIST vault-1.18.4-deps.tar.xz 23373808 BLAKE2B c64e7b02c4088181278dcd954dd8315a9957e64f8d3bca133ff5178180a7597ba3133719ef708dc543cf2f468e6e3174261f6bb403217671b11c507b3dfd5c50 SHA512 4cf2bd51bbcd2b30f60cfc75deecb64da634d40b4dbcb4f7ee698f6e448fa9c5e3f2eea036c4895e8f9c06d9542c431690f9dd8494d0bb10522594363c82cc00
+DIST vault-1.18.4-webui.tar.xz 2225928 BLAKE2B 6065bbf25a8659d2513a7be0c5dccd79ab537682bf0470cb46f17c859c3475ab479371b2045681cfee705682a52d7806226f0d532c265050efd3519a48e1295e SHA512 1bd1af44e9055fc1888c440e80ef8ef30ee7888b2385d447fabc10016df870a48f01cee69962e80869f93af961dfacdbe53c3360d58d58b3ba9a048eab0ff92f
+DIST vault-1.18.4.tar.gz 36375887 BLAKE2B 691d97c06663320951fb6639825a5876ca565840cb9dd04afc517ac0649d8a3bea3afe0380f0bfbe0bd330e1b9c6fc72541177b28af0ccf0524c9aa0131b8185 SHA512 661a736293806578bcf1fa713f08c141de196e81828ee031013ca159d2cb57b0818de69d9e05760f7c72647ec28713b71089833b6184a935f619a1f87f7f1d0e
 EBUILD vault-1.15.6.ebuild 2216 BLAKE2B 95e6fa34e25f679998994fe02378d21f870e31e1f1ceac250eebcd219ff459bae217af95fca55544aa3b2934495635eaeeea4493ab09b31c29fa5f6ae6d11cba SHA512 269544c6cdfe28d330b3c0d7924afbb25faf721353cdc4d95b2d4e77ef36b15e26e0b838a9f28e37da0ba1af756c74887455edecae23a7fa539bc9cce9eb5205
-EBUILD vault-1.16.3.ebuild 2243 BLAKE2B 21a7a98f4fb91b6da0480720f5339e04acc729585cc82389e3c602fd5326a4eeb1383a35fbe3458db7fe060ba990af62ae966e0ff185c73a928eaac98b79c96a SHA512 5d8abce718bb9a05566668b6991ee4e22e7e5df69b160659edcd6ee39a912b441ffe4a3afe0d68adc2841ee6858f316c6b543e655e99bbaff09a29addd9514b4
-EBUILD vault-1.17.3.ebuild 2167 BLAKE2B 03c7f5f4f4f3602ecf11a3a6c9f303e8736adc65c3fd4d0802b75008fc5ae0177631bd082060e683a8864d5e2d313101740d479852eb8387049872354d5bddc4 SHA512 08d21b150ef033130c641aa702f4742177fe7677f4ae49dd1134c13d79f0ed97d2bd1627095ddcee9d069cb2cdd4b2cd5c928ab4866281cc28f80102c5812b8e
-EBUILD vault-1.18.2.ebuild 2167 BLAKE2B 03c7f5f4f4f3602ecf11a3a6c9f303e8736adc65c3fd4d0802b75008fc5ae0177631bd082060e683a8864d5e2d313101740d479852eb8387049872354d5bddc4 SHA512 08d21b150ef033130c641aa702f4742177fe7677f4ae49dd1134c13d79f0ed97d2bd1627095ddcee9d069cb2cdd4b2cd5c928ab4866281cc28f80102c5812b8e
 EBUILD vault-1.18.3.ebuild 2166 BLAKE2B 94762210a5ca6b1da7b6b449bbb7af88bb9edae4a54109c8d0ea734a0ba48948a785a86f004e69fbc5c1d1191e01dd842f8072443ba62a2614d1c1216637cdce SHA512 b6aded8c9c6c372ac13106a5ad5d678c83b52a6906f7cca6a843799ead6669d5e2c2a0597b4077cd9d76b8b66d4237d84c253c42fdd0f0fcd6ff2be0c6285c43
+EBUILD vault-1.18.4.ebuild 2167 BLAKE2B 24bb95f5f8bd617545d310ad8e0d7ea2355db1e8f9e0d7e46df417e68810b06928261156134137cb48fadf31c8db689ecb5375ffbbef5727a9ea611c08bf3497 SHA512 a6f3c4912d0553be8fa432e1cc79c22d56023ce414d2a6ce25cad60def9a34abca6b04d1a886d0d2d8e26483c324f408544f3df8b3277224c704c9cedf252e0f
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.14.9.ebuild b/app-admin/vault/vault-1.14.9.ebuild
deleted file mode 100644
index 1ca68af3ed4e..000000000000
--- a/app-admin/vault/vault-1.14.9.ebuild
+++ /dev/null
@@ -1,86 +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/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.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}-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.3.ebuild b/app-admin/vault/vault-1.16.3.ebuild
deleted file mode 100644
index 2ad80d89998d..000000000000
--- a/app-admin/vault/vault-1.16.3.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/enumer
-	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"
-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}
-}
diff --git a/app-admin/vault/vault-1.18.2.ebuild b/app-admin/vault/vault-1.18.2.ebuild
deleted file mode 100644
index c201204925f2..000000000000
--- a/app-admin/vault/vault-1.18.2.ebuild
+++ /dev/null
@@ -1,86 +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/enumer
-	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"
-
-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.17.3.ebuild b/app-admin/vault/vault-1.18.4.ebuild
index c201204925f2..d1864beb2616 100644
--- a/app-admin/vault/vault-1.17.3.ebuild
+++ b/app-admin/vault/vault-1.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8