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

19 files changed, 178 insertions, 106 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 134ebaebf6ab..49fcc6f1ae15 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 83b842ae61f8..07c4b473929a 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,7 +1,3 @@
-DIST gentoo-bashcomp-20240511.tar.bz2 21695 BLAKE2B 886a80eafbb923b5ccb5c9e6e0749b66878003d99e0ddf8fc3d07c072fd23cb3277eb254c4687695459fe8401d427dee2779bc29f2a48ab1c6f2b4bfe7d4ef0d SHA512 3e5add581268e7911eb18d1958e4db3b549b2afc496231dcf537abe5409fdd4fa045c6f61538be6c2686888e20ad0d0b714ecf82639a9ae0ec6eecedc378b78d
-DIST gentoo-bashcomp-20240525.tar.bz2 23392 BLAKE2B 03da7f6a077382efaac9c9ddad2ef6bcf21704574378a400aeeb0ec2b88934c3aac10009912ad6f0d06ae410c42d6013acaf4629f3c6f46abb19b0d1e000c1d9 SHA512 5017f2e106e2b3f1335f1edbce7ede1fd918bd701a1082ec8cd71f1cedad9480109d82381d56587cb6da4dd04c210f9f51dbaaf8b2aa419abbc6fab73825226a
 DIST gentoo-bashcomp-20240625.tar.bz2 23794 BLAKE2B 567131238e24744a5083ad8ec484d4342b6891e95b999d11d809da769d8f2ad3536f7da769f0d291663b9c3be46fe67d261cbdcf59a0f846e4f08a66b4106571 SHA512 1b5476ba7cb1b7c2f1d51c03d592245718fb4c2c07ff5171aee1bfa0def2a2f0bbff7a38950d18e3646285e7432cedee0ee75eed1c6348946793f011de4ddcbf
-EBUILD gentoo-bashcomp-20240511.ebuild 713 BLAKE2B f6e440d53af7db052fe8e87f866c015dc72273247fe35e6dffc472bf5c2feda33a368b18cd49448376d14a21e1f704cc21005204954933fc159256bd7d9fe028 SHA512 fffc55725e6a49f4d0732969083006e11a0059a83598771a1807fb96f29d1ac8f0e51bd75a33be4f734ce7e21fb57fed3d2fbde5678447458f5c063f8aac9b67
-EBUILD gentoo-bashcomp-20240525.ebuild 721 BLAKE2B c820a59c93fc9734dc3483a5afaa3a16c8132ee14298444286f63cf8c6c94f515e602abcbe115ae00a08def6a5aadf1ae6957376838bca0acf4535f0e8e7e772 SHA512 f87fd78b7ebd1b0ec9efda71e79a27fca5e8ca46865bd1349ab28fb9e5e45af17612f685f0b52a1a7e54f5663f1eb694df64ae2f06bca47885c0a57817b61094
 EBUILD gentoo-bashcomp-20240625.ebuild 713 BLAKE2B f6e440d53af7db052fe8e87f866c015dc72273247fe35e6dffc472bf5c2feda33a368b18cd49448376d14a21e1f704cc21005204954933fc159256bd7d9fe028 SHA512 fffc55725e6a49f4d0732969083006e11a0059a83598771a1807fb96f29d1ac8f0e51bd75a33be4f734ce7e21fb57fed3d2fbde5678447458f5c063f8aac9b67
 MISC metadata.xml 548 BLAKE2B 545dcbc7897cc95b930bb9c595772b6e64f88f56989050c3662ef96c57e220ac548c3d242959ef437279e3cc727f526cb3dc4852a608b8fe6136d67f1c718be8 SHA512 585ac798f1f16d9201896517d917b88aedd485b7192f101fa051afabf9a63c3bbfe205cd97058aa6bb7630f9b78839cd8945b42b9303e7688b873954ff1e8777
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240511.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240511.ebuild
deleted file mode 100644
index 6ccd45c43430..000000000000
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240511.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		completionsdir="$(get_bashcompdir)" \
-		helpersdir="$(get_bashhelpersdir)" \
-		compatdir="${EPREFIX}/etc/bash_completion.d"
-}
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240525.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240525.ebuild
deleted file mode 100644
index f6df12534742..000000000000
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240525.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		completionsdir="$(get_bashcompdir)" \
-		helpersdir="$(get_bashhelpersdir)" \
-		compatdir="${EPREFIX}/etc/bash_completion.d"
-}
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index d84574c24bc7..7a8cc9dfdb8d 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -3,4 +3,4 @@ DIST gentoo-zsh-completions-20230117.tar.gz 25805 BLAKE2B 33b1db3c9e4ab2b4c86a9b
 EBUILD gentoo-zsh-completions-20220112.ebuild 741 BLAKE2B 99b1f45ee8623f7da63ce376e33d328a45d0751ff3760eeb7f4eb4761c69fca5f678a5ab403c4fd6a0a1bc1ff930baedd7014e7903892be808a7e5415add1b0a SHA512 30556c5335878f48e3795b7c1261fa153371232a742402a391bb2f6e6bbf5cd931c8d089b517a36d019d7108be74d73511bb55cf9f8f7f413d476c04936be7c4
 EBUILD gentoo-zsh-completions-20230117.ebuild 741 BLAKE2B 1a9ca07e8cecb3b74f65848108d603b1805c269eac2dac32373bd59e45ea79d6021abfde1676ee24fe256b2209b9d342818b6172864c24824d243218fc1b2793 SHA512 648ac285f89abc0ef2e3927fefcf4fdb099295353d5e9c75510ecbe5559ca2eba09c3ee5967659b797aa4e29218cd0876f0118f3a24ec99c56dfdc4efdc0ebad
 EBUILD gentoo-zsh-completions-99999999.ebuild 741 BLAKE2B 22d854ce76b68a52862c31dfa6270ce617f6559b5703443111baad53df86cc58b3ddd49e5d27de9dabd2d135f5931334cde9b536926891f29a451c4a3186df34 SHA512 127b63329ec7ff32c2e829149721c75917a6554ebffc848144eb32594d707d078e66dad328e55a344c85a4180a6b2afe6801cc3e0740cdbc61c18c5e3acd21e7
