gentoo auto-resync : 08:06:2024 - 00:08:11

13 files changed, 216 insertions, 16 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index dc250971c0ec..0cee912c6cac 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index f5f8dba816e5..008c86a6d400 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -5,6 +5,7 @@ DIST bash-completion-2.14.0.tar.xz 428980 BLAKE2B c28ec0cd348a3954461f7a865823a3
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
 EBUILD bash-completion-2.11.ebuild 4048 BLAKE2B 177e6746e781a1743b28d4d523c934d6779c2dfab654d2d2ee280bd446004df315a775e8685f17c9db701f97619e4ba789cf2c84c245a05996d7decc90142d4c SHA512 f1a58ee868d4b44a29924650dcaeca20aebd05afce9f80da79bc562770b37a67f3d58c8f6d4488ba37c40e48f127173d7b194f39d33bdf40105f7040297679a8
 EBUILD bash-completion-2.13.0-r1.ebuild 4882 BLAKE2B d6ab14e7f431b971d3220a2ff3c1152983df424d0c5a5468f803030b3af2d012dc711c98c863b5c6e58e04a464fbb91fa612890b848b35f8fc6ef5105c1e2cec SHA512 dd62efb394f9958d660a3f8277806c204cab3e762640318128798521a2341735f3dd84942452ed2f561541c5730a80a57464c1d3724da5f34472cfaec1b6f2ea
-EBUILD bash-completion-2.14.0.ebuild 4816 BLAKE2B 4763eae7f6d1196c3587b6f4fed07dfb5d137a3117550c05b6a79cb0ffdcd0bd89140fea2d88aa8a64ea697a1034f29af6aba93cd65def3a14b401afe0a589d7 SHA512 78e3f0c1342df4edf69dd3f42b8c92daa17e871511ab9d9301e0e839c0feee63889ba56134c109badff8ff3d62bbb57d29db827265c43c4a043de7839fc0a5c0
-EBUILD bash-completion-9999.ebuild 4844 BLAKE2B e5b211118d21a8d706f89ae7ab7f7cfba09978abf17acec6e6f4335f45f6784a9c951ee1506094a70db0f472bfc3190360d5557afbc763d8739fa15a048ef7ef SHA512 5ca599b903108fe07d62f8691501c0ba5fc6b2d38b3e1367e73e95d23c8908a15a37c498d74621ded9a50eccf58f05a2dac8b51b468eeb59d5e78dcf850e58fb
+EBUILD bash-completion-2.14.0-r1.ebuild 5117 BLAKE2B 05c9000145f2c71e659fa1f4d52a94b173d0dd517d3357e2abe4a38e6731c913b249a475c4ba9139814d156a44fe076d0d648b5fc375b0e188e119bdd3cacde3 SHA512 6df17c92462cd95af10df22f93ac06c1c18210b560ee7ea4acdca1d8710ab15d44b8f68146ba24bec9ae6eb1fe23a66fc86e4439a3b106842601b2ccc5f75313
+EBUILD bash-completion-2.14.0.ebuild 4814 BLAKE2B 3d4736024841a73c7e15f16ce4d0cee37d6008d728e847d18a4f4d4e7557ec0d80d61337697e582d6f5690fa3e78097a11587610ffc3626acec48a03f044451b SHA512 92a26d809674a2754119cfa07a1914af42bb644624e30a2aaf1e9bec311bc725556b7c38533d91680989b658b314f49403e844c0a23ec53a669d6f63c6fd5496
+EBUILD bash-completion-9999.ebuild 5071 BLAKE2B be0e74b1eac5bf91867e3d34a4d8371b987a3ce72d126c59b31feddd1566b1b582d75584e1ebfe0df468803cb2d2c78f28a074ee17db2fd1bc453639d5020c44 SHA512 db93c9f68a95feb334b321963d505547320d248a6aec7c920544bc6db3f1c5919b007542818094fb3c404cbed6ebe54ca217d6722412b1aa6c0d9389e85fddfb
 MISC metadata.xml 1436 BLAKE2B a01cee2abf1c4bc38ed6fe464f3daf43f8cf441a2a70f74b20bad79e37183a311326a863680d6939f18f8adebb9976861de897df272ab3cc7448cafbcb87f4b3 SHA512 f1b1af3f696ed159b8e1f728b51d651ac66ff849ee3bb37d949bc09e3be47698ea052ed48826edf4341d87835b3b54482153ca4fa3c299a5602eaec5f0cd780b
diff --git a/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild b/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..7878ba323bf0
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="
+	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	eselect? (
+		https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
+	)
+"
+
+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"
+IUSE="+eselect test"
+RESTRICT="!test? ( test )"
+
+# completion collision with net-fs/mc
+RDEPEND="
+	>=app-shells/bash-4.3_p30-r1:0
+	sys-apps/miscfiles
+	!<app-text/tree-2.1.1-r1
+	!!net-fs/mc
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)
+"
+PDEPEND="
+	>=app-shells/gentoo-bashcomp-20140911
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.14.0-optimize-kernel-modules.patch
+)
+
+strip_completions() {
+	# Remove unwanted completions.
+	local strip_completions=(
+		# Slackware package stuff, quite generic names cause collisions
+		# (e.g. with sys-apps/pacman)
+		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+		# Debian/Red Hat network stuff
+		ifdown ifup ifquery ifstatus
+
+		# Installed in app-editors/vim-core
+		xxd
+
+		# Now-dead symlinks to deprecated completions
+		hd ncal
+
+		# FreeBSD
+		freebsd-update kldload kldunload portinstall portsnap
+		pkg_deinstall pkg_delete pkg_info
+
+		# For GNU mailman, which isn't packaged. If mailman isn't installed,
+		# it triggers a QA warning.
+		arch
+	)
+
+	if [[ ${CHOST} != *solaris* ]]; then
+		# Triggers QA warning since it only defines a completion on Solaris,
+		# to avoid defining a bad one on macOS.
+		strip_completions+=(pkgutil)
+	fi
+
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
+
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+python_check_deps() {
+	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use eselect; then
+		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
+	fi
+
+	default
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# redhat-specific, we strip these completions
+		test/t/test_if{down,up}.py
+		# not available for icedtea
+		test/t/test_javaws.py
+		# TODO
+		test/t/test_vi.py::TestVi::test_2
+		test/t/test_xmlwf.py::TestXmlwf::test_2 #bug 886159
+		test/t/test_xrandr.py::TestXrandr::test_output_filter
+	)
+	local EPYTEST_IGNORE=(
+		# stupid test that async tests work
+		test/fixtures/pytest/test_async.py
+	)
+	local EPYTEST_XDIST=1
+
+	# portage's HOME override breaks tests
+	local -x HOME=$(unset HOME; echo ~)
+	addpredict "${HOME}"
+	# used in pytest tests
+	local -x NETWORK=none
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin
+	emake -C completions check
+	epytest
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	strip_completions
+
+	dodoc AUTHORS CHANGELOG.md CONTRIBUTING.md README.md
+
+	# install the python completions for all targets, bug #622892
+	local TARGET
+	for TARGET in "${PYTHON_COMPAT[@]}"; do
+		if [[ ! -e "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.} ]]; then
+			dosym python "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.}
+		fi
+	done
+
+	# install the eselect module
+	if use eselect; then
+		insinto /usr/share/eselect/modules
+		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 2.1-r90; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
diff --git a/app-shells/bash-completion/bash-completion-2.14.0.ebuild b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
index 99221ed4ec32..c2afa2872829 100644
--- a/app-shells/bash-completion/bash-completion-2.14.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 322f3a72d214..0cb1ec461db8 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -29,7 +29,6 @@ BDEPEND="
 		$(python_gen_any_dep '
 			dev-python/pexpect[${PYTHON_USEDEP}]
 			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-forked[${PYTHON_USEDEP}]
 			dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		')
 	)
@@ -38,6 +37,10 @@ PDEPEND="
 	>=app-shells/gentoo-bashcomp-20140911
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.14.0-optimize-kernel-modules.patch
+)
+
 strip_completions() {
 	# Remove unwanted completions.
 	local strip_completions=(
@@ -57,8 +60,17 @@ strip_completions() {
 		# FreeBSD
 		freebsd-update kldload kldunload portinstall portsnap
 		pkg_deinstall pkg_delete pkg_info
+
+		# For GNU mailman, which isn't packaged. If mailman isn't installed,
+		# it triggers a QA warning.
 	)
 
+	if [[ ${CHOST} = *solaris* ]]; then
+		# Triggers QA warning since it only defines a completion on Solaris,
+		# to avoid defining a bad one on macOS.
+		strip_completions+=(pkgutil)
+	fi
+
 	local file
 	for file in "${strip_completions[@]}"; do
 		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
@@ -72,7 +84,6 @@ strip_completions() {
 python_check_deps() {
 	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
 	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" &&
 	python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
 }
 
@@ -96,7 +107,7 @@ src_prepare() {
 		eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
 	fi
 
-	eapply_user
+	default
 	eautoreconf
 }
 
@@ -123,7 +134,7 @@ src_test() {
 	# used in pytest tests
 	local -x NETWORK=none
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked
+	local -x PYTEST_PLUGINS=xdist.plugin
 	emake -C completions check
 	epytest
 }
diff --git a/app-shells/dsh/Manifest b/app-shells/dsh/Manifest
index 703fa559a817..e660fb3d8056 100644
--- a/app-shells/dsh/Manifest
+++ b/app-shells/dsh/Manifest
@@ -1,4 +1,4 @@
 DIST dsh-0.25.10.tar.gz 394506 BLAKE2B 1110787e454d5c77e4d4090faa2317720b034ecdc4eaac3c58502a4d87b1a7213abc57a77c564d0f893cce5d7d5252f646676a959c1392c63d208a97745104f4 SHA512 a53fba14e65644ce5858b1e9827601016db6d61cb50b0229ea53eeaee676f5870d2dbfd6ebde237008bfc7144316484529c646104e72d99868d44d814a41a009
 EBUILD dsh-0.25.10-r1.ebuild 568 BLAKE2B d4afc9cf9b22dce94082ca2319403d59e7a33315ff31dd2b78e84947f76e93ee2a7be27b1c91503062c9a1e508c589776018e603746384749c9daacf0948ac86 SHA512 bb4edc5df8666380efeff628fec2216744a29dc34828fe4f686da830b3f4ae9bcf9e6b79d4d4e2aee878afbcfbc343970a7a5ac0edc0d300e5643e889e514fc6
-EBUILD dsh-0.25.10-r2.ebuild 617 BLAKE2B c45b524629063d5739225267e360ad97e479301ad69e6dbe312208703092603de73ee9ec13aab43c04cb3e6fe77cf5f715ea73ea0a2e3d38b209ef0563e6aa42 SHA512 9b4e324521ce7ff3022f4c6fb86bd28c5cba9f15ebf3bd22600c5a1ef174d77890f1ca1ed623628e637f9f0a5e0129ad7cfeb8ab8f7e97634f4729fef8ea5274
+EBUILD dsh-0.25.10-r2.ebuild 615 BLAKE2B a10aeb69d10968bad7125e1cc290a6c75dec857af864336c1ff9f8a414e242578e81525de5d62e05ac972d2eac8d47fb66061e0a72d126f94b5e49b0728fbc43 SHA512 250234ca82178dbe5a3d67e20f7d950bbea5a76d93b045197c08088c3f7808b34229e9fac5647238158be2cb99219699f9a8b21d8e7984026400c3bc7cbf0d9b
 MISC metadata.xml 254 BLAKE2B d6008c0af75d2c59696336153c1fbf23e23bb091b3786644f333d4c0bb9e43c13041ef756532814f203054bead254e98ee24c4e04b053a84e51c18e8714ec84c SHA512 49ac9b7f3e1a9e805c65e2288af69d49c40246ccd58241740afb44593e73c26fa89772185d6b6693db2778e14f5b493169f8b2def93e2d6bdde44cf3b5d66244
diff --git a/app-shells/dsh/dsh-0.25.10-r2.ebuild b/app-shells/dsh/dsh-0.25.10-r2.ebuild
index 40cc257b9efd..5749ccc6d05d 100644
--- a/app-shells/dsh/dsh-0.25.10-r2.ebuild
+++ b/app-shells/dsh/dsh-0.25.10-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="dev-libs/libdshconfig"
diff --git a/app-shells/fsh/Manifest b/app-shells/fsh/Manifest
index a7b2e5ad172c..fe6a6340c6ec 100644
--- a/app-shells/fsh/Manifest
+++ b/app-shells/fsh/Manifest
@@ -259,5 +259,5 @@ DIST xunit.core.2.4.1.nupkg 22659 BLAKE2B f810cae28847f7f6bc1dc5866c2526cc496f8f
 DIST xunit.extensibility.core.2.4.1.nupkg 238957 BLAKE2B ba1d6a3ba13da385fad20d09b7ca0bbe1c32d7ada1a4932e3e2100fbb8c049b9abfb15a2a8064022f7367ad0b804e9c5a6af9986155c7e31fed922061d51acd6 SHA512 aa477119fc5db00bab105b2bf33e8b7e805155be1571b7b2935c05f8c46b39baeec0eb65ecefa28505041d7f1f9d99e5505b18ea447ef6d7307a898bb28711d4
 DIST xunit.extensibility.execution.2.4.1.nupkg 328138 BLAKE2B 963aae4c76cbb5d7d36fae036f5c6a50643588019639d358295d2298e2dbcf1890da459dc69db9b0eade5a7d779b5e13f2762e1e9b2b96c8ec00979491a5dc7f SHA512 81cf13c553dec37f87cbaa894ecef42478abb52b79932dfcd20c42f1017e56658eb3a11d586968f719b7511926fa03db13dae85557e7af0e40baa14daf8479d9
 DIST xunit.runner.visualstudio.2.4.1.nupkg 701075 BLAKE2B d9164b6bd4ca9d27ae6796b66f46db2a19ef3995fba5eabee76f91e770f6ae56eee76bad4fcc35e76f0338123fcb30b5da651e364f3db1de096dee1a24cf1b96 SHA512 ef4893778e150ff51c3f9917ec19ba0e335aca2f69aae23b3619d4ecd978eaa5954010c756a46b1435e036b18ff77e98c5e7c9c730bed9ba75c905303c9204be
-EBUILD fsh-1.0.0_p20220816.ebuild 10468 BLAKE2B 1538dccaaf3e3600b4f5efee3346a0a17b8da48e9054660610da4f03c88482ac3060ec5800d0564d60e646018f43d9ff512c2d3f3e25beb1fee0e3c51e543554 SHA512 1fa8fe962b499f82f99241d1062cbac33c8f482bb0f82b2eedd7a48d07a3114416852a20666262202b4c28bc0b7ff32b23767ce775e07d8228b9cc27673dd21e
+EBUILD fsh-1.0.0_p20220816-r1.ebuild 10474 BLAKE2B 02ca1233490bf75a6d6be313a1a994a682e7548375022c746d9b51da23e366a36e6a36c0874be08de314194357ac617d0e7cc9ee600a0b1186296a2741e80ff3 SHA512 b1a444b61139b905fe91c0121a7e0583a78a0fee52ed61b67c26cc84ec2797170b31e535f1322f27a05571c2407d131d3d036e9c536769d8413aae264d682c48
 MISC metadata.xml 574 BLAKE2B eac0485b490f954aa9551ea70fb188baa2ca9e6a69240bcd8234295e3873aebec0ca310b3871ed07e605e772c3e991cab76657770af70d09647744eaaa4a0f69 SHA512 ecbdb8fd152eb7f7fc1ca82a5f296eb63fdf387ab2d84af92bb000a03e6fd58b5c4c65020cc8d1c3642a8069d81091fd1a22240bf62f01444ebe18338a4a3d6a
diff --git a/app-shells/fsh/fsh-1.0.0_p20220816.ebuild b/app-shells/fsh/fsh-1.0.0_p20220816-r1.ebuild
index 6e984143f78f..fb94a4628dfe 100644
--- a/app-shells/fsh/fsh-1.0.0_p20220816.ebuild
+++ b/app-shells/fsh/fsh-1.0.0_p20220816-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DOTNET_PKG_COMPAT=7.0
+DOTNET_PKG_COMPAT=8.0
 NUGETS="
 dotnet-xunit@2.3.1
 fsharp.compiler.service@26.0.1
@@ -291,7 +291,7 @@ SRC_URI+=" ${NUGET_URIS} "
 LICENSE="MIT"
 SLOT="0"
 
-DOTNET_PKG_PROJECTS=( src/FSH.fsproj )
+DOTNET_PKG_PROJECTS=( "src/${PN^^}.fsproj" )
 DOTNET_PKG_BUILD_EXTRA_ARGS=( -p:RollForward=Major )
 DOTNET_PKG_TEST_EXTRA_ARGS=( "${DOTNET_PKG_BUILD_EXTRA_ARGS[@]}" )
 
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index e6908d60a80a..e91959865a89 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -4,6 +4,6 @@ DIST gentoo-bashcomp-20240511.tar.bz2 21695 BLAKE2B 886a80eafbb923b5ccb5c9e6e074
 DIST gentoo-bashcomp-20240525.tar.bz2 23392 BLAKE2B 03da7f6a077382efaac9c9ddad2ef6bcf21704574378a400aeeb0ec2b88934c3aac10009912ad6f0d06ae410c42d6013acaf4629f3c6f46abb19b0d1e000c1d9 SHA512 5017f2e106e2b3f1335f1edbce7ede1fd918bd701a1082ec8cd71f1cedad9480109d82381d56587cb6da4dd04c210f9f51dbaaf8b2aa419abbc6fab73825226a
 EBUILD gentoo-bashcomp-20190211-r1.ebuild 713 BLAKE2B 29596473516965efb6f0de2110ec0b1ae54db7fb81878b5626d251a965e2c994819d98d94e0d79e740d5136cddc633e81cd5dbcd94914549a8cc6ad2a8263511 SHA512 6ac12134730a531c7ad0388dbf4ffadeb1ef75a0463bedc2affd054a495979c0671e54e95eb819e7a488520220e0b0763502cc4d8275087e1dfb5d3a56af825e
 EBUILD gentoo-bashcomp-20230313.ebuild 713 BLAKE2B 4f47666a2d2f8aa5937661be660037835c66417365c4591cfbdbd6a2a68cf65ff4b4b56b150ef6ad05de12ac043a5d516b142bf222eb5eeccea36fccce01e166 SHA512 204e4541c867ec187bdbcbb245b778ed24f607284639b28d9833f0afdc0e70d6c49d9edc1a04f7cc5dbfbafbb89a9e81db3756fce645b3ba877394a89c7c2185
-EBUILD gentoo-bashcomp-20240511.ebuild 719 BLAKE2B 48241218818bf681510a472811343f63ace64951f09595dea3ad6ff964fc375fc4eed3ef2b41ca8502282e5c73f0bc3e4a946966913d2257e52e97f3f798c3f7 SHA512 a9ceffdddae8d836e06ba949ffff0f06869e90643683e2bc5e5cd05b6fd72aaf4a582716b2f446a796eed14175a3782a6bd5031c180a118cbc192e087735efe1
+EBUILD gentoo-bashcomp-20240511.ebuild 713 BLAKE2B f6e440d53af7db052fe8e87f866c015dc72273247fe35e6dffc472bf5c2feda33a368b18cd49448376d14a21e1f704cc21005204954933fc159256bd7d9fe028 SHA512 fffc55725e6a49f4d0732969083006e11a0059a83598771a1807fb96f29d1ac8f0e51bd75a33be4f734ce7e21fb57fed3d2fbde5678447458f5c063f8aac9b67
 EBUILD gentoo-bashcomp-20240525.ebuild 721 BLAKE2B c820a59c93fc9734dc3483a5afaa3a16c8132ee14298444286f63cf8c6c94f515e602abcbe115ae00a08def6a5aadf1ae6957376838bca0acf4535f0e8e7e772 SHA512 f87fd78b7ebd1b0ec9efda71e79a27fca5e8ca46865bd1349ab28fb9e5e45af17612f685f0b52a1a7e54f5663f1eb694df64ae2f06bca47885c0a57817b61094
 MISC metadata.xml 462 BLAKE2B 3cda2b7d1bf7c72e89ed24b3b3d8a7b2ed32bdde2e207c137d5cd166a43abe42260f9e0865feeaae9e7f19c522d2782a4d9fa6403174d78e5f1bf4be6473a16b SHA512 81850261bd2036db40887fd5ac7c5cb1f60f158497f92ac633a699b4245a95cdce7ccdad869e1f7527a6c3de4832b04699117b6c76fb84f9d9e2bd3660280552
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240511.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240511.ebuild
index e04a46c471f2..6ccd45c43430 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240511.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20240511.ebuild
@@ -11,7 +11,7 @@ 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"
+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 \
diff --git a/app-shells/pwsh-bin/Manifest b/app-shells/pwsh-bin/Manifest
index eb3633663918..bda255bff37d 100644
--- a/app-shells/pwsh-bin/Manifest
+++ b/app-shells/pwsh-bin/Manifest
@@ -5,5 +5,5 @@ DIST powershell-7.4.2-linux-arm32.tar.gz 69243670 BLAKE2B fc9fed5cbe102758e13e7a
 DIST powershell-7.4.2-linux-arm64.tar.gz 68233646 BLAKE2B 5bf91f9f5ea32eeaf1075acb88830e97f4368c5f88d83fcdf7de02c1474f1f306a55a36ba7d9ec862a3c59c51c5ff56976b4309b9c26a66a06e50d8f2291e6b2 SHA512 b6eddc877c4fee9bb81cde8203e92504e5d33c3fe804d74fb2bb617825e359e42f30ec7b345b46cce8204b73084ea83986f45c4aaaa15771ea5eeb42a285d5fd
 DIST powershell-7.4.2-linux-x64.tar.gz 70975224 BLAKE2B 5500161a8ad290c92e4a0cc4c3acc466514fdf42dabc826d0a8995f9867d26272f612b357225e6f412e20d6cf0ba9b8c3c42bef6af46b65d77d0db3b6e932f32 SHA512 148524245a11ce471ea58c83f4048ee4a4fef4add1071ea66c876ff041bee71322a80d9db8ad70665f168846c6074c96e327b481fb4190cf9f8652788fc32036
 EBUILD pwsh-bin-7.4.1.ebuild 1584 BLAKE2B 25230a76220f4b0a40f366b7ab8a7ff25bf430918d6652b67d636836be8a886bda0621ddeafdee95e3166f65197338480fbf3a513335b0b5031bfe3830277668 SHA512 4ca9445c5eb2298255063fffa98eacded7493d0b36d5fc3dc05e4c8216271212954eabf47973f80807356e5bbd81da5c0a6b9292fc357c1dde443908f657a187
-EBUILD pwsh-bin-7.4.2.ebuild 1590 BLAKE2B e204eac6bb6b0190ea159d54a2dbd1d76518ffdd89e879c9ec15f9b091c0b7cce386e2c8a9d8afaeb7f8dacc1ac9ba0fee504ea94abc9d92496267a59ee4ff0e SHA512 2b4134e07e8e21220be6407f811126b50ee836f7def413d85879eac8398c27afadbef109cc326ea37104e8854e1e252324081534241951c7920760766cae253a
+EBUILD pwsh-bin-7.4.2.ebuild 1587 BLAKE2B 25326df0deb5147e2680f71b00aa8ede2c41052a3f813cea493af0ab1f6d620ed486deff6eee2a497aa528937252ae37f3e2f3d6a0e31020240732e17460d7b3 SHA512 7cdf2dfcc76c98fcb9b74888543966760079605957198cd3ec8915bb1c26fe58e1274965a7e3a4b180cc25625c4c53b9052912c390de7560a1be8216bae3ca3c
 MISC metadata.xml 980 BLAKE2B 645e3ca15511e0e88193911119ac54ada054ecc0ccd355bccd3c758f9d854fc4ec34af3aee4dc73edbedc8b983a71688bf2753ff3251b2f317138afb07792dc4 SHA512 e68ea742c9139352d2aa31853aaded6e26952a63971b7ce4473ab2931579b26807c127163b783f3cb602a0ddc59257034440eb337b874b3a2e8e6447a6d63b93
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.4.2.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.4.2.ebuild
index e09b2d5daf99..c180fccd95ae 100644
--- a/app-shells/pwsh-bin/pwsh-bin-7.4.2.ebuild
+++ b/app-shells/pwsh-bin/pwsh-bin-7.4.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm arm64"
 REQUIRED_USE="elibc_glibc"
 
 RDEPEND="