12 files changed, 48 insertions, 214 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 0d1d4fa4a112..cfe9a99335bd 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 9c15518314e2..3020eead91f5 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,4 +1,5 @@
 AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
+AUX bash-5.2_p15-configure-clang16.patch 1116 BLAKE2B 5ef332cd2847f46e351e5db6dda79d01d9853f5eda9762deeba0450c2bd400eec549bbb85696777b687f64d0977daac4883d6ce3f1e26cec0d5f73e8ee97f000 SHA512 8cc761a50e936bb602c14fcf047e7278fa2f5394f78fc7f0f0b9ae9df4b48bdc9ca8424ccd6f6422364b7132c3317b8e688f330ce60a0c4724046144c58bd3e5
 AUX bash-5.2_p15-random-ub.patch 451 BLAKE2B adab09c3f2ce3697e3659e01266120155714b80263bd125808edf556a354291af615540189553b1c32a2d462ac41e28a9df8fb9f7d963a3ca3629d297a46e62d SHA512 ac62d3bd609a5d17434cb3614c3ee229569a84087173ebf694eb144a43891fdaead7c531f034b47d72c801ba46d48b0db616e3dcaec82bd7151df518ef070400
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
 AUX bashrc 3496 BLAKE2B eced5328d6ff2545c4e088ec5050ccd72fb5344bb83bd7d70b95840e68e642bd2a302c393b2ad12bd1ee9f42d51334043f8c1a0d36274bfd365339cec33cdec0 SHA512 39472c63db1f69cca8a92c5d330695f29e8f0b0524a6319482bbec394d91503d7c3a69dcd961927c7c404490efc8cf41b381e7bf4134098b750f47e5a47ff393
@@ -421,6 +422,6 @@ EBUILD bash-4.3_p48-r2.ebuild 6068 BLAKE2B 39dd57b3192bea544347f3624c7ae1a4ce992
 EBUILD bash-4.4_p23-r2.ebuild 6123 BLAKE2B 46619292080e156a8e3a684e611486f8658f71d38b37c734b8d7c3e2158b13e36acd615870604b0300f5d8e4ed06f7fda44059809a2e9db0549a411276a53c74 SHA512 c59fac5c737ee4b2d1d3e6a927ae4ac8f159a51cab746b74caec1a9c25fd80f8b4d08f5754feef3d541fc59eebb43cdeda18d7a879c420c0e1d1e8ac865206ab
 EBUILD bash-5.0_p18.ebuild 7456 BLAKE2B 265a4db38cdb8be9f7d72b02a9b4db1afb052255ef9b1368565c6555d911842e615ffa5a3176134acb81fbf248df1af317996d81a96fdbc17cdd72024c6fe5ab SHA512 2fcfff0880542d36ba563150de89dfde30eb1d31d208647a0530c1ffc56c844e2dced5806c32f7ff5a2d920d7c89739f03ff2da95748c9cef856a8c5b1fc762e
 EBUILD bash-5.1_p16-r2.ebuild 8370 BLAKE2B d041f79af10ec841f9049b4e706fd6e7b68f91b8a3405cde70604165f36bb3fcd4d2a69ee4845e9c12c75059e55fb7abf1012f20f6cec305f6fc8702577af1fe SHA512 bf4e0f524d4fcdab24dd12b64838fafb86c85651a2b3974936eed0a498849de7ee161a348f636ac56bc8e6a350e9d616c171d0c363c2189ab8cfa9b19cbf3e9f
-EBUILD bash-5.2_p15-r1.ebuild 9640 BLAKE2B b8d8b2ec46de6e5185a93e5fa3861cc4db774a159df93ba108c99e7f938ae2bb20664389b8d2f070fe8df5360b201fcbbf290112d056e0dcf4b4f60be1136919 SHA512 13764aebf92cf6326a47916d3da2eee4961855797fdf1485b83f932a0ceab8c1446d10482dbf7c615d2aa7ac6c687d55ba1220a102dfb392c1affe167e27267a
+EBUILD bash-5.2_p15-r2.ebuild 9693 BLAKE2B 35b04a86f774c83cc97cb88e69f5a10e2f37ce39a219add1a31e4a6bca3a59f636a99b499ef62997f5011bb130f21f7f7aa850a7fed75bc088f9d6504d87fb05 SHA512 7d322fce909ebedd20f81d0e52b814d561bedfd0b59501ca95f38effe5861b2924e5c91393a636276fddf0edf1e066c532db591b1e0df071837538488c22c695
 EBUILD bash-9999.ebuild 9601 BLAKE2B 0a4cf2600132c6513f09cb81bbfc1a89d8748622b4b242670d25ec362e4d18f75bd906561bc5b423727af698c9e28c275eb88d27cca0d177f64fdb37f3359770 SHA512 5107db4f8b438cda40e5d628f9088f83c80e92a9acf25452a6984b8f86f707a12992db6bd0e15fea4a0b7a4d769f87b9930a6fdf576d712d42b6d5328198b204
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.2_p15-r1.ebuild b/app-shells/bash/bash-5.2_p15-r2.ebuild
index b0db51f7f0ce..8c7792de30c2 100644
--- a/app-shells/bash/bash-5.2_p15-r1.ebuild
+++ b/app-shells/bash/bash-5.2_p15-r2.ebuild
@@ -109,6 +109,7 @@ PATCHES=(
 	# Patches from Chet sent to bash-bug ml
 	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
 	"${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
+	"${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
 )
 
 pkg_setup() {
diff --git a/app-shells/bash/files/bash-5.2_p15-configure-clang16.patch b/app-shells/bash/files/bash-5.2_p15-configure-clang16.patch
new file mode 100644
index 000000000000..6005d39df59c
--- /dev/null
+++ b/app-shells/bash/files/bash-5.2_p15-configure-clang16.patch
@@ -0,0 +1,37 @@
+https://lists.gnu.org/archive/html/bug-bash/2023-02/msg00000.html)
+
+From 2cdf8b42885189b3cf7c47096b01f104e520546a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 2 Feb 2023 05:43:37 +0000
+Subject: [PATCH] aclocal.m4: fix -Wimplicit-function-declaration in dup2 check
+
+dup2 requires a <unistd.h> include. Fixes the following when diffing config.log
+ when testing with a stricter compiler:
+```
+-warning: call to undeclared function 'dup2'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
++error: call to undeclared function 'dup2'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+```
+--- aclocal.m4
++++ aclocal.m4
+@@ -238,6 +238,9 @@ AC_CACHE_VAL(bash_cv_dup2_broken,
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ int
+ main()
+ {
+--- configure
++++ configure
+@@ -18121,6 +18121,9 @@ else $as_nop
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ int
+ main()
+ {
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 250c192886c7..158626ee20e3 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,13 +1,7 @@
-DIST fzf-0.34.0-deps.tar.xz 16800704 BLAKE2B b518f7bff1ea533af32efcb0e5307580aa921bbc20383bbdb6601c0b2dd50e66a57609c99adb9f71d1d388d08cae22521fea67797036d5dab34c83c45dd719fb SHA512 e5f6db58b43e6e3cb9b38f5fb13ab39b7caa18828516d13b0c4623f11a8553a905d076ef9685abfd9c7b602715d677dae9897359148b5d289b05ad056c60d321
-DIST fzf-0.34.0.tar.gz 214641 BLAKE2B ccb7f57df4305cf07dc8e0ba7384c3a446ddce083727ad98719a327150d853782bf781b0179d02f3f10664ffce501ebab55ccd2d5f61a2e690fa41f1d0f479c1 SHA512 6e2bd9a7c30862c09f627c73504f2a52951476abbd9af64941445862cc9bf783699cc9ccf215e25c49bbb3f9656841581b5805af4658b681b590ca14b5697331
-DIST fzf-0.35.1-deps.tar.xz 16796112 BLAKE2B 61c22a914bb1eb8cb6da1daf4b25a19d98e7b0dcd1575b47b6da995ae0fb5e5bc47612b7abafe2917d12b4900a69e604ffff87bf31f811de449522fe800af8f4 SHA512 eed0a0c5a48c5dfee2b6c4d3320280d75f19c16841e3ad731371060da55885c3ddd8d0490dbfc53a68f095dcff02727e8d804494bfa8edf6da041ffcb197dc74
-DIST fzf-0.35.1.tar.gz 218773 BLAKE2B 79b95e23a85865ea9218a222eba522a0a9d7f042f9119b308bc711cccc5327098dae271ba10fff9619f3ba7bc88037c70459f1caf511d5069264b931c875c49f SHA512 4e32836aa331835b6a7370ea342d2ddfa47a2059f5f7c5eec0b2c0dc9fdede14940bf64977c91df201775b3f4a06763a92593df7a50693d04d13b1befb194753
 DIST fzf-0.36.0-deps.tar.xz 16806808 BLAKE2B f121b3000bc5a0d72ee5cb66f59f4f44c41af30f28ca935a607b424399d12dc762f25811aea999e5de126e2727f8bda614e026da6983ed535d048a7229a07065 SHA512 121c6b1be0cd3af752b11461a72c22e3bc55eec12c12367b354a4ff4d4dc75fb0215cf19cec52008473045c6330a4af71b2e3a14a9a0a124e18aacc1aaad97a9
 DIST fzf-0.36.0.tar.gz 229126 BLAKE2B faa04870b7654b1ffb2f1c453636e33eab94e682c7db4702719419a5eca5ea136c657179248dd646573a625f575c823f9dcfd0023a96390bbf689e7455224411 SHA512 8e87dbd3b5ae9e0dc6a76855f7c75c9b4edc8ce797b2cd4eda053c4e1d618bb9afb2b24602e01776a49e47a00f2cd803ed433043f0acec8d385f741b13583e9e
 DIST fzf-0.37.0-deps.tar.xz 16806808 BLAKE2B f121b3000bc5a0d72ee5cb66f59f4f44c41af30f28ca935a607b424399d12dc762f25811aea999e5de126e2727f8bda614e026da6983ed535d048a7229a07065 SHA512 121c6b1be0cd3af752b11461a72c22e3bc55eec12c12367b354a4ff4d4dc75fb0215cf19cec52008473045c6330a4af71b2e3a14a9a0a124e18aacc1aaad97a9
 DIST fzf-0.37.0.tar.gz 230469 BLAKE2B 3281ae0e9b13f8be9d2bc5eb5bfab534a7b56279346ed500932840fb90e3bf0137c5610fdc5928faa99fadbb2cb10b98c46eea7a41f3a76cff3805ed52d255a7 SHA512 bb8cb4b6c83e978c45de757784f29be883070ef7abab2fe2dd89bc668be7628a3f476f97abf82f98220942c37317df0404e3fd2205c2e93ec506a6ca8beaf74c
-EBUILD fzf-0.34.0.ebuild 1981 BLAKE2B fc7fb488bf7e901b470867b6443926438e57eead2d3c272dfbdaef308484e62e3f26c9944bc295b78a5a37cdc7d467cfd861d790143789d06028e65408837459 SHA512 177804d5b6c7048051cf1c737876229c4a333e1314e39daedd74874f62cde37516a3deb7389ae6ed9f84bfc18a5d953d894409af0dd4f4e7d65db30dd4435f0f
-EBUILD fzf-0.35.1.ebuild 1983 BLAKE2B 2882d004e07d5cc2bce75c9362dbe1b5dff98899eca35ba28675cade1bc9254629621bb0664ca507da2617bd545b06e05a3921de4c2ee9cdd7401836ba6d2f96 SHA512 849a98a1df70ec9cf7adb016a941a40f04787e3f398c7fdc1baeeb69a6a56b48f78c52a6d9996c769d22b9a2b8c6c7e97d5ebafe865b89ee9bc5ae41896d000a
 EBUILD fzf-0.36.0.ebuild 1981 BLAKE2B d8dda1ced1e0b2b8800cdfaba567473677115a2628c4ccc0a31d917cb9dd670a87713999e7894c94a88ff03edc0202cb3e431c92ed3dbf74291a908c7a71b338 SHA512 ca4e3404099d380c3f39b73327b3f29f3dc37c5cb3df803d3df78a22c65a5a47db208ae0a00b32af8ee32540270b9b7847919a9533c47ea1f9438d3d3a69e77c
 EBUILD fzf-0.37.0.ebuild 1983 BLAKE2B dd0a88ff3b72e8647207ec0b34a629546c1677cc2a6d8128fec10e8e7263e53b60e6abb9640e3fb213fa0443226905f00659dd4f4d74e2b737983a133a7ff8a5 SHA512 0ecf738b5ff8a9b242abc9cb3387cb8bb97234a12c2b9e6237a5b822eb4c088d906b4c15c024a0a236cfad752f1cbdb2eac2fb90d9ee8cbe9e323bb1b8a89b04
 MISC metadata.xml 469 BLAKE2B 3d6dcce756d040b715bbf17f33faea2c0ddd810857cb38289f59cab134a5b049d21db71c9c3844497643e1728ecd09a924a51ba273f736712543307f2b806d1a SHA512 21f3fef809b276da7f7ad33dbafefc2ebfa86b9ce9aa0dea664724c399a6743923a8a1825cffbd06d885181dc7b305d351e7ab77bd133abb98f601a84783f52f
diff --git a/app-shells/fzf/fzf-0.34.0.ebuild b/app-shells/fzf/fzf-0.34.0.ebuild
deleted file mode 100644
index 7e826166efaa..000000000000
--- a/app-shells/fzf/fzf-0.34.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-# For fancy versioning only. Bump on the next release!
-# MY_GIT_REV is the first 7 characters of release commit, we truncate it
-# after to make it easier to copy/paste.
-MY_GIT_REV=04d0b0223fd69984a07a641d0e228c0e9e534825
-MY_GIT_REV=${MY_GIT_REV:0:7}
-
-SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-src_prepare() {
-	default
-	sed -i 's/-s -w //' Makefile || die # bug 795225
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	doman man/man1/${PN}.1
-
-	dobin bin/${PN}-tmux
-	doman man/man1/${PN}-tmux.1
-
-	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/${PN}.vim
-
-	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/${PN}.vim
-
-	newbashcomp shell/completion.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _${PN}
-
-	insinto /usr/share/fzf
-	doins shell/key-bindings.bash
-	doins shell/key-bindings.fish
-	doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To add fzf support to your shell, make sure to use the right file"
-		elog "from ${EROOT}/usr/share/fzf."
-		elog
-		elog "For bash, add the following line to ~/.bashrc:"
-		elog
-		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
-		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
-		elog
-		elog "Plugins for Vim and Neovim are installed to respective directories"
-		elog "and will work out of the box."
-		elog
-		elog "For fzf support in tmux see fzf-tmux(1)."
-	fi
-}
diff --git a/app-shells/fzf/fzf-0.35.1.ebuild b/app-shells/fzf/fzf-0.35.1.ebuild
deleted file mode 100644
index 2e451652dd32..000000000000
--- a/app-shells/fzf/fzf-0.35.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-# For fancy versioning only. Bump on the next release!
-# MY_GIT_REV is the first 7 characters of release commit, we truncate it
-# after to make it easier to copy/paste.
-MY_GIT_REV=b55f5554871e548c9c00a49df7a92f980c0191c2
-MY_GIT_REV=${MY_GIT_REV:0:7}
-
-SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-src_prepare() {
-	default
-	sed -i 's/-s -w //' Makefile || die # bug 795225
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	doman man/man1/${PN}.1
-
-	dobin bin/${PN}-tmux
-	doman man/man1/${PN}-tmux.1
-
-	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/${PN}.vim
-
-	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/${PN}.vim
-
-	newbashcomp shell/completion.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _${PN}
-
-	insinto /usr/share/fzf
-	doins shell/key-bindings.bash
-	doins shell/key-bindings.fish
-	doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To add fzf support to your shell, make sure to use the right file"
-		elog "from ${EROOT}/usr/share/fzf."
-		elog
-		elog "For bash, add the following line to ~/.bashrc:"
-		elog
-		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
-		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
-		elog
-		elog "Plugins for Vim and Neovim are installed to respective directories"
-		elog "and will work out of the box."
-		elog
-		elog "For fzf support in tmux see fzf-tmux(1)."
-	fi
-}
diff --git a/app-shells/pwsh-bin/Manifest b/app-shells/pwsh-bin/Manifest
index 4141c8b093fb..1cfa702cfc3b 100644
--- a/app-shells/pwsh-bin/Manifest
+++ b/app-shells/pwsh-bin/Manifest
@@ -1,13 +1,9 @@
-DIST powershell-7.3.0-linux-arm32.tar.gz 69194812 BLAKE2B e7862a69a75e78cca34738de3547102a7307550e36c562e48035695ee8e231489d0538f3da83faf0e4b9d76f369a061e3d7ddae7a85bf0833bd576902d800e78 SHA512 bdd5bac4d40c12877a3c721244974a2d56335437cb148e9ee3193e9df5969d709273897146f72ac0455567511bb21133f49fd85b733c0e26d9c15d6f9a8e1dc4
-DIST powershell-7.3.0-linux-arm64.tar.gz 68106561 BLAKE2B ff29f702e9fcf8d25cd44033851c120c8668aa083cbbdd2620526fac16ace2455d53456986813174d1da6a273cb6bf6936a7284cac614dbdf9af5252a56303c3 SHA512 7de1bd364289c3722f0956d83a9478ed9e7adfe572342b39afd838a0fce949ac9bc6420b1a8edcdbf390584ef5fee28caa55ea2d17d11b7da2cb7fbbf63ee792
-DIST powershell-7.3.0-linux-x64.tar.gz 71703612 BLAKE2B 0f741bded009758e0aa52104c9825b3f72f6806595dbc614b823a33f42b6727b4a5f5c785b93d79132252dc88dbc6a72b17e0cf64d3d17090346c773cbb844d4 SHA512 3610643fe842c2414a53277e3b3c102203ed9978f0f489175fea230a15e416a8f929e36e69a3d62cd242d8e01568c68906daf82816dff220bb1dc0aec164782c
 DIST powershell-7.3.1-linux-arm32.tar.gz 69113434 BLAKE2B 12f1124543eddc64b9d7bc51d14cb994ca24eb64332ef9b10e65eeaff5d61d72e0d307e6fe86771b809fa3e5e7f2ba3526b5b9fcfc397e829f1fe5ffb172674e SHA512 796b14da987260deb20bd01bab9e197776218c5c6cb4f7de78529b234239842ee5dd4ea8fded5e0d00795fe8cd226856cda606a3995095e352ed48f2e6310f77
 DIST powershell-7.3.1-linux-arm64.tar.gz 68034071 BLAKE2B 626218a9936713be19795dec46f7fb9c0b90b7cdc1821497a1438cca27d4e4e3ee56504c40ac1c2d70a4c58a5dc29ce6189724fa3126a3fc737002ccb191e9fb SHA512 3fca8b04dbac991f4419a64de4372aad9aa490a4750894b1ae0052f55e229be8406ed227db047381c5cfbaae78c406f272c4a30737468cb8cfde4fb51782895a
 DIST powershell-7.3.1-linux-x64.tar.gz 71616643 BLAKE2B 16ecc1211f796f92d5cf64ac0dea08da353ff4dad8d6fff5ba22d5347fd74b056c25e7682356c23af1ee1bc9b660bf0df7133848e2b9db280cf7ee7796532d28 SHA512 69c7756252b6958faf8b9c962301ea83eaeddf2c05de6d249e20529b2a5cfe09bcb76b5ac60d47ec3260cdd3ab6981d5d5115fc5379512ff2c2f78c3451cec61
 DIST powershell-7.3.2-linux-arm32.tar.gz 69012331 BLAKE2B d905870e2ba8679057ebc057152d400607be089503b0acec76125644ddd01aa18da0da5f52444fa4cd160df93b1f61ba35e16593cc4d1695346fcf87737b219b SHA512 4ac407ebbf0b38ae7d17011390f759a7998343707fa3b412e1fbd710486fbaa04167941491f781b11c91df2abef0ae3fcc07be5300c1d35d4a62f073810ad1b4
 DIST powershell-7.3.2-linux-arm64.tar.gz 67914800 BLAKE2B 594893f484f5c7831538d402ea2bdd3114f5e3625db527ba92df0eabfc5c24e6f9af1502518cb5b6a3b163302482c9c08be692f44e9a1e343218d815f588e0e2 SHA512 b7f134311747c0f66dac37cce813015cb0ce6ff3d35732effb4d8150b2357fa559e13c69cfe33445acbfc1c73a4e02268fb0307fd1d9319449895579420a6842
 DIST powershell-7.3.2-linux-x64.tar.gz 71500527 BLAKE2B 10e6715f3e96de17b8d1bacc34cdd9711490738323a756ec462960731debf556cb1ed2212647c8ff312c2c7d93a4670c2be5f292117d7eb3f164f30511b11e49 SHA512 c42cd23c0a1fd416d9f1c7b639428af70ef71339cd70629ee459cb5cec940a2376317fef3e251f8dca5fa11ac872a319b96d7472b9d359e102c79d8c47a6ffc9
-EBUILD pwsh-bin-7.3.0-r1.ebuild 1241 BLAKE2B 47dac16a7e52bc882186acd023aff03ce58604e18202fa5a3abf9ef8c0b0557967e7cfad3dedd694385fb6d404a385fb834007a193c6003278727cb5b253990f SHA512 6c7556b1cd4626802d7d10d91a8b4c6752a8c36e577cdafccfe61cc76248e7c96c536f89e9f89ee34a8d93ea5f9762f853aed14bcd6404acb0f52c4da183823b
-EBUILD pwsh-bin-7.3.1.ebuild 1241 BLAKE2B 47dac16a7e52bc882186acd023aff03ce58604e18202fa5a3abf9ef8c0b0557967e7cfad3dedd694385fb6d404a385fb834007a193c6003278727cb5b253990f SHA512 6c7556b1cd4626802d7d10d91a8b4c6752a8c36e577cdafccfe61cc76248e7c96c536f89e9f89ee34a8d93ea5f9762f853aed14bcd6404acb0f52c4da183823b
+EBUILD pwsh-bin-7.3.1.ebuild 1240 BLAKE2B e4f47efbdcb57fd8506401b458b1823beabb2788672d300b7caa12ca6be6e59f5c0fec4775239a8ec549fb9f1bc7dc5fc12c35c03192c7f41e4266c434defd1e SHA512 f953dfe495db0d0067ad6261963836758670edd52afbf0dce65a6018525bb9ad96beeb2d390957ea51fdef38daac4b5860c2be652a6458abb17d1924b2110266
 EBUILD pwsh-bin-7.3.2.ebuild 1241 BLAKE2B ae06b08edc55cd0748a3a6094266e3364b2fe023c7255b2aa263ff13a47e93d88ba52c6861b25b26647418685b59ba362e02c0a9176102b45729428874ffcfa7 SHA512 d48c87e006e2107b3c44f4dc1bae0e3ff9509e70dfcb6674bc30c62479ea7d6c7794ef649b8764b6f1ee11d6a5d110efab37cc8018757a6d300a2df69565e199
 MISC metadata.xml 1070 BLAKE2B 9616cf914367f675def22b3f559bdb84698bf0e3f21dada073a67fba4ad1788c31d329b3948056faaccb79b4f64dea71c87c4718de5323b77fe3609420e06516 SHA512 5de9a4144315f5d48df09163cf6f58ecf068ec60444db72ac08ed8dd87eaf4dfa6d864b87f505c04ad2df727a19a4710cbabf06a2afa1ebd828c29dc291608f0
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.3.0-r1.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.3.0-r1.ebuild
deleted file mode 100644
index 80d334fc9d07..000000000000
--- a/app-shells/pwsh-bin/pwsh-bin-7.3.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="PowerShell - binary precompiled for glibc"
-HOMEPAGE="https://microsoft.com/powershell"
-BASE_URI="https://github.com/PowerShell/PowerShell/releases/download"
-SRC_URI="
-	amd64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-x64.tar.gz )
-	arm?   ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
-	arm64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+pwsh-symlink"
-REQUIRED_USE="elibc_glibc"
-
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-util/lttng-ust:0/2.12
-	sys-libs/pam:0/0
-	sys-libs/zlib:0/1
-	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:0/0
-	)
-	pwsh-symlink? ( !app-shells/pwsh )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	local dest=opt/pwsh
-	dodir ${dest}
-
-	local broken_symlinks=( libcrypto.so.1.0.0 libssl.so.1.0.0 )
-	local symlink
-	for symlink in "${broken_symlinks[@]}" ; do
-		[[ -L ${symlink} ]] && { rm "${symlink}" || die ; }
-	done
-
-	mv "${S}/"* "${ED}"/${dest}/ || die
-	fperms 0755 /${dest}/pwsh
-
-	dosym ../../${dest}/pwsh /usr/bin/pwsh-bin
-	use pwsh-symlink && dosym ../../${dest}/pwsh /usr/bin/pwsh
-}
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.3.1.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.3.1.ebuild
index 80d334fc9d07..b987b3df5a27 100644
--- a/app-shells/pwsh-bin/pwsh-bin-7.3.1.ebuild
+++ b/app-shells/pwsh-bin/pwsh-bin-7.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="+pwsh-symlink"
 REQUIRED_USE="elibc_glibc"
 
diff --git a/app-shells/shish/Manifest b/app-shells/shish/Manifest
index a333accecb6e..7fc0a70a682d 100644
--- a/app-shells/shish/Manifest
+++ b/app-shells/shish/Manifest
@@ -1,3 +1,3 @@
 DIST shish-0.7-pre3.tar.bz2 189207 BLAKE2B dc5f12bf75da6c1843a0cb2f35d3d4e06bd65082598979c07cae55dc56cc25eea77a2727ab1848d42a969b87b36a30cc27b392f24020435b2a207e86c7ed7a0a SHA512 b8269394a3b2a06d1ab48224b81c041ffa4b0a08d6849fc8081fad38aad34e179c12198a1b8e94703cf17e029f88068af87ffd2ef4051ff8e24886fa96b39c98
 EBUILD shish-0.7_pre3-r1.ebuild 1120 BLAKE2B cab7381850a95d8c5ac9548d4734d02d9c19065515f6cdd389728b47cf06fa5f4b47ce42155011095141a17e6727bcdd986c8ab06a2261702e020c3c6d35226f SHA512 238a2f5fdda6ef3fb2479661ba74356a0cc835ad130aa349d91b24fb168a1a59f781c62d8d9ffbcb9c6301133183254597b833a6963eb9256aa03ad52849da60
-MISC metadata.xml 240 BLAKE2B 976f503517c04096cc5aead68cf664bdca5ef889e5daaa90618a5cda82dd68a7658e8d9eb1842c481f3f4c67e598b9008e36a6915ec4349f1ac0c503aaecf2a3 SHA512 e27faf7081a6e4eb7725aa53ca637630d55b2fdcc380b825fce33fb9dee5222fc3d90663ecb7f7935c84d6a2c162f4104175e1efdd9d7fe9e405ab0cbe2fb5e7
+MISC metadata.xml 243 BLAKE2B 5d37bd230b41c0519699216f715ed3e0b7471557784f968b8c002d1e2cb75ed9fd6a4c1cfc255df1a88db368acea94c3e8bbe3065baacdc05f007fda7e78d27d SHA512 50fb58bb7be1189da4400182f5a8860c84e4f80834f6528f74b6eac49b379b7df69d487b62bd566cc53c816091f1413d5a99b401798d542f5801214552eeb1aa
diff --git a/app-shells/shish/metadata.xml b/app-shells/shish/metadata.xml
index 57f8d9afcd11..f6b0a0b74fc2 100644
--- a/app-shells/shish/metadata.xml
+++ b/app-shells/shish/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="diet">Use <pkg>dev-libs/dietlibc</pkg></flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="diet">Use <pkg>dev-libs/dietlibc</pkg></flag>
+	</use>
 </pkgmetadata>