-MISC metadata.xml 425 BLAKE2B b2bdc1d01f7ea33bb40f013e4928f133c0df268fb169c48407cff025cd8e5539f6955318193fded66fec789f44c135bb1b00f37b8fc3d7a075f7c313d5a873ae SHA512 c89106f5e79728e23bb2239c83eb8fbab4dad8fbccc3eeafa4176cdb02a0dd4fa37174e8ece20c475caab10ba35ca6c0b98a811a37a6d21a6f3ad4fa9928fe61
+MISC metadata.xml 532 BLAKE2B 5ae78399d7f3303ee03fd394410040aa5ccec536ed0a788d7b5fa7898b8eab83cb5ad09dccbd664cd1a5608e755dccd99d03f90c1dc9f4e113405eb97f3dd966 SHA512 54bf0fa9a20282ed7814f7bca4635824a936f6fc27945f14a400696468636eafa7ed2e724bd099cad84220e31ec94a7afe65ad6b0b9841c57ad3d282091664ad
diff --git a/app-shells/gentoo-zsh-completions/metadata.xml b/app-shells/gentoo-zsh-completions/metadata.xml
index a9734d45edf8..33a7143a9edc 100644
--- a/app-shells/gentoo-zsh-completions/metadata.xml
+++ b/app-shells/gentoo-zsh-completions/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
diff --git a/app-shells/liquidprompt/Manifest b/app-shells/liquidprompt/Manifest
index d8a03bf30894..339cce55c678 100644
--- a/app-shells/liquidprompt/Manifest
+++ b/app-shells/liquidprompt/Manifest
@@ -1,6 +1,6 @@
 DIST bash-preexec.sh 12667 BLAKE2B 1a19e3d7c2b74ae7572375b7af11c20a3506464c1ae31b90439529422ae74fcdb26f71bfa3d9128180852b511335cd79a9ab3d951aa9d4d1749c122cd3444013 SHA512 c77093d7049ad97406519e3f7bd98dbfa6ca3670c635995484aa5635a47e0243c885868dc48bb89d9f15d2c8082657eefb895e1fb764c3b9e0498cfee7797120
-DIST liquidprompt-2.1.2.tar.gz 621356 BLAKE2B b5c3c52179f86fc42164e08a01f4e114f5e7ce1cdb5fb19ef1c02e85569e895cb5f1cc2f61bf6f66380d5c20bc6daf41547eb281990221528d5c1d85b61d1329 SHA512 685da50d347ba0d7c6881d87426344840cc7ab960067035b43f9658c51d7d5cf89e80f4bf8344b49f3858fe91bcfd57dcfaf9a253246fc1a7ebedbba474dc5ff
 DIST liquidprompt-2.2.0.tar.gz 986151 BLAKE2B aad40582ddb3e4f611e4632ebff0a6625d169a18d35013d204b1912196c770f04361a617c54e3c798b9828fba3919c0af328f81e1994ba3c987321b551ed9634 SHA512 1ccefcdb7b58697ac9b27e3e94ef1527c17ac36e9e405930f5b8b2a906cad5789ed9f77271dbcc66b3ef3457b307df370cfc60f88dc13e9d82ba3de7e2708421
-EBUILD liquidprompt-2.1.2.ebuild 818 BLAKE2B 60c6a123ff127bec28223470cf27282530a1f756cbec3e5ee7da506d5d6a564f23018004df03c4b8b119ef1ccc616bdc364d8a3847452274a7dfb373002dde9d SHA512 bbdb46176949b2a172ec35c9658e441091b7ed1a36d30e35066df1ee101415ba0089306fa2fee6d9efe00ce4b4a1b40e38bb9f29449cf22f072185701ffe45e0
+DIST liquidprompt-2.2.1.tar.gz 988223 BLAKE2B f0c177b6c7a4e7a1d11fbed692d91e6c2765f364809948364e07cbef0dc0ca4247912b9a000a3b8c646aa56869d605bbb72b4483a2beec30b31c302100dbb922 SHA512 cc169f4dc5e8f082163de9e4e1d58d0a775fc6e7efcd40bdeb7986a0b0ca7710b1f34cec03e78db00fc9f032f2243eee3bbc18c3b38132332fb7101f62e4d3aa
 EBUILD liquidprompt-2.2.0.ebuild 1038 BLAKE2B ea0422b9720a16a3cae2ca4e6cac684a7de09c43d82951fbebb21ffb9b0ab6846ece922f08ef60bbe75a6e37ca85bdf98a79e389484ba2cb13a53cb884411759 SHA512 e835aab3f1bfda968357423213653473cdd89cdc0acfe1f851af551a8381bfeec28b796fb07557ae3bbc214e6b80a86d8f6feee434681f91c092cd0dbf44f684
+EBUILD liquidprompt-2.2.1.ebuild 1038 BLAKE2B ea0422b9720a16a3cae2ca4e6cac684a7de09c43d82951fbebb21ffb9b0ab6846ece922f08ef60bbe75a6e37ca85bdf98a79e389484ba2cb13a53cb884411759 SHA512 e835aab3f1bfda968357423213653473cdd89cdc0acfe1f851af551a8381bfeec28b796fb07557ae3bbc214e6b80a86d8f6feee434681f91c092cd0dbf44f684
 MISC metadata.xml 335 BLAKE2B 35124b3abcc1162303d8e666abc6d5e024191604555500cdf5f21ba3b45d3c815cef3e14ce4e8052b0d698f9ce4ac83fc22585382559989922816ea7128b59c6 SHA512 12fa46e8150943e9c7175079b67912a0f9cede1bc6892781eeb97c635f99243e32a24ca60a2caa3f2a19587f4c5a134b84f90f95b018c93e6a523001e0e8e806
diff --git a/app-shells/liquidprompt/liquidprompt-2.1.2.ebuild b/app-shells/liquidprompt/liquidprompt-2.2.1.ebuild
index aed3cbeb58e8..8aae627d6efa 100644
--- a/app-shells/liquidprompt/liquidprompt-2.1.2.ebuild
+++ b/app-shells/liquidprompt/liquidprompt-2.2.1.ebuild
@@ -1,13 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Full-featured & carefully designed adaptive prompt for Bash & Zsh"
-HOMEPAGE="https://github.com/nojhan/liquidprompt"
+HOMEPAGE="https://github.com/nojhan/liquidprompt https://liquidprompt.readthedocs.io/"
 SRC_URI="
 	https://github.com/nojhan/liquidprompt/releases/download/v${PV}/${PN}-v${PV}.tar.gz
 		-> ${P}.tar.gz
+	test? (
+		https://raw.githubusercontent.com/rcaloras/bash-preexec/0.4.1/bash-preexec.sh
+	)
 "
 S="${WORKDIR}/${PN}"
 
@@ -22,8 +25,9 @@ BDEPEND="test? ( dev-util/shunit2 )"
 DOCS=( CHANGELOG.md example.bashrc README.md )
 
 src_test() {
+	cp "${DISTDIR}/bash-preexec.sh" tests/ || die
 	cp "$(type -P shunit2)" tests/shunit2 || die
-	./tests.sh || die
+	./tests.sh bash || die
 }
 
 src_install() {
@@ -31,10 +35,9 @@ src_install() {
 	dobin liquidprompt
 
 	insinto /usr/share/${PN}
-	doins liquid.theme
-	doins liquid.ps1
-	doins -r themes
+	doins -r themes templates tools
 
 	insinto /etc/
-	newins liquidpromptrc-dist liquidpromptrc
+	./tools/config-from-doc.sh > "${T}/liquidpromptrc" || die
+	newins "${T}/liquidpromptrc" liquidpromptrc
 }
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 186aad98a57f..d8e4ef6f2dd4 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -31,6 +31,8 @@ DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
 DIST mcfly-0.5.13.tar.gz 208538 BLAKE2B 93a63a7e2f78d914e6c1a098eb7139c2c23a30afeed7779991abd0f492e8401703e117556d5378150403fd4baf0ff700cbff438396dff07808223f7ef67286df SHA512 cd95457fd0063e828eb6882b61d2368159412e33c584d3c48cb4b58898f1c930d0d5fa77d19edeedb4489b4d5641dcbfe9994afc95927d9d774d0a71be82682b
+DIST mcfly-0.9.0-crates.tar.xz 17684480 BLAKE2B 1ee72b8611c3ccf7e6938734c271d1e37d0d2b1ef65d5f5682204ff870a3fdf242b197745b8e733828508b3bf48021cebe87e4fa601adc943e45cc0493b286bf SHA512 f11f64b1f7fa559368277ea4903606e4c61aa14377feff3f66d70b9ae86e29c87445c0fc8e8e93f1a00aa1984fbe07531a8f5ca6bfb4b208b26b409e9b2ce7e1
+DIST mcfly-0.9.0.tar.gz 227470 BLAKE2B a2a62aebd77b1908a1cd8bb49bfc06d4c5a854f96d66b2d1db122dc9b7138d90c303e4363f33bd69f319d0db70f05d1c6ad71956d020e10c5fe82e632a9ecd67 SHA512 29014e8251a11aff75cd385fcc62f1f2dc7f91f91410317758f2ebf863d417c30247f2915b9df44146bf232b581de4745f948f188d7c31065ce3036d5588dc44
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
@@ -67,4 +69,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD mcfly-0.5.13.ebuild 2160 BLAKE2B f7e828e6f70f66358b063b826d7131579131dde14b4b836a36fc594607416160bd81e6837bc253d26a03d735f62251437d6627366901ab6d25e0800d3e0e64b6 SHA512 22eb40650b884f0fb36bca53fe9c497ae55612582ecb792e751c8f54bb32ba64b60fbdfd2d2eec20754e74f0e00be5a995411559bb43cfb0682c13daf376bdc8
+EBUILD mcfly-0.9.0.ebuild 1104 BLAKE2B 69a41c9509306809f7f70fc4434df81ebf833d1422674d979931b19043aa40d9351062ca643ef4fb56e566b5991635296be1a908499395d441371979a6825f64 SHA512 4a4bfe61e49f2666b5e78623c6d4c1b512c5640a77cf3724eae1f40b307c624646097ae8426b9bcbdb371861e26005841f3f41b36967ec11befcca2467494c42
 MISC metadata.xml 671 BLAKE2B b65ae57bc29d74659c833ea18ce30eb443fd726918b4cb96bf0077af70905c7f52c9030deb1c761f078f5390f0117d06445ca8304d38aff993f83311c6d7dbcb SHA512 7b284f2e64686761fdf73e78af29e08a62d8aac77d0d9e4b644c7353d5a0744d9b5b54f4f831f90f0f1fff9b9e6c4e463c39afb75b45f81ec0b0340fc5b50b26
diff --git a/app-shells/mcfly/mcfly-0.9.0.ebuild b/app-shells/mcfly/mcfly-0.9.0.ebuild
new file mode 100644
index 000000000000..2c4a7577b00a
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2017-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+inherit cargo readme.gentoo-r1
+
+DESCRIPTION="Context-aware bash history search replacement (ctrl-r)"
+HOMEPAGE="https://github.com/cantino/mcfly"
+SRC_URI="https://github.com/cantino/mcfly/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}"
+SRC_URI+="https://dev.gentoo.org/~arthurzam/distfiles/app-shells/${PN}/${P}-crates.tar.xz"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/mcfly"
+
+src_install() {
+	cargo_src_install
+
+	insinto /usr/share/${PN}
+	doins ${PN}.{bash,fish,zsh}
+
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"To start using ${PN}, add the following to your shell:
+
+~/.bashrc
+eval \"\$(mcfly init bash)\"
+
+~/.config/fish/config.fish
+mcfly init fish | source
+
+~/.zsh
+eval \"\$(mcfly init zsh)\""
+	readme.gentoo_create_doc
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/starship/Manifest b/app-shells/starship/Manifest
index 2abf25069c5a..aae389f34ead 100644
--- a/app-shells/starship/Manifest
+++ b/app-shells/starship/Manifest
@@ -286,6 +286,8 @@ DIST starship-1.17.1.crate 340183 BLAKE2B d1c640d862760803dfe2973f2ed2344d3b49cf
 DIST starship-1.17.1.tar.gz 7973673 BLAKE2B 5ba2900aa4681cc71cee85b227e61d6cafad5b5a8ae7828b8f566a3950a579c1505ef102bba641f7495a558645a2c38eb830143322d3672c83eb77186d5759c1 SHA512 4005faf828bedf20a101e22b10f770968feb419deae8c23594cb645abaff167c494767c15a36d61c918ac099a38f5a82b8467ff5031857fd733eca011f1ae414
 DIST starship-1.18.2-crates.tar.xz 38152384 BLAKE2B c88decb5ca2534c262c68aa7e0fcec966598967a864906f2dc8353fa8a63b94535c5bb86fa09d4be80df1421473ad3a5b3547dcc25d81f51dac117f235a7f52f SHA512 ed63f80509ea3fa37ee6dfdc76aa36604e49f12fea54e5250e1adb3e4f1b6a2ca98b7104d72724047cafffb1997c447b9d0f286a63249d70d68bbd0fa060f7e2
 DIST starship-1.18.2.tar.gz 8256264 BLAKE2B 1ed2fa0bc71de0e48ad1073227acdc020c4d7f6ac0d060d53ff0689975bc395a83fbfc611f6392013b10c7b87a08309d03742058dbff2672a1b23048ad9e72de SHA512 77bdebf9fe3bad485ef99562a4c90574f0201c7c3e9ae25665fea85da3a9b038ebc68806ca639f127f2c4f2f974e699e271481e0d945ff294b212449b1ebd70f
+DIST starship-1.19.0-crates.tar.xz 37521600 BLAKE2B 6cf6a43d32574082205555f8b3ae23bb55ae6ff8589f08cc7b7cf47378095e4b984385c590f95bb05b3191685885a08a106d56356977276ba46edf2177410be3 SHA512 3414fd1540f74976a1281f6b76ac4de6beeb41303125d108c3f0e5421b83e4188b83f0df51360a3cecdc386002fbef8ae2fcb1da0e98b30a04cb1406910a9ede
+DIST starship-1.19.0.tar.gz 8414295 BLAKE2B 32046be7f089cae01ff464f2cc53ff2dd42077280acf4490dd5d17f770a5bfe610bad7bce61b4467e4ac508d1ff0b4073b40c92fe77da489b03ab8d41248fc69 SHA512 12347b7db82425ea6656eaccb2c1e9f3c62416b1c4d1c2937cdea2aae724dfc1d6a5a93319178c9844d3f1cc2d6ae15d3e34adbe3ead7df695df87efe5d1b827
 DIST starship-battery-0.8.2.crate 40839 BLAKE2B df6820322d9df15b6ff81105600d6b972cbf3c330f1bb33e2d304d08a1260b89e6efb4d1dfec76c8ac78723b2c5df1ae5ef110b38446978810c4d0e93135fbaf SHA512 a552c5592de081b4e8eb0d61d8a16349f1b1a69172717ae3f1a3ed34973bcde588aad7d874670042cb9f14d0efea2d302d369a369252c78d36401c567376da39
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
@@ -383,4 +385,5 @@ DIST zvariant_derive-3.15.0.crate 10943 BLAKE2B e75d5feb9a76b74c7b77d0be8552c06a
 DIST zvariant_utils-1.0.1.crate 6223 BLAKE2B ea304bac65493168f1be268192829d5a666a267b1f69533a9d2da2b2d2447d7a9f0f70164d60ab02afd90134e37060f86706bc7047c23aedb198d0834f987d15 SHA512 3cf364d53f1169d5274998c3f06ef1a9371071644b256223441deb004553d4eccbb564305ddc0693cf1b7a595e8c1b989df0f8b4eb8447a72782d7d200120f36
 EBUILD starship-1.17.1.ebuild 8268 BLAKE2B 11d71b6344a44a3fa281c69764b439db61ce9c0b9d5db39cafa6157b40bdabc091c8b37e00352fee7363ba55ca79f99c3f3a3e887ad7dc2ff73a6456344f4715 SHA512 9c69941870d72c06bb6d1ebc9b12d0354d93f655b12e38639e6f6f0375ff0a74d636cd93019cb2a3d6db741db6812a10e9e2b03697e36c938c4852ebed51145a
 EBUILD starship-1.18.2.ebuild 1192 BLAKE2B e1955b3a8d0d1003ccfab6a357a15fe6920974501600c730384d992d2a048a95a7422a3d6277f83a954b80af3af439df05a914d87ee787df09bff1a294a52cf6 SHA512 aafd6cc28fb2084491a288ec411ea9d4148333dde5d5c2632b9ffdd3b639e8031ae46e014b23fee884817bb2c3ab5dcda52fbcd714dbe923d5f25507cf2e9c37
+EBUILD starship-1.19.0.ebuild 1205 BLAKE2B c96e8a02f2aa198cef80ffb47c1c1a180be65b724b115a24cab1c5378f413daf4fb626a85134f4e51148edb4dc101de4a1f18096f524170a78fe94fbb46b8fbf SHA512 d671b5535599d1352c9e4343d9c75f1ee2f1c1b1bd6d41b97c014d5c094b918402979c2089d47f1292490df87cc9e950ee671f506f1c16f66cf29fa906408ae4
 MISC metadata.xml 738 BLAKE2B 84ca83a5db6b67fe44f8a192499231851af9b7a7d1d279d4a2660147bee375332e3818633c310a0d9848e714e326e8fe6fe2c2dc7a8e99dd643a637bc46efb71 SHA512 f9ce6f2d5d4fc1cffc524ee25df289e33574a98b32b35ab7221e9ea193835ca6038c87093218d0a5ccb43fbb28e524535b8280491da8e72d88d1f1a96b3c7bb2
diff --git a/app-shells/starship/starship-1.19.0.ebuild b/app-shells/starship/starship-1.19.0.ebuild
new file mode 100644
index 000000000000..fafdae2a17e8
--- /dev/null
+++ b/app-shells/starship/starship-1.19.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+inherit cargo
+
+DESCRIPTION="The minimal, blazing-fast, and infinitely customizable prompt for any shell"
+HOMEPAGE="https://starship.rs/"
+SRC_URI="
+	https://github.com/starship/starship/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}"
+SRC_URI+="https://dev.gentoo.org/~arthurzam/distfiles/app-shells/${PN}/${P}-crates.tar.xz"
+
+LICENSE="ISC"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense
+	WTFPL-2 ZLIB
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="
+	dev-build/cmake
+	>=virtual/rust-1.74.1
+"
+
+QA_FLAGS_IGNORED="usr/bin/starship"
+
+src_prepare() {
+	sed -e '/strip/s/true/false/' -i Cargo.toml || die # bug 866133
+	default
+}
+
+src_configure() {
+	export PKG_CONFIG_ALLOW_CROSS=1
+	export OPENSSL_NO_VENDOR=true
+
+	cargo_src_configure
+}
+
+src_install() {
+	cargo_src_install
+	dodoc README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt "1.9.0"; then
+			einfo "Note that vicmd_symbol config option was renamed to vimcmd_symbol in version 1.9"
+		fi
+	done
+}
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 325777fa0b81..4dd54c883f2c 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,4 +1,6 @@
 DIST zsh-completions-0.34.0.tar.gz 304543 BLAKE2B 75afed3059e889f92843099ad3eddae1f939a7d9a46d87a8048c5742b44699c2da13a9c2ea00ca2ea02898472199f064c420aac8943338e3b22189a7cc0d23b4 SHA512 643e967a77ab708c6316a9b43edd8b411f133aa4abe10bf69d3f5e545b2128423ad80d3509e7f9077b30cb8a83f60fe8d4355ed0a697dadffe1e1aaac6597c04
+DIST zsh-completions-0.35.0.tar.gz 329686 BLAKE2B 22b4dff55749852a41373a8d96b01963f47dc1fbee0f2ff2a21e5ec48e43b022967630dd3ad2dc74793efe1f3bf77d6783161b671730d2e726df913981a676da SHA512 d6ab46db72b311731abca41e82fded954a43a1e13b81deb7b0acf7d85402ef575c69ead66af97dc2c148a1e681f39e48cfcab53993207f2b786bfe20228587e6
 EBUILD zsh-completions-0.34.0.ebuild 831 BLAKE2B d9183e12c94a4f57221ae98104ffe07efca825aaae02caeb3040994be6eed52236e4e526b321495617f1eec043eee8831be28329443baf6953feca553cf7442c SHA512 7e87040dbc1bd2ec8972dbdf2e1705575df491cea165a9f7969ff98a82ae7d3d040cd6d65bd9a838641186541ea6163034f44dba8799d2a1cc8d5ee11232733b
+EBUILD zsh-completions-0.35.0.ebuild 838 BLAKE2B 5c1700a1d968ecad1eba28f0c9c3e52e00ab4d6dc6f32bbf5c9c9d6f2471df0dc53f125edec88ee14221711b0a3b5f7d31a906314ab747b3c8a3db95137e59d6 SHA512 af0ef7ab4e95baffcaea2a90f0bd5acbc8fee4946de498e83bc9e7252be520daccb953a711ea8e84505a80f4d9271b434d092dfb5ade288f38629a749be1ac21
 EBUILD zsh-completions-9999.ebuild 838 BLAKE2B 27db4b4d68e5b4d9245ab2b46875a20aaa8595f8490c81f8a8ab1ba448a57be86c8c96c9586863fdb24f6ca2ea78c20c6df7f80b0959f43465aa0079682eb7e0 SHA512 a73b715fbc90e2fef9a092c2ad9c5bd5962892111fb23baf802083682c6c3c40522b5d8c13e5edf1900a149664cb012bf7f799d0ca33db2260a329d06c093c00
-MISC metadata.xml 362 BLAKE2B 1b4c130b12c430387209e419d3c6dcebc70994b43fde89fd13d0f439b571904bb519e2f22566b94c2a8b237baf59178e694bfa9db0f1680e736dbefd36392875 SHA512 5f3187e39a45fee4874728201232e223e4f024cc15c1b06c89ec926b2dfbfa7674bbd69b7a60de02ca372e0cbf84fd8fc4fd7ef7ac8e4b04916d6db64d93151d
+MISC metadata.xml 469 BLAKE2B 20b48200f4a484900579eb08484fe01f5b99c50ad2ef03fde653df2b9ebc5cc6974ad5c2a50c5eb131f4c50296e66eaa0e090199751a5af3786e8245c0a6051e SHA512 b48d9de5e7dfee240ac0f5aef5c99f003fcac2cd5091d1bedce5e91debf50e22a060591b2d8fb307c13727344810045dde680ef6c0862125668412ea584a5953
diff --git a/app-shells/zsh-completions/metadata.xml b/app-shells/zsh-completions/metadata.xml
index 4ba58baa724a..2c5307faf950 100644
--- a/app-shells/zsh-completions/metadata.xml
+++ b/app-shells/zsh-completions/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
diff --git a/app-shells/zsh-completions/zsh-completions-0.35.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.35.0.ebuild
new file mode 100644
index 000000000000..0e09938f1de7
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.35.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
+else
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Additional completion definitions for Zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-completions"
+
+LICENSE="Apache-2.0 BSD MIT ZSH"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	doins src/_*
+}
+
+pkg_postinst() {
+	elog "If you happen to compile your functions, you may need to delete"
+	elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
+	elog "to your shell."
+}
diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
index 575d0fc84ccf..182044fe7d5e 100644
--- a/app-shells/zsh-syntax-highlighting/Manifest
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -1,6 +1,4 @@
-DIST zsh-syntax-highlighting-0.7.1.tar.gz 133554 BLAKE2B cd55a0ad69670b25edc4bfa78ad76d1e2ef501deeca3e93adbef0aca305896722b4906d7717be3ad61bc0cf6b6496e217626406e5ff4168ece4b75bffd94bbf0 SHA512 e7e86b88cdac9b9ed5f973823ba8efff99dd720b9ed929f765f9f9266b9d6e147274f5957ceb630d51a660e396fc22e97f10cfbc5cdde941b907f3773bb1ea2b
 DIST zsh-syntax-highlighting-0.8.0.tar.gz 155914 BLAKE2B bdb95dc825514e2c0ced2a33133967089fdbd851e00874f68497cd5daae2010f5335fb173569f5af6aea65f4e23744076c420ebc957b7bdba325fcec573d3805 SHA512 58593c8bf3fa1476ecf0fceb1fc4eab986a778de657d359a28fe48798e787896fbf2588441c69b017a08227ab44dd46473afb16e0f125aae59cc58004bfa8c2e
-EBUILD zsh-syntax-highlighting-0.7.1.ebuild 1018 BLAKE2B 279a334ffdfcdef463dc27c13ed5afca44fe4d2d7a1a242ddde7938647b66573d0f42058bed9e22700e78df689603b5b1afa3e7924603427600aeed5aef4bd9a SHA512 bee2209b751da5b355cfa81fb195bf10b505cf295351cd7b14bf042514e1b804c9437839a23900be66c1c63d6809a7980a68b28d6ed605314e43b5e96ac69d18
 EBUILD zsh-syntax-highlighting-0.8.0.ebuild 1022 BLAKE2B 20b3f49072e700ce0e0128e8cc4948cbd1ffce326cc76701c1062e708ef358defc34cd495a91e4bd7d95e5196ef01c6286509ba1a7b52659120ed1e1c37f539b SHA512 937d9fb66cac697905060393c93baae4f1f80877f8fb250b68afedb36a2009acdca8c8b051b31c134441c848611889a06936f98b76007d11367498e8cf9a8691
 EBUILD zsh-syntax-highlighting-9999.ebuild 1024 BLAKE2B 5ac156c722b27dc8193549e46b1fa640e6a3445bc8918262b70a6ccc7bdf7e6ab8f447ae04fc73c94209b6cb94160b080b701f4fdd40db3da99001d78ff6c40c SHA512 a2d8a1c7dbb8c77e6bf06f0be938f64d1d9c23d9938e53d43d7fb61e4ad941b6868c052c6c1227019c9be535717f4ae6448a4451f04c025374c459ffa52d015b
 MISC metadata.xml 809 BLAKE2B 650c47118a2d670a3ad61d294e3d95a674d564064d53cf0ec962d665447c91787822ed218d039ee199b65aa39308494757aaeda24e99d132a5a0d96c745e27fd SHA512 28f3c2358a09c5f40a13a264884a9e52ec8adf3b5b45b643ac73c627a02035dff24badf6e4442828fdf836f5adeab4bed7171f7ad6701ab534fa4d79e8de0374
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild
deleted file mode 100644
index 6dc5114c77c9..000000000000
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-if [[ -z ${PV%%*9999} ]]; then
-	EGIT_REPO_URI="https://github.com/zsh-users/${PN}.git"
-	inherit git-r3
-else
-	MY_PV=$(ver_rs 3 -)
-	SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="Fish shell like syntax highlighting for zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-shells/zsh"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
-at the end of your ~/.zshrc"
-
-src_prepare() {
-	sed -i -e 's/COPYING.md//' Makefile || die
-	default
-}
-
-src_install() {
-	emake \
-		SHARE_DIR="${ED}/usr/share/zsh/site-functions" \
-		DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		install
-	readme.gentoo_create_doc
-}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 2efda26fc48b..12c3a6efea3b 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -13,4 +13,4 @@ EBUILD zsh-5.9-r3.ebuild 6461 BLAKE2B 848f4889733ad50dbe7b9b5a01e940b82c05a288f1
 EBUILD zsh-5.9-r4.ebuild 6665 BLAKE2B 6456b27f90b440d91528c70850fa9188ff89ec0465cbfdbaa4d8cbcd2f0b9ff19eae5760a75d7db17de8a71407a81993a005440cd1834ce00c7a9a2469bfb759 SHA512 fd38838fcdb2e997b168e5c85771717e132798f11f9503bb87cea97e1c8e8972bc507fccbc2869900a50489a36860f093dd71257d7481d2b90d4e9df6dba277e
 EBUILD zsh-5.9-r5.ebuild 6760 BLAKE2B 966d7925065384ac60f34f23ed87e23386da2b99a8e948ca50b85db1a67dd70919ab60c6a3168d178ebccf3fe9af8a5e6d64b1ac2dc1a48e12c448487632fab9 SHA512 3d8ace1afa83e342bb585a73abe4eac2f2f2f3a144e7ac0d953050ea36d459340f2a8cdb21f2c1e1803f5b6989ed3951905d394e8ceebb6536886320b99be31b
 EBUILD zsh-5.9-r6.ebuild 6752 BLAKE2B 56f033bb13af2170a7222cc2dfafcb9655c0e8779252519ae2d5c1db31c2ae06dc2b91d24d1a88fc1838b4b843e88ca2cc4b083d92f0939b74a7befae7d1c912 SHA512 54f72065bbec7b6f7fd136ca91e81a070bf2289f90aeaffa15404ce1e21ca222e84f3cdd0bd5f25d8930337ec46bdf6f2553552a9d7b67981fd61a985fe20a41
-MISC metadata.xml 685 BLAKE2B 4e9a3a03df89f28b2636ce9f08067f499054bfa1439eb76bca27654a823ef2e2af3d0e6fa46f6e64082b0b56661fccaac3a30db98a4d8a4060d5cb90871baa6a SHA512 cae2243e4d9748bd02315cce89d1df07d56f6d1f7d097e3cdf6d324c1fe656a87d03d248461bf17674a786c2acb4ee0b3e0e7cc602a53109de7c111f097f5a09
+MISC metadata.xml 685 BLAKE2B 1c15216cf141717d22a619dac9c2b2a2b3b722676073d238b0edbe8a034543ada1f852ace77823032d8ccfdc50bf346a8d3b2eb2d6f0fc00be644853c8a2bae1 SHA512 c73f1c2b89865f120ec1c44f437f2e45a462972e649dbe2aea051a5beb42b4289995de02981ec9150f12a36e34a13569bd250f4a962321c578af357153973e35
diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml
index b74b8760469c..9d937fd738c9 100644
--- a/app-shells/zsh/metadata.xml
+++ b/app-shells/zsh/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
 	<longdescription>
 		Zsh is a shell designed for interactive use, although it is also a
 		powerful scripting language. Many of the useful features of bash, ksh,