227 files changed, 1837 insertions, 1137 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d6d1f81baae3..369087e44856 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 74139a230a70..f21dd6bf6eec 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -677,5 +677,5 @@ DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff
 DIST zstd-safe-7.0.0.crate 20463 BLAKE2B 8c4cb034d1a12ae54abeeb8f12101f09ef82115ec26630103e7fad29ce1d0045e59dbd8ae301dbe8f47c90515ab9575288137ced98aea667a9cdd7ad0e2a6234 SHA512 2f0d66c874f7880d05fce39f4bdec5e217e8e18b44bfe97b4ea33c7d5c8719c5bd9615f7274f0b19734a465eb2477993fb8ae8d60abc7da36eac361e8fc4a437
 DIST zstd-sys-2.0.9+zstd.1.5.5.crate 728791 BLAKE2B f08f8730d9cc1efc5520f223e9bfb0854b3a67a2907e47c38e0572d8eca688c1bae61560e11e664834dbff1bed3d40608b23d08f102ce6cd7f1af72b48446e4c SHA512 604c01eae4975745aca1dc1d351db98fec34f7036143e59dfeb4d36e6ee18ac9f3871a288557c8ebdc9e816967a008da43154dc9a0eb3cac85071ccb05bf58aa
 DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
-EBUILD anki-24.06.3.ebuild 22847 BLAKE2B 5407d5a45939ff89bf7bbc242181f4424fa4f50008189db8233c56a25ba591292f7509da36f43e395fb8655bc0fd6b1514062047bd79b4f8697cb7f08597113b SHA512 1be64e54784a360ff94f857f3e204cff98c2f69c6704c65cae0f0c51cac3ec2ea77302ee884fb4734cf4b13aa78d11b7b95603492c7aa5d3f4a5129fa61f8cc6
+EBUILD anki-24.06.3-r1.ebuild 22115 BLAKE2B 600212c8e1f082bb32c022b6261545905a740122a5989da65c2fb7d69b7e4b4748c32675949b925d4b98457723be3f6d8dc884ac310c27c9b10759658fd4514e SHA512 c2809f95d884e868fe4fc3172faecf2c88ebd95d35a8341c543c0dd03c97fe9dee5b0bbcea5e8ad67e66abe60914cfe998b77be9b7327675e3bcf295c29c7938
 MISC metadata.xml 1165 BLAKE2B 0695da67a86533933fe1f11a83e0dc24282518ccec2b514aad08c82646266a4e1b42071ff4ebd4e113a7134cd8936539720acb5adc4d0e14e77eab07668e0e93 SHA512 99b566d1da1af7a305bb08cb9b30b86d963a7e61b520cb59ca256db8ae612948758959e0fbb6896070a42f679a6a9f9f411cd7694bd962ce30d744cbd1251385
diff --git a/app-misc/anki/anki-24.06.3.ebuild b/app-misc/anki/anki-24.06.3-r1.ebuild
index 77c1754f1f9b..19438db1f49e 100644
--- a/app-misc/anki/anki-24.06.3.ebuild
+++ b/app-misc/anki/anki-24.06.3-r1.ebuild
@@ -728,7 +728,7 @@ LICENSE+=" Unicode-3.0 openssl"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc +gui qt6 test"
+IUSE="doc +gui test"
 REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!gui? ( test ) !test? ( test )"
 
@@ -741,11 +741,12 @@ RESTRICT="!gui? ( test ) !test? ( test )"
 # rustls-native-certs to use the native certificate store.
 
 DEPEND="
-	dev-db/sqlite:3
 	>=app-arch/zstd-1.5.5:=
+	dev-db/sqlite:3
 "
 GUI_RDEPEND="
 	${PYTHON_DEPS}
+	dev-qt/qtsvg:6
 	$(python_gen_cond_dep '
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]
@@ -755,24 +756,13 @@ GUI_RDEPEND="
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
 		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		>=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}]
+		>=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}]
+		>=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/waitress[${PYTHON_USEDEP}]')
-	qt6? (
-		dev-qt/qtsvg:6
-		$(python_gen_cond_dep '
-			>=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}]
-			>=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}]
-			>=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}]')
-	)
-	!qt6? (
-		dev-qt/qtgui:5[jpeg,png]
-		dev-qt/qtsvg:5
-		$(python_gen_cond_dep '
-			>=dev-python/PyQt5-5.15.5[gui,network,webchannel,widgets,${PYTHON_USEDEP}]
-			>=dev-python/PyQt5-sip-12.9.0[${PYTHON_USEDEP}]
-			>=dev-python/PyQtWebEngine-5.15.5[${PYTHON_USEDEP}]')
-	)
+		dev-python/waitress[${PYTHON_USEDEP}]
+	')
 "
 RDEPEND="
 	${DEPEND}
@@ -788,8 +778,9 @@ BDEPEND="
 	doc? (
 		$(python_gen_cond_dep '
 			>=dev-python/sphinx-7.2.6[${PYTHON_USEDEP}]
+			dev-python/sphinx-autoapi[${PYTHON_USEDEP}]
 			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-			dev-python/sphinx-autoapi[${PYTHON_USEDEP}]')
+		')
 	)
 	gui? (
 		${PYTHON_DEPS}
@@ -797,9 +788,10 @@ BDEPEND="
 		app-arch/unzip
 		>=net-libs/nodejs-20.12.1
 		sys-apps/yarn
-		$(python_gen_cond_dep 'dev-python/wheel[${PYTHON_USEDEP}]')
-		qt6?	( $(python_gen_cond_dep 'dev-python/PyQt6[${PYTHON_USEDEP}]') )
-		!qt6?	( $(python_gen_cond_dep 'dev-python/PyQt5[${PYTHON_USEDEP}]') )
+		$(python_gen_cond_dep '
+			dev-python/PyQt6[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		')
 	)
 	test? (
 		${RDEPEND}
@@ -808,8 +800,9 @@ BDEPEND="
 		dev-libs/openssl
 		dev-util/cargo-nextest
 		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]')
+		')
 	)
 "
 
@@ -859,12 +852,6 @@ src_prepare() {
 			ln -s "${BROOT}"/usr/bin/sphinx-build out/pyenv/bin || die
 		fi
 
-		# Anki's Qt detection mechanism falls back to Qt5 Python bindings, if Qt6
-		# Python bindings don't get imported successfully.
-		if ! use qt6; then
-			sed -i "s/import PyQt6/raise ImportError/" qt/aqt/qt/__init__.py || die
-		fi
-
 		# Fix hardcoded runner location
 		export CARGO_TARGET_DIR="${S}"/out/rust
 		cbuild_dir="$(CHOST=${CBUILD:-${CHOST}} cargo_target_dir)"
@@ -929,13 +916,13 @@ src_test() {
 }
 
 src_install() {
-	local DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI can either
-	switch to ${CATEGORY}/${PN}[-qt6], or temporarily set the environment variable
-	ENABLE_QT5_COMPAT to 1 to have Anki install the previous compatibility code.
-	The latter option has additional runtime dependencies. Please take a look
-	at this package's optional runtime features for a complete listing.
-	\n\nIn an early 2024 update, ENABLE_QT5_COMPAT will be removed, so this is not
-	a long-term solution.
+	local DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI
+	can temporarily set the environment variable ENABLE_QT5_COMPAT to 1 to have
+	Anki install the previous compatibility code. This option has additional
+	runtime dependencies. Please take a look at this package's optional runtime
+	features for a complete listing.
+	\n\nENABLE_QT5_COMPAT may be removed in the future, so this is not a
+	long-term solution.
 	\n\nAnki's user manual is located online at https://docs.ankiweb.net/
 	\nAnki's add-on developer manual is located online at
 	https://addon-docs.ankiweb.net/"
@@ -964,16 +951,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	[[ "${REPLACING_VERSIONS%-r*}" = '2.1.15' ]] && local FORCE_PRINT_ELOG=1
+	ver_test ${REPLACING_VERSIONS} -lt 24.06.3-r1 && local FORCE_PRINT_ELOG=1
 	readme.gentoo_print_elog
 	if use gui; then
 		xdg_pkg_postinst
 		optfeature "LaTeX in cards" "app-text/texlive[extra] app-text/dvipng"
 		optfeature "sound support" media-video/mpv media-video/mplayer
-		optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt$(usex qt6 6 5)[multimedia]"
+		optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt6[multimedia]"
 		optfeature "faster database operations" dev-python/orjson
-		use qt6 && optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport]
-		use qt6 && optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase[vulkan]
+		optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport]
+		optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase:6[vulkan]
 			dev-qt/qtdeclarative:6[vulkan] dev-qt/qtwebengine:6[vulkan]"
 
 		einfo "You can customize the LaTeX header for your cards to fit your needs:"
diff --git a/app-misc/astrolog-ephemeris/Manifest b/app-misc/astrolog-ephemeris/Manifest
index 3696bb83af7b..52f28344c4df 100644
--- a/app-misc/astrolog-ephemeris/Manifest
+++ b/app-misc/astrolog-ephemeris/Manifest
@@ -1,5 +1,3 @@
 DIST astrolog-ephemeris-20230414.zip 34586270 BLAKE2B 301cd558cf50fbea242b41388b6f04372f8d1af0dd899dc40731b3a2ac8771c5ef08a4cbb987c6b4ef6f29613b5fe4d5933601808b18f2d266dee36f17bfea36 SHA512 a058a81815c13e31cb03c22408238fe7582cd5b5b548ef9562a60fa89e37b2de2c16d729fd3e78311c9a822169e9d93987599f658ca7b6b1f536c2a0ba76307c
-DIST ephemall.zip 4604012 BLAKE2B 0caee003272734a71a3f2d10871e1c034c9e9039f5cb0f09ed19d85122ba875794933d53624d6a379838a7f2c33728c2da9aaadbd91887fea018ecfc1c786557 SHA512 e7822cecb87466987107e84aae64d292dad31de9d2c268886869a37ea9e99bf81b2a530129c0f6538c6b55ad46b185e16ee0c5b0d8858acfe189f19e2595c6da
-EBUILD astrolog-ephemeris-20230414.ebuild 863 BLAKE2B ff5841778276c1dae7e4f9a7eed6ea606b4de55d5da6f2a10c24e1e7b807fb838c9c018ecf7f62113012c1f3c97d9a22cdff9e860ecb3ffd21b6a6fe36db8b61 SHA512 90dba584c79733c57c6738be07083cb8f5c900c859d7915bef63fb40d9f5e74b1f390fe03b214363faaa69eaa4ebfc984c318c120e193aacb4e5dabd7ae7b808
-EBUILD astrolog-ephemeris-7.60.ebuild 608 BLAKE2B bdbcbe137b1f45f84e6b5f96102d5fd220c76d615ed5496f1fdb1fb922a39591d02ea9ce08df519f5afd88148e5ea1e9f64d9bfc67a74f4e91e66752b7623f05 SHA512 7d4fa46ef13ba17c81e7e8c8ee239cbb36d4ef61f2f4fcce96fabfa461a5a9bee4d9c90df2722841101a6cf3a82cba3f7cb37739da87aa185ec64f9d76308503
+EBUILD astrolog-ephemeris-20230414.ebuild 859 BLAKE2B 88a5ebd4a57f28054043e8c8ad0af129241a0604e712bbbe1d9199ffdff16cd2b08685e3531e1fed57efa0fc254f670cbbcd0db8e5f82842afbe0883fc522500 SHA512 6441c45d670553024f4244e44f43707a513d29a1eddf2546b43d57b30d8d702e8e6b2696db03a566f97be1c11fede7f3c8cf8930fadbae87d542e820b196209d
 MISC metadata.xml 278 BLAKE2B ec2d276da53ec73b30c5f3c1a592d84055592026a448ffdc152835499337f7470cf92d3343f3eca3ec55b44c307878a295a55af0c3d142ef98b1cc892594f187 SHA512 e3ef5c31e448eb600e79d31d402e0822589f5ed22e61df0b45b7a656b6bb0db16d353249debcc480cf6fa0bdcf5f81b360a6e28c796a3dcf432f42f03ab75e71
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-20230414.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-20230414.ebuild
index f840301c959c..ce61f4fa3629 100644
--- a/app-misc/astrolog-ephemeris/astrolog-ephemeris-20230414.ebuild
+++ b/app-misc/astrolog-ephemeris/astrolog-ephemeris-20230414.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="app-misc/astrolog"
 BDEPEND="app-arch/unzip"
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.60.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.60.ebuild
deleted file mode 100644
index 7607c3dc0176..000000000000
--- a/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.60.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-misc/astrolog
-
-DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
-HOMEPAGE="https://www.astrolog.org/astrolog.htm"
-SRC_URI="https://www.astrolog.org/ftp/ephem/ephemall.zip"
-
-LICENSE="astrolog"
-SLOT="0"
-# works fine on x86 - runs probably on other architectures, too
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND="app-misc/astrolog"
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	insinto /usr/share/astrolog
-	doins -r .
-}
diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
index 870025f9774a..1e15cf85a7b0 100644
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@@ -1,6 +1,3 @@
-AUX astrolog-7.60-drop-resiters.patch 1354 BLAKE2B f986926b3ec4653bb17cb0363ebdf06896d68c140201a4ae714ba2aaf231717349c6e0426906e06561b1ef6f1e241d3b92d7020c357ecd438ebeeada617b9cfa SHA512 68bf5c0ade2c3cee96f198e3092930bff003e6913bfd5ae0fc16e7b381509f0bbb213c2d08009d4c9485e64be44293024a853b5efb19b837f700ffb292cb3593
-DIST ast74src.zip 4483648 BLAKE2B d15d3e5d98337c5c5884973d079cffda9144a5c9f43ab48dd38f782eeef089d9fd5fb3f5a01f1d607bd2134e6a774494d4cf7d99e117d3092c8787626436e778 SHA512 540bda7ee10cde0723f6bd4afe410e4e9c59168e31dbdbd0b3b62a9e77ae83a971543fc812876258e2b7b9636f880c74b9be5497c54e7dd0e9b444bad2edbf6b
 DIST ast77src.zip 4706533 BLAKE2B ea5ae3805ea43d61f5ff27f199bd36e7263800e441b1aa31044c814b08f6ae2be8969d752a16262ec944dbaae0e0bc2ab3413ee14edbe2366f332a56452bc4d1 SHA512 f5ad29cc023e4bd6a36ddc8434f422fcfe4dbd0b3ebebb85bf6e2d12de58cf60e8304c8a5cea6cb385de346dc1441752542774ee1e7319de9af2166289fd1291
-EBUILD astrolog-7.60.ebuild 1923 BLAKE2B 80b835e77ed26a97221fe802b085e0ff859001b6fb35a614da53d586641569ac0da68973dfd74aa98faa68d47e74bb4596dd598b3d0f9ea55041e2a6cbd70716 SHA512 6ddda60d1b2f52913f7da18d40352940b7bad8111df79042d75bea9a49e99dd95d46f46a1459f643db117cdbce03c0838f521141f33a26f3ae8abdb7fd5c3897
-EBUILD astrolog-7.70.ebuild 2000 BLAKE2B 54e36cde34e58e95a174503102a3489c27d4c1f28bb75bbce42c4628b746fe6cff34bcb9934fb4d40685b0c32ca3d8682bf46f7b78cbb37044ec23598c01076f SHA512 fa9be4fdc019021ce4fae0ee0e5aeb115f7542f86d45e36cd95737787780ef049c642100ac6767e060608f723f8b90196e2f219fcc42204e440082f91eb463f6
+EBUILD astrolog-7.70.ebuild 1996 BLAKE2B 26b7b9925747d92ba3399e95090cb7078ec4221e3bfe3758c640dcd45a384fadd4839b069c8bea403df41244dce486c6e2476cb0dfe4c3cbeb6040b6446b2ad7 SHA512 b7d96468f0a72c7a820df6c5a2feaea30f70ca7391055524c7e466413b5855b48a08112e5c28e7d93876ebe97fb801dc0b3485e6e55d8b208bc2a6d30987ff5b
 MISC metadata.xml 252 BLAKE2B 4e6ba57de638a5c8ac6559124dc2d0123e7cc1e081aa924fb0e656d6905020a90dd30494fad0adc99622f6ae4e1a7a60fa02d7aacddc6d061ff774a2b703eac6 SHA512 18a4d8f7719d25b9fe2b1351a16529ab659808f1e64a64a84dcf1ab597b7a6c12e3a96050ec3177e50be762f2812cc1eb5f47c49f951a451899f29856abd11dd
diff --git a/app-misc/astrolog/astrolog-7.60.ebuild b/app-misc/astrolog/astrolog-7.60.ebuild
deleted file mode 100644
index 4390bd12d028..000000000000
--- a/app-misc/astrolog/astrolog-7.60.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-misc/astrolog-ephemeris
-
-inherit toolchain-funcs
-
-DESCRIPTION="A many featured astrology chart calculation program"
-HOMEPAGE="https://www.astrolog.org/astrolog.htm"
-SRC_URI="https://www.astrolog.org/ftp/ast74src.zip"
-
-LICENSE="astrolog"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.60-drop-resiters.patch
-)
-
-src_prepare() {
-	default
-
-	# remove stripping of created binary, dump hardcoded CFLAGS,
-	# respect CC (bug #243606), and CFLAGS (bug #240057)
-	sed \
-		-e 's:strip:#strip:' -e 's:^CFLAGS = :#CFLAGS = :' \
-		-e 's:\tcc :\t$(CC) $(CFLAGS) $(LDFLAGS) :' \
-		-i Makefile || die
-
-	# we use /usr/share/astrolog for config and (optional) ephemeris-data-files
-	sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h || die
-
-	# if we do NOT use X, we disable it by removing the -lX11 from the Makefile
-	# and remove the "#define X11" and "#define MOUSE" from astrolog.h
-	use X || ( sed -i -e "s:-lm -lX11:-lm:g" Makefile || die
-		   sed -i -e "s:#define X11:/*#define X11:g" astrolog.h || die
-		   sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h || die)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin astrolog
-	dodoc astrolog.doc changes.doc
-	insinto /usr/share/astrolog
-	doins astrolog.as
-}
-
-pkg_postinst() {
-	elog "There is a sample config file /usr/share/astrolog/astrolog.as"
-	elog "astrolog looks in current dir for a file astrolog.as before"
-	elog "using the file in /usr/share/astrolog"
-	elog "If you want extended accuracy of astrolog's calculations you"
-	elog "can emerge the optional package \"astrolog-ephemeris\" which"
-	elog "needs ~32.9 MB additional diskspace for the ephemeris-files"
-}
diff --git a/app-misc/astrolog/astrolog-7.70.ebuild b/app-misc/astrolog/astrolog-7.70.ebuild
index 84ef17f76a89..22b375e46632 100644
--- a/app-misc/astrolog/astrolog-7.70.ebuild
+++ b/app-misc/astrolog/astrolog-7.70.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 
 LICENSE="AGPL-3 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="X"
 
 DEPEND="X? ( x11-libs/libX11 )"
diff --git a/app-misc/astrolog/files/astrolog-7.60-drop-resiters.patch b/app-misc/astrolog/files/astrolog-7.60-drop-resiters.patch
deleted file mode 100644
index ae399f8e099d..000000000000
--- a/app-misc/astrolog/files/astrolog-7.60-drop-resiters.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Bug: https://bugs.gentoo.org/894524
-Sent patch upstream, dev said they will take it in coming version,
-https://github.com/CruiserOne/Astrolog/pull/20#issuecomment-1666693982
---- a/placalc.cpp
-+++ b/placalc.cpp
-@@ -561,8 +561,8 @@ int hel(int planet, REAL8 t, REAL8 *al, REAL8 *ar, REAL8 *az, REAL8 *alp,
- /* speed in radius, AU per day */
- /* speed in z, AU per day */
- {
--  register struct elements *e;
--  register struct eledata  *d;
-+  struct elements *e;
-+  struct eledata  *d;
-   REAL8 lk = 0.0;
-   REAL8 rk = 0.0;
-   REAL8 b, h1, sini, sinv, cosi, cosu, cosv, man, truanom, esquare,
-@@ -686,7 +686,7 @@ int hel(int planet, REAL8 t, REAL8 *al, REAL8 *ar, REAL8 *az, REAL8 *alp,
- }
- 
- 
--void disturb(register struct kor *k, REAL8 *al, REAL8 *ar, REAL8 lk, REAL8 rk,
-+void disturb(struct kor *k, REAL8 *al, REAL8 *ar, REAL8 lk, REAL8 rk,
-   REAL8 man)
- /* ENDMARK-terminated array of struct kor */
- /* longitude in degrees, use a pointer to return value */
---- a/placalc.h
-+++ b/placalc.h
-@@ -256,7 +256,7 @@ extern REAL8 test_near_zero(REAL8);
- extern REAL8 deltat(double);
- extern void to_mean_ekl();
- extern int afl2planet();
--extern void disturb(register struct kor *, REAL8 *, REAL8 *, REAL8, REAL8,
-+extern void disturb(struct kor *, REAL8 *, REAL8 *, REAL8, REAL8,
-   REAL8);
- extern REAL8 fnu(REAL8, REAL8, REAL8);
- 
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
index 035e551098b3..b5262b7cf3df 100644
--- a/app-misc/banner/Manifest
+++ b/app-misc/banner/Manifest
@@ -1,5 +1,5 @@
 DIST BANNER_V1.3.5.tar.gz 135190 BLAKE2B 4accf00ad92f0351a1df49d3cb6451a71ee7f929fc6f2b25aee7fc6898780944b71cecf8070dc186888a9fb7580213ef2111a5086fc396f3c7e242e678cf8270 SHA512 6f2d79f1d76533fac920aa2984258e3f5278c40692d2b2dcae560734dcd5b06fcc8c99f266abdc91fb272eb291906bcea747f5ee53a67a4a5cb99179941897c3
 DIST BANNER_V1.3.6.tar.gz 139693 BLAKE2B f41dd6861f5c90c797468b55f0fda9909fff396e0820a4353371398d04470d1691c38685d0746b6e94d0b17f98b57ff677feebdb7685e098a97d5d9c1a06bec8 SHA512 82eb4a7d9166900bde7fec0f1df69db30241451d0b3c321cad4c44312632f72b6261767b67c2ed4bacf551a9f52bf417c5765649fbe3c6951eccef5c18295be7
-EBUILD banner-1.3.5-r1.ebuild 473 BLAKE2B 53496d7696ca821dd152f8debfc5729f9ec8877166ce60f362ff000bd1dcf50dc996d9129f59037c6757c025b13a9354caec324ad951ddeba27ea8fb3738b0f8 SHA512 5e90046cd534d86662dd4488af0346b2d66cb19b7b1cd0adaef22f17c3b93146f48d1510f7d5cb19a1fe2dc8ef5815c11ae9c56874042603f5c5ec9e22c6ff40
-EBUILD banner-1.3.6.ebuild 477 BLAKE2B 2eeb276bf27c8601e0a0f76729d1bf4366aaab4856e4a7a8158b34979a84b5a7a480db7ec486779d842a884259f37449fc88b1fb8c9da0ca65d3b4e0a6040aa0 SHA512 c0f00e4f91a8f037b475fabc59b0fd476bd843d0feb10879a554b7c768a5cc8510362feee0aa3b655fa7b3119b292504baded9389c616b551fd423d3ab4c2d35
+EBUILD banner-1.3.5-r1.ebuild 467 BLAKE2B aa5bea73fe6cacdfbff39f8cf7641601029a7c1f421b24a24845674c2f759e12a267173941a44318d9fd51765e38386f44753f77148298f546d7ee88e6143da9 SHA512 0f9a164597d4303f7a6446d1e171634f507ba1bbb565f365b726c19a5d1f5352527cdadc6eb8a22ae302f7816154785388eade0a6eb3123562e2c244a0544ded
+EBUILD banner-1.3.6.ebuild 471 BLAKE2B 042a1db0f400060d1326639086a117cd6aede50dfe92158d1ee18093873fae5a6154742976419941beecc338ea7a37f2e09409311e5e1c7d253fc6af85a53fb3 SHA512 24eddc91f609d85ceb5e96979b71ec2572eb960e9ae3920cf0dabcc03f3b74a83bbe3b965bd696f95ade63ad6e68660ffebdd5169957071f02c7f5868acb32c6
 MISC metadata.xml 490 BLAKE2B f76f3dec7b986e0112109091bb181c0dcb74d437a75a814b428e3a2719d86d3f321982ded0aa950da9a43f57b55a9637d2ba786d5ba57af5e09a148b7a708dcf SHA512 dc0f4e1ec7a7316806d70e8b6b34de3b09be86e42cd9e4bec4f26ba70db9f9304467c368251f44c0b316adca8f2b633ba06da1b041d8cd539342802f7d45b442
diff --git a/app-misc/banner/banner-1.3.5-r1.ebuild b/app-misc/banner/banner-1.3.5-r1.ebuild
index e167ba54a1e2..bf63f926eb77 100644
--- a/app-misc/banner/banner-1.3.5-r1.ebuild
+++ b/app-misc/banner/banner-1.3.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pronovic/${PN}/archive/BANNER_V${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}-${PN^^}_V${PV}"
 
diff --git a/app-misc/banner/banner-1.3.6.ebuild b/app-misc/banner/banner-1.3.6.ebuild
index 647769d016ad..61f0eed7c151 100644
--- a/app-misc/banner/banner-1.3.6.ebuild
+++ b/app-misc/banner/banner-1.3.6.ebuild
@@ -10,6 +10,6 @@ S="${WORKDIR}/${PN}-${PN^^}_V${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!<=games-misc/bsd-games-3"
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index 4bdd5948d409..29b9ee367d2a 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -1,5 +1,7 @@
 AUX conf-1.9 385 BLAKE2B 5a2ccebed6b8ab81fea623f66e1175506fe9bb8045bd516ccbb78c40d4b84d554c11ffb9d3c628b0142f5ce33d6f5e1ff8b140d8cd7d05642648c2e4f8bc700d SHA512 981dc0dca903f8ebdd3cc80368650d42f02bf194ccd12e64d2d4cc273ae13ec42da69341529750bca7232d7bcb3df67a02aa3db6179c4835682e86fabef689f0
 AUX init-1.9 511 BLAKE2B 8651a6f023f99f183bb7092a79f5a7d5d7d56f3321c18ceb0fcf8199f3217505a1e1238fa584d0ab9c7276d04abd9c5527ed2f732a44f39a6044310a20399b58 SHA512 7e16023709e72724f411953b2d042c6bb369be7c0a9c891d3e03ea12d4c175ce82e57466c8b2c2bf8611cb1f5aee9c76ae5adad0ad38e99c93525d732715546a
 DIST beanstalkd-1.12.tar.gz 79592 BLAKE2B d0abe510bada93014c9c748e116a7a34e947be50269eba3b64ed97739800f3464b7c2574c9d7e87786855f6f50701e60464d280c95db4f75f402f547700ef19e SHA512 347f8cf29501d4bf1a01a472f8f6265d1211eadfaa4e5626c8fcab5b1f8116e1e0ddee2a0c82ac116ee60655a2e3b514d254f98c2154be76109a24d77f7d8210
+DIST beanstalkd-1.13.tar.gz 81234 BLAKE2B fdda2778510cd5c11eeb4123843a89374c791bd093c8bd2add7a7378c0be041f972054ccdf527630256a816a9db3623c994d96e84658b34dad8254828ec7a6aa SHA512 7b5d1a185765a6abe4f1fb8ff2ce7ab0d00b9b2d87ed78ee6349895cdab43e7eac9bb9da5aa1e7b378038e69ac20113e7a663529b0fd77b697257bc384b7deda
 EBUILD beanstalkd-1.12.ebuild 859 BLAKE2B 56093147c38861e53ea325a6bdeb869e965b611aa509ed1c93c5d47923e53aeae6135f9a07ae3c0bccd8eac36ef48d0fc28a94d1d83789bada76a8e85194b055 SHA512 00a2e9cf8af68a29f0372bce8e8631ff1808bc1886aefeb5e423141580c5941e874ca2156ccc35f176f9d34dfdf89d418edea3b5bc756177622d7d7d35141717
-MISC metadata.xml 251 BLAKE2B b73e2b21c0304e0fc001b7480a96e6432dd4e8846bbc9302b88778b08262b0677dd496ac2eab68403d7114ce10b823888826c6b1b2b1b63570de2019e27ec48b SHA512 827b351d2f43a349136e14e2dcc714739524568aef590a8c24536c968819dec6789cc2e38051a969cbdfbe89262d589395dc3d61f3ee3d03115672dbddd0832e
+EBUILD beanstalkd-1.13.ebuild 874 BLAKE2B 35eaadc1d789c55057477973bb8721efad4974fee85fa81b31a7dd6ff9e55f57249c2d0a5b291128e5fe5ca6220c29251203f7c2ab8a1b05a954e4c0fe122af4 SHA512 c54a47cf429eb69ba298904e2bfab4c3de01df2a19c97bf7a862bc832fcbcd75d5b7dce93ac3c4e5af09f7222a463cc81a91af2d50d47848ebe99e7e29919cc4
+MISC metadata.xml 259 BLAKE2B 8e3f33b6bd668aaffecdbd364072deb5f01bbe51e6bf2b1423ab7d6d61d32c0afabfc9b6d525ae66037e6cf247df30769426b4dc4c49bfde96a1aea5af429f1e SHA512 afa82eeb6d327299d633dc33f467ec760051576a063d973c025fe24b7783a722f4c057a6fb421c6f0da822ecd4db6ea9328914592a8d877fa2118afafbf874f2
diff --git a/app-misc/beanstalkd/beanstalkd-1.13.ebuild b/app-misc/beanstalkd/beanstalkd-1.13.ebuild
new file mode 100644
index 000000000000..ef09d23efcff
--- /dev/null
+++ b/app-misc/beanstalkd/beanstalkd-1.13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A simple, fast work queue"
+HOMEPAGE="https://kr.github.io/beanstalkd/"
+SRC_URI="https://github.com/beanstalkd/beanstalkd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x64-macos"
+
+RDEPEND="
+	acct-group/beanstalk
+	acct-user/beanstalk
+"
+
+DOCS=( README News docs/protocol.txt )
+
+src_prepare() {
+	default
+	sed -e "/override/d" -i Makefile || die
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	dobin beanstalkd
+
+	doman doc/"${PN}".1
+
+	newconfd "${FILESDIR}/conf-1.9" beanstalkd
+	newinitd "${FILESDIR}/init-1.9" beanstalkd
+
+	systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
+}
diff --git a/app-misc/beanstalkd/metadata.xml b/app-misc/beanstalkd/metadata.xml
index 1212e78bc666..ee9559f5bf47 100644
--- a/app-misc/beanstalkd/metadata.xml
+++ b/app-misc/beanstalkd/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
-    <remote-id type="github">kr/beanstalkd</remote-id>
+    <remote-id type="github">beanstalkd/beanstalkd</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-misc/bfr/Manifest b/app-misc/bfr/Manifest
index 3a2133d09829..c33fad3cc6f3 100644
--- a/app-misc/bfr/Manifest
+++ b/app-misc/bfr/Manifest
@@ -1,5 +1,5 @@
 AUX bfr-1.6-long-types.patch 3638 BLAKE2B 251050b40495293b2ed9c3a27b12584a9556a92194338714294129cf74faa5e5cc45e1f139da7ebff4322750593a9b3a04c2190edff6acf81e34d65df6b8d084 SHA512 dd9067e5d8cc323f069bb1f7e6866a1948a6426ac71541e0855d7a2ce595aa4ffcc49f78413604b86c7b871d5788339382b89136a7a8628ba320b8288244c5f0
 AUX bfr-1.6-perl.patch 326 BLAKE2B b5e5273b8cd5e198d5c3dd76740d7d3e8588571e29822095ffe3b0eb50a85d6422163aca0774d8de955c64bf066ffc445d3e140eb5dcb4d06e39274c07e8e6fe SHA512 8f65f5113b60a6cbe692b9b2cbf02a7a7b3f046a6a5203cc05cae7a08e1344afd5ababa41608d334d5d1f04afb0eb2bf705622056c5620626805eec41351ffc3
 DIST bfr-1.6.tar.bz2 81002 BLAKE2B 24339eb7e882ca319b29a2a5e033ccfd6a0abe920572d4f023b4ad0321e2e9ce3096c3aba317bada297f9d17bbe368edf08cddd903377e99f5cc2a1dda7261ea SHA512 19939218029219cc328e3efb8e799bb8c755ccff7b8cb81ba0c735d499a48f581aa42322045fdbd153dcfdb8792e84d9fddbfba9e9c5d94675e2830163936762
-EBUILD bfr-1.6-r4.ebuild 511 BLAKE2B 1add19dd4e7993d4553b2b926f8307ca9b9e40b2145c5f640a852b3861ba8a237036c833495e15e095544ea41c785383293d3fe0c6a7cd9bebfba28925e5bfe2 SHA512 c6224795facd6d345295137fbf0e3ba9bf3d6cfc2c78f6728f562705fa91e598698cd1c3a89d171f9a7f35d9f444783cfa5189493a006c640c82b87516fe8e67
+EBUILD bfr-1.6-r5.ebuild 613 BLAKE2B efa8eb587e4b3e7ddc5e298fc578f981b8a86ae77d172781c520cd8ce4d893ee70cb2c95976410126d7cd1f54be6b9eb4509de69c40473cf2349ba126f6fa008 SHA512 a59d580c1febccb40c3f8171999c339f7d3e0f66fd31664aa217533b73fdc9eacbe1c5321f68cff278bbd065da46f39386d1f23e04bfdf5062b3e06bf0254ab7
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/bfr/bfr-1.6-r4.ebuild b/app-misc/bfr/bfr-1.6-r5.ebuild
index c12eec636233..ebfc40881c60 100644
--- a/app-misc/bfr/bfr-1.6-r4.ebuild
+++ b/app-misc/bfr/bfr-1.6-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="General-purpose command-line pipe buffer"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -20,6 +20,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-long-types.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf # uses old broken checks for compiler, bug #874519
+}
+
 src_configure() {
 	tc-export CC
 	default
diff --git a/app-misc/binclock/Manifest b/app-misc/binclock/Manifest
index 5dfc9b22b07f..2687073ddf8b 100644
--- a/app-misc/binclock/Manifest
+++ b/app-misc/binclock/Manifest
@@ -1,4 +1,4 @@
 AUX binclock-1.5-Makefile.patch 412 BLAKE2B 74bd07f6d355c54ebcda4b8290418ff9cdaff7f751d6db509b1ac1a55088a32c6f20bde24c4280a5f743342fb023d33d87c70b81cfbc16e6fed487e09b8196aa SHA512 abd7210720187581ed75421778945a3d8076343bf245dd801c5e829c1f5fdc7fd3c80b9296590d786d50fe936251994f623734fa2ac8a7a799e7fbf5b59759d8
 DIST binclock-1.5.tar.gz 12301 BLAKE2B 598185f21d257bd02cd4d91e0ddc707d5eaa9ff52160bd9af0d8d50238fe6ca134952bfc99d285568b77c747ec388ed7e23e3c4bac0fec5fd150e34e55687ed3 SHA512 f3650c8befb999a7e6261bc72ee4f81be670fe95899efc742112102c4107ebbbb25d015d57a702630ce2104cf8c738953c7fe70f24814514d8a2705240000e75
-EBUILD binclock-1.5-r1.ebuild 554 BLAKE2B caaea2f44bfc094eaaf3888a85cdc943e67b51cda74ff60d86eb4cf16be70c600bfdcc31dbc70b1ec86b2c888dd44f59b2971194d6cd2d08dd6aff700d01911a SHA512 3748e3b4510f930fc38305b88df94407706b43e98747b52c5247d1f4eedc125dbc52119e24514e9aef5f4494f07462ac84d0a12d193cc46fe3bd4d6bd52ddcb9
+EBUILD binclock-1.5-r1.ebuild 548 BLAKE2B 1b09931f8970373ce645fc9554ebba06b0cb88d878535a4f76efafeafda81fb9fcc3bc2689d8f83b0daa7133017b90b2a8d91f70f1da5a5c28374c862cad452f SHA512 5a651af6a8e0e61b05781bfbd186c219ce7a0a2a954793ca5c7a82a57d8bbe34a25aa24cb116a33acfd271b957e77e71c6660d858a2d19ff6e15b27b74773928
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/binclock/binclock-1.5-r1.ebuild b/app-misc/binclock/binclock-1.5-r1.ebuild
index f609767f392a..f6e07b10eef0 100644
--- a/app-misc/binclock/binclock-1.5-r1.ebuild
+++ b/app-misc/binclock/binclock-1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ngolde.de/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ppc64 sparc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 51e51bcaaed9..48050e7acdcd 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,6 +1,6 @@
 DIST binwalk-2.4.1.tar.gz 39747760 BLAKE2B 480f8ff06932c77ca5ab2857cddf7ecebb36b6f2e55e3ccf15a971fa0f4c59d57b652556fd9f0dd20e6fbd887fdef3c6da022f76787b2edf16b0d1714d291e8a SHA512 f83d0ca09a39033944ce16345b7c2c8f3051a20f80315e4c797221df4e6844c7c89c0a49053d739156e2654b482d6ef93f0814fa588daab031dbeaed1423e6f2
 DIST binwalk-2.4.2.tar.gz 39746629 BLAKE2B 65e3c44b2e2c4cc639ad6b8adf3fbac7cda574ca8b00f714d4ae5635dd3e24fcfc8c0d151c20ad40ad891adef803667e6f65167f96d4405ad83abee44121c224 SHA512 b9d3b13de9b81216759f5e1573bf6056a3210892ad920b43afe0c6ef2ff1d200be28ecfe12bec11fd7540545d1bb2f27d210ee5afb968910d4e9fb46a21673ce
 EBUILD binwalk-2.4.1.ebuild 1047 BLAKE2B afecd73fc484fd79d9602797bd95340d13db84f9e1d4f031d43c2882c602b5b96879f4c7fcb5a457f987d2f12aebd87f8cf85c1668511ac7b69d1b5ee9d658a5 SHA512 5e05b803d5eded1b04fc9e850211c1dfdc2f788a9fba2206d90bd96c7ca383ac52e8660f891902b2b71b35b9c8873639b83c327bbb6107f53380487a28a6264c
-EBUILD binwalk-2.4.2.ebuild 1049 BLAKE2B f24294d09d4f370209d272aaa39b5b6a150646d3acfc64476284085f25b7c0ee9c9bc16f037d24cfdef3be1566f6d45a112b06415814b2e8c9dcf9aef63732a4 SHA512 afa4371295ab9bd5f93c176f25aea8e1c5751a148b1f2850937f984983f6df6631e788a8a36e281a7a1df710a4ebd7b96b12ed62cbed6d4d09cdcfd8d58f0b34
+EBUILD binwalk-2.4.2.ebuild 1047 BLAKE2B 77b3990a4e1caaa66367299a842312fb81d4ccd813ea9e9a5d0d108d339d99a192663c12af938b64eaae1171bf69fce050966db8f376ce4620b5d25dbc50ca69 SHA512 222b7316919b4e7495b39eeec375b4a77b6ecb76138094e278d88f4d684fad6865e724920a27a1bf74dc011ff42216981ad2fcdcf3a5874214678e7b8e30bf70
 EBUILD binwalk-9999.ebuild 1053 BLAKE2B c14f5be35204c116b66b1201617b0b99fa994e3119bd10bf108ba067c6347dac12de6edc123e460b863c5ac059c079996c6b95e1b7af102a4ff24e535a3130fd SHA512 0835361f16e64644f8d7f482b2e376e7a598df649124c41902aca20e0ddff41539881b7d55c9434a16a5f332d3d6eb6b2b8ace62198841bec9dce99579431f3e
 MISC metadata.xml 1056 BLAKE2B 6af373bfeff084c9d068255f7e8fec1fa485f23a3619c9995c83e94ad1a88c269926a71777c7165355ac8d363808efb65ac16a496e2b39a96c5c25f1c3aee9ce SHA512 b65dbca86bb1f9dfca4b2656426576f9dc8d98859f52ad7fe9c9c5fbf0c893c3b3022452fc707730fbab85d7ca32d84a3c3fddbd80826cec73ff2b8747d2bc70
diff --git a/app-misc/binwalk/binwalk-2.4.2.ebuild b/app-misc/binwalk/binwalk-2.4.2.ebuild
index 5088d07f539f..445b04ceaf91 100644
--- a/app-misc/binwalk/binwalk-2.4.2.ebuild
+++ b/app-misc/binwalk/binwalk-2.4.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/OSPG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index 537a3fc269c1..ffc75f139680 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,6 +1,6 @@
 AUX boxes-2.3.0-ncurses-gentoo.patch 644 BLAKE2B 8a01d5948379a268a3bb91076f35ebdc524aba16245b11bf04af0e18748c97ed7f29579ca85b5bf2c1b24cbfbef04ae1adff9a6fa2a619bd744f5883c47b8bfe SHA512 18c647b91ca5e2c0bcf1243eb3d78841d85c0275cbb766672c98b6198ec547714ef6166b58ace878bd52b40cd758dae3932bd2c605efb9156cf7f51d4d5557c8
 DIST boxes-2.2.1.tar.gz 230900 BLAKE2B 65ab0c8ad52d2764279397135b072bfa6f4bf86e465cc3a4778d30c5b19ce2c0d7c5f8636173529eca92754ee16d38b46a83b067b94315b1ea82448e4b1ac0a8 SHA512 0afa115d5ec01944878ef4d8f33e2887d123b172a0589eda53a04ba671916d9ef1d8299f9df9aeac8989807f86ca1b96b1c34aed03856643a89a07586b82e3b6
 DIST boxes-2.3.0.tar.gz 272302 BLAKE2B 282b41aee214f54aa3c8b237bc9f2e48e4144eebd6619880a38c7a71d9bf7bb434a250f29a05f20746530e8458bb0d062cd7e5bea88ebdf64030f090b1a8674a SHA512 d7580462ed5cf8a3299f528d7e4abea1c9733da2823c204bff69a804c72b768c4d3e8505b4d8881aae066f1fd95133cf9dc52e960333a82d8c529f85eb096fb4
-EBUILD boxes-2.2.1.ebuild 969 BLAKE2B 959469b5b406ab0b4a1b90e3f51702ce911309702425e6c2f1632e4054f437e23ff05f0e9f84ea13366a5d504ecdb079745083f6752270d70a867708966e850f SHA512 90ce6956a126bf01c068c905fe4fa2fa4c40573b7bdb2d6a21c9ce655a7b60908ed4c1e35f2c36aacd7a011fca701d7dc77c398f0530549820449869d8426873
-EBUILD boxes-2.3.0.ebuild 1052 BLAKE2B 077deb95e72d3cc4f69dcfb3138624e84260c89a5f895ce18f0325e5fe8dd93b6d34945ac898a6b20dc84402d7b9246275becb4774672ca9750992ebeda5139a SHA512 91c4641a619f19c1cecd93c08dbd55af27343da410af79a522c86e40004d5fea499dfe8c21d2e0f1683b2c5b63adfca5f9053b1788d8436e56cbef5176623d5f
+EBUILD boxes-2.2.1.ebuild 963 BLAKE2B 2d88d07b7d0eb5b5c6a07ac286b9077ac44c9cbc2fef38139771d5136c3aed709dc4ef4d0ac02197c24915f63e0c94a435a43f783c06fbba8bdcec72989f025b SHA512 6470c2bea2a8b8a441f7656cb5f88198d41120d0796e75e1d233197a0a5e8f001e3d9aaa99ccf001d8e3bdfbbff0a0983917f79910f35968275fd1cbeab2aadf
+EBUILD boxes-2.3.0.ebuild 1046 BLAKE2B 85833a1942d3ebd230fb826c57e8cd029636602e112a12d09be1ddf012782d811ee1673f9400649ab9332594e2d55f01855cdcf464bccf6c24c41638b73fd879 SHA512 63de064aa46309ff2721b7fddc66803f02c3d9e7a3433edf75f6b928f5fd53639b167220c9adf082d63c468c10d138429a858e25542ca9308397c3724389456a
 MISC metadata.xml 900 BLAKE2B ed21e2f334f908418be9025531cb81b38eb20c29a2d6824db34b60bc9cab117cf7390c223942b0a97b00a94cbf0a3d56d5991599bdc6ee2ae779cafd2ee9f423 SHA512 ff396d6d3de85f836cd7af967d783ce51ce17f4a542e5a800aec5929f0de1a27eb823014f1452045183eb437c960347c1c120ce38b60bead7f9a38eaef24e261
diff --git a/app-misc/boxes/boxes-2.2.1.ebuild b/app-misc/boxes/boxes-2.2.1.ebuild
index 5cf5cc9959c9..ed2d6bff1820 100644
--- a/app-misc/boxes/boxes-2.2.1.ebuild
+++ b/app-misc/boxes/boxes-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ascii-boxes/boxes/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/boxes/boxes-2.3.0.ebuild b/app-misc/boxes/boxes-2.3.0.ebuild
index 5315f2592d7e..05b8c350d99f 100644
--- a/app-misc/boxes/boxes-2.3.0.ebuild
+++ b/app-misc/boxes/boxes-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ascii-boxes/boxes/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index f18b2d77b92f..cb6c173d0374 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -404,5 +404,5 @@ DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a933911
 EBUILD broot-1.39.1.ebuild 6987 BLAKE2B e5d0372dc5a149cd5ad921a7e95dfc9161e5497ebe6e91de325957ea3c0237f4a6d3eaddb82fe41ba51d3ce02bf442e74154487c62376b189e46a5766e4c7a23 SHA512 f44a4d9920739a8e06241febaf753e305a31250d8a7c35f0dcaeb5a2f447d069b15e66efc7b075b17654dc0ae025c168cd423451c846fbf76e4126528235ba48
 EBUILD broot-1.40.0.ebuild 6987 BLAKE2B e5d0372dc5a149cd5ad921a7e95dfc9161e5497ebe6e91de325957ea3c0237f4a6d3eaddb82fe41ba51d3ce02bf442e74154487c62376b189e46a5766e4c7a23 SHA512 f44a4d9920739a8e06241febaf753e305a31250d8a7c35f0dcaeb5a2f447d069b15e66efc7b075b17654dc0ae025c168cd423451c846fbf76e4126528235ba48
 EBUILD broot-1.41.1.ebuild 6987 BLAKE2B 50e2650350f3fe8d6965cf69d731a8fe89e9618ea09bb74235cb51887e313996aaf7064f8ba246924b8c0efc8cdd5b311ceeec5f4595b6e64caf1c7f94b2d695 SHA512 3485a0e5fd059500940b5bc30e8227af4ab2dedb38d762eb36371c61dfe3f90cd5dce6d14ca1f5908dc44ae2b0ef4a5f6e2e668dbd1058dc1f5c03f13c61d6dc
-EBUILD broot-1.42.0.ebuild 7074 BLAKE2B 0de49ca6fc091e8ab60bec6a62e42a208149e9a322f1c27f03905609f0f1be2987715a472b325c7ad68d9974c46bcf2560f5a0b43928e9fa4dd5e1edc7930831 SHA512 914a1dba595948ec2dd1b53a5a4f38c209217f5af6e606114d6bb5be8b962c01d0640bdff3847aff1a6c309498d57dbea783b29b339ad3ab1c7fddc127b5bb07
+EBUILD broot-1.42.0.ebuild 7073 BLAKE2B a66c5b0540ef6449284281eecbb37634405a7bbb07bea99edfc8ba8cd4d465e873cffffb42b3c2c8f0fee5c057d5c7a065296db403f82d1f28fd01d2f68f37da SHA512 d9a37590d6ffc3b55593ed7385685dad66602f351d7bb224b9fc327028b365c770713e98c7800f8ac51045ee825ce86b4b9ed7b0b60d929332bee51969e5af34
 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
diff --git a/app-misc/broot/broot-1.42.0.ebuild b/app-misc/broot/broot-1.42.0.ebuild
index 004d7599c468..ec4dd63e7847 100644
--- a/app-misc/broot/broot-1.42.0.ebuild
+++ b/app-misc/broot/broot-1.42.0.ebuild
@@ -339,7 +339,7 @@ SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index e10ad95bc34a..b5d55e6005dc 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,3 +1,3 @@
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
-EBUILD c_rehash-1.7-r1.ebuild 860 BLAKE2B 3b7e27e013338fd19c73b467e26a91038aa9fd1c0a11bb7e9ca68251d4772753c1a7775bd9b05db4c5a89de2f8673bdb0dc13ac65a77bfb87bb803bf4a8b50c6 SHA512 0f813acc13a97dea1b69b436d1a67bb432674021087df603ea280b8f3fe25383c220eb34cab0af36ba4a2ad4d8810692857cb58e94e531b73c6110024efe46ff
+EBUILD c_rehash-1.7-r1.ebuild 854 BLAKE2B 1ac4516e1508a8ca8d7204e8d8d81748fa9c9ea5e053c9254b80e96dbb1bbf0b4c734333a43fca732f123cf2933982c59d4013cd1ff81d2d2e9d341381d6c686 SHA512 0983a706b715c6a53720c6b6843038617238cde8ebf6f1e5d047ffc1d56cbb1357ee027ca25d146754364a375998fb29b375cf01dd688986860aba8775527fdd
 MISC metadata.xml 340 BLAKE2B 18c63b1a5966e9cb39197495d6ad59c7e2999a96f1fba3aff63f203a0b08f6f50433679f89a81cbc6923893cda303466aaf7c0582dd4467ee61c5c004c20735f SHA512 59121a842240d53abc14bfac1293b79e86cb362fccb244cd6d950c51603bb99721be3c5046dd2a88707b56484afb2d9c1d6db3afb59eda5672e4b6cec5be3bfc
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 7a55138a80c5..59546f9c4468 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="openssl"
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
 DEPEND="${RDEPEND}"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index f602c1e73ae2..4abf85c5cf68 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -8,8 +8,8 @@ DIST nss-3.96.1.tar.gz 76715092 BLAKE2B 2a9ea65dd89cba82ea10a57887b10109369af81d
 DIST nss-3.97.tar.gz 76664827 BLAKE2B ede68cf0269edd8ffbe1e90682fb51c202d6298f8bfa5ebbd81e12785e29e6a6611ef3f0feceee73bea4d25ae12f251225649a73d249fdd90af179e07e39f3f6 SHA512 1ad6ac6ff626dc187f42b313c1088ef4b4ac0ee3e156d37824c36e778faa977e8f132302ac00d74aa8f9903e791a0fee6cecb5244d2601e0825cc125b6f33d6a
 DIST nss-3.98.tar.gz 76685475 BLAKE2B d382cc65e450b5b7d6b152952a8188822eab5fdbaa0faeefc3f98ef5aa70ed7534abcb7114aaa25c1e49f89dcda7cf75d85957d1a8e5ff964599362757138cb4 SHA512 4f335c5c284eff6424745cc15e32037715a915f6f61687ec36a8ffaef0e45d152602a1be275bbb2f14650c7d258d6488430cdcf512b18ba7cb73cd43ac625681
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD ca-certificates-20230311.3.96.1-r2.ebuild 6011 BLAKE2B f70efce58672ff29821e9ff475f1282d80d1e0e501dc7d07ea067c5501ebd0024393c212a55b124ca0bba1eac2f94df9f2a6261d7300876b064662e0ab29b4fd SHA512 f928d3effaf3b29de3d8ddea5e4c9f8a3897df9de556f8d7f0d1d808913036e231fb858a192d1c317babdb58a2be84755bc793c68edefbf80af0a8faea72d90e
-EBUILD ca-certificates-20230311.3.96.1.ebuild 6011 BLAKE2B 03332d2301bb94e353ab2b2112e04126aaa2fc9c1ad6dde5246050a50cf5aebd0344254df9c71ac09c3206ac040b167e47a98186b08a233ea2c4bdd12a6c55a0 SHA512 ba4bea370165b907f3ba42d74583731f20a67fe8ab7397699265e158a7b3368e7d495fa207b72b9fc9171c20ad3c721cc68081ea05f6e36faf70bc5aee9becdf
-EBUILD ca-certificates-20230311.3.97.ebuild 6000 BLAKE2B cec32183b3fc34964b9f867fd3b9433a66bde8a1ba7651e87ac3473e14883a5f9ce557e04975fadff1b7063d694fa020d18686f9e232cc1c6a3cb2a8eb303d90 SHA512 853f36c689baa572fa28d8ff70d3c44278569ba7a02e93ba57640f965877c71a5f14ec1c9e3f8287b3e767263050961763ddf22bba1ca61fba2667d88680309c
-EBUILD ca-certificates-20240203.3.98.ebuild 6011 BLAKE2B 6b487ce899e50d2e25b32666dbaeb93ed63caeef318ae16d7785eb962433d914da67e332d64a9b4d7fdf0a92ad2fe7d05dbbaf3edecd9ace955b1873f29c4d48 SHA512 0f6dd2a7dc894311c8bb21fa987f4e3725145958fb2eb1aed30a6de20e7354595ff54b7ffcdb988572f979716744f1cf9e7f30f6c982fb9b62d582473816db58
+EBUILD ca-certificates-20230311.3.96.1-r2.ebuild 6005 BLAKE2B 2897e37fb359a51370a3612d63fa24f372106ab32ba160ac0c4a7d38b7d450529d6b0cee9ac697eda61a2c6a0bb96aa1833f18a23da3341e32e488e9be5526b5 SHA512 992e7bf04fb909e94fcdf957a821a359086acfce06054ce0d0e3833913fad7a2d4175fa802a52341ddf49895a192180ff623273de5bacdfeb8835923cfa1206a
+EBUILD ca-certificates-20230311.3.96.1.ebuild 6005 BLAKE2B 866d6ab35e3c7b7a69a5263436964c7802db45dde812aad9d3503563788e4c0fc4bc789385272ccb0ac3367e350a68756823ce3d628abb184299a422f2a826c9 SHA512 02ca49953a0a115f6624a37b3263aa4f4496ffcf9326c94fcc3e6da94e55936955cf954b93c751cb18ce4b6b3a3757d910b944efbe919ac4714af2e4a1852b62
+EBUILD ca-certificates-20230311.3.97.ebuild 5994 BLAKE2B 8b098908181793576e09b4a639416bb2cfaf57f424027a77bedbcceeeec9fdee5c4a481edab004cb3fa68f67b09fcead0e82b749da90cecdba9f396035fbd660 SHA512 d6668623e78399a2a2b90aa49a43b94a8ab912a3347e1682e4315584444b7ada31ad6cfffc61cb036c026c50408834139e4ee8cf7e44f55391e64551347595c4
+EBUILD ca-certificates-20240203.3.98.ebuild 6005 BLAKE2B 6092982d3e155c6cc61c37d8adf26db96358d65e2176ad34c6e7136088fddb7d8b1f7aac4e2d916d8993dd2ea6f250b43653726c120bd11a200701965f416d1e SHA512 3de1f9a3739777b5f4125602032074f83522e78b460656eebf289d1143416c78dbf1727f98a73e1a91007d84f63effcacb80f7e664010757fdea934e1e545794
 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954
diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r2.ebuild b/app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r2.ebuild
index a5a495009b36..1277069f1808 100644
--- a/app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r2.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.96.1-r2.ebuild
@@ -55,7 +55,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.96.1.ebuild b/app-misc/ca-certificates/ca-certificates-20230311.3.96.1.ebuild
index ce18cefa5e7e..9daee66a780e 100644
--- a/app-misc/ca-certificates/ca-certificates-20230311.3.96.1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.96.1.ebuild
@@ -55,7 +55,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.97.ebuild b/app-misc/ca-certificates/ca-certificates-20230311.3.97.ebuild
index 2fdc4b9e08f5..f5fc560bf376 100644
--- a/app-misc/ca-certificates/ca-certificates-20230311.3.97.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.97.ebuild
@@ -57,7 +57,7 @@ S="${WORKDIR}"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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"
 ${PRECOMPILED} || IUSE+=" cacert"
 
 BDEPEND="${COMMON_DEPEND}"
diff --git a/app-misc/ca-certificates/ca-certificates-20240203.3.98.ebuild b/app-misc/ca-certificates/ca-certificates-20240203.3.98.ebuild
index 1fcb84d81e67..7552331ab01b 100644
--- a/app-misc/ca-certificates/ca-certificates-20240203.3.98.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20240203.3.98.ebuild
@@ -21,7 +21,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit python-any-r1
 
@@ -57,7 +57,7 @@ S="${WORKDIR}"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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"
 ${PRECOMPILED} || IUSE+=" cacert"
 
 BDEPEND="${COMMON_DEPEND}"
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 90261f45f82a..1de1742a3906 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r2.ebuild 567 BLAKE2B 8d4a7c329c7b97fdf8dadf1589ed2f6aaede0b4cb2f4daa6c51fa76e1b336dd2a0993ab1325b57b33b26eb426ce2ca7c066466d0dbea40c15ac323964dfeaca6 SHA512 a56e2687ef76fcb0f553a7d89cdcfa4866e935a4476caa0938f02cb644619286aee2931b293bf480b53edbb08c612c8d3e29c2a17896dbb68b4d4937b9854609
+EBUILD calendar-0.9.1-r2.ebuild 561 BLAKE2B 510d0dd996ac8c90fa1da79e1d6cecb49b32a962f3e92a2e2b55c2bb3384935bf07415168f9385871be043a96e958ec6a53f317c02c313bd1c5b3c7528e71d84 SHA512 e1da37ed5943b5e72a52a7350f4d422104540e317ede65f2fa92c41e7b15f7174891537fc0be4b2ae7fbece6332f090856169fe1fb7b57f77857b9da9b7cae77
 MISC metadata.xml 347 BLAKE2B 1fda66e3713f393b3b2cd1a2e413276e9e8fab7a2e925a5639937aa2d61c3e35678551ff053247fd207de1df877b104183941c5bb01798e53795f4fc04e7baf4 SHA512 73051fc5cf102c755f5e20aca7e91994562d5847de91f15e4f7458b8e6c891cefb09a7d4b3c28894657ffcebe58dc65192cb3cf258761b970ac46e38b211a3d4
diff --git a/app-misc/calendar/calendar-0.9.1-r2.ebuild b/app-misc/calendar/calendar-0.9.1-r2.ebuild
index bf33a89f4bd4..b3d2fe410620 100644
--- a/app-misc/calendar/calendar-0.9.1-r2.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
 src_configure() {
 	tc-export CC
diff --git a/app-misc/check-jsonschema/Manifest b/app-misc/check-jsonschema/Manifest
index 6676140c8579..8a291044c329 100644
--- a/app-misc/check-jsonschema/Manifest
+++ b/app-misc/check-jsonschema/Manifest
@@ -1,5 +1,5 @@
 DIST check-jsonschema-0.23.3.gh.tar.gz 229537 BLAKE2B a8a40ddc383f38096693a2079b73a8a8fe2ceed5d1e118e539957c205c500807518c0380aa18cae2524efdeda33987f057350ba73b7a699240706ff4e276eafc SHA512 14f9eb6b203e3aec6ca35f75304bd24fd5a09c2b89bcbbf69c22e0c0f44c587972015677498fef1a378683c77f94d9319450daccadddf5fecbe7c738dd16c726
 DIST check-jsonschema-0.28.4.gh.tar.gz 270302 BLAKE2B a5355ed124d6e3bd076403448c3d7fa7c62524c6da49eb5a61d226485639812bdea28b53c570b084e976749b92c1ee586b0285111a543b1a3e8a734ea8d6cc67 SHA512 f4c693ea0951c246814775f26d5c3e5de8020484a92ae15e2a13e284ccb2c58f2bdf7dbdb66612661304f5ff9e6ba88eb3f89e7f0ad23a3f6fc8fcc61372ceea
 EBUILD check-jsonschema-0.23.3.ebuild 1205 BLAKE2B 0c989674195df4dd318437f210d1756cdcd339b2673cba225b32a0ec43dc772e01664e02b333e365f3fd2a045db8fcd647f66cdf87436ad5678dd2e8a43d3b67 SHA512 03718b851d6d3fed0495f1f476f2a53f36f6d825baaf90188150861407c4653463ec3b0367a00f45011e4c0cdd7b1f155a0ac4385b42e1da284c5ea495392481
-EBUILD check-jsonschema-0.28.4-r1.ebuild 1446 BLAKE2B d8a601f2ed06ad0f245a4478dfd1522467bc59855c843ace915abe881989002c346b41c705a5c292071838e8c390a3a0b08f4d15db58c937322b0570e6944bf1 SHA512 12014029778985e7f58f451d8b1664221ce438493f17dd33206e2e3afbf96e72055db61f9072e19680eed516149514305c3a2b9fbf48d6d6d413d10961027043
+EBUILD check-jsonschema-0.28.4-r1.ebuild 1445 BLAKE2B 8ca816d1e3d54fd3b1676532764fa7c3adef2361ced652ed698215924d79c69c8c03d193c38bc57785361cfe424e5ef82ddef48fa57a008d21eaa80c6bb84bb9 SHA512 dc6df6c2764dae1d3d5e77fc80d94f8fdf572a7649042be92906c0623d4ff505e5abafea57feb80565380c181a6b56564a8fcbd887180d2bae48dc24c40babf5
 MISC metadata.xml 403 BLAKE2B d0254150920ea63313734ad154391cf5d61176b56f53f26c2c8d8408ee571ce0fb4fb1383a6c63ec9f2542fdd66c35feee6b4d926f5cee3cf50253458305c346 SHA512 37cf237a2d7fdf5fe238e42a91d14d29fc01c807546a313b605cead57b50eff9a3fb2b66ed65c5aa019a727778356be659a0466cba5bc7f1b3a1bff8be8da42e
diff --git a/app-misc/check-jsonschema/check-jsonschema-0.28.4-r1.ebuild b/app-misc/check-jsonschema/check-jsonschema-0.28.4-r1.ebuild
index 7bd7ebde5d74..d72cf7a4b03a 100644
--- a/app-misc/check-jsonschema/check-jsonschema-0.28.4-r1.ebuild
+++ b/app-misc/check-jsonschema/check-jsonschema-0.28.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-jsonschema/${PN}/archive/refs/tags/${PV}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	>=dev-python/ruamel-yaml-0.18.6[${PYTHON_USEDEP}]
diff --git a/app-misc/color/Manifest b/app-misc/color/Manifest
index 4efdfa3a75b4..8af3bb56baaa 100644
--- a/app-misc/color/Manifest
+++ b/app-misc/color/Manifest
@@ -1,3 +1,3 @@
 DIST color-1.2.tar.gz 10040 BLAKE2B 1359f77e88c1c20d3643d6b00cad43fe5fbdb26d406d338132a5541668482c1a14e452ff502c10164f2d32d5c79b390328ffdad85012093d69fd767255f08fda SHA512 58f7d379bca3352b2e39eab83d2fa5891df86c45722541eb810becce813c8e866f28b856ed244a75b173f0dab5dbdc84ceb91d96175dcd2484e29abb98ba87ac
-EBUILD color-1.2-r3.ebuild 872 BLAKE2B bf82e92ecf00972c1393469c2f4a89dd95c9112d0b1361b3dd3c225184ed575e7e997069474871e23134bea987998b40d80ddd64b20082145056444fba570b72 SHA512 356c9375f6028e06e27ad4a01959bed641b678b70d7e5fbf5cd9aa7f2996da476a75731ddf8f2ec7746e84c61de03848c6e7dbcf0f489aa9eb39781752298954
+EBUILD color-1.2-r3.ebuild 866 BLAKE2B f8a51ff4544f2186646ce83fd25847315828c3f3c147d2d543945b0a706863b8f7ce6e3cf5e0fc34da4610cdf5f2e37d71f129dafbe6751d2d1ea74376e584a9 SHA512 c9ca4917f2f90cf7199613e2d1c3c5b1afbe46711864a1e4b3c6191aac74de6b22aeafbdea73e6f8f04def09d5e9fe938429bcc24edebc9e610420ae15a90e1b
 MISC metadata.xml 589 BLAKE2B 2ccdcd2bb0dab4b14f2ad33fec03de7d106119f94a4ba1945e65698221b737be89d2a630f992b48b9bd7334616cf58ff228d16268ded40cf02b399287469942a SHA512 7edef86cd5ccce86c28ee0badcf136bdbf6c8ce9a9765b1a74b11e148fa57a46214e94bdf996409617f2fc657c016486da109c65f97f3aa9ef3e945fbb1485c5
diff --git a/app-misc/color/color-1.2-r3.ebuild b/app-misc/color/color-1.2-r3.ebuild
index 0aa2258eb1c3..476f1e500c4a 100644
--- a/app-misc/color/color-1.2-r3.ebuild
+++ b/app-misc/color/color-1.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 
 src_prepare() {
 	default
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 80fa0e509c5d..3b8484261317 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,5 +1,5 @@
 DIST colordiff-1.0.19.tar.gz 21329 BLAKE2B 3137159aa9bb83d0813c18ef62936cdd7cfaaf9655b077fc7efd0c70b7f88157720f71166d9449dc9840762f09267c9baa81065a3bd7df15d322cba61c48a585 SHA512 2845c4b8229df317984ea93aa9d2e08b3bb39ba67b870a14f09dc19fa1e94b4fc8e4da9a7554d53934591766b3aa1696fdc62765ce95e55f50da219e44dae523
 DIST colordiff-1.0.21.tar.gz 25677 BLAKE2B 4da02bc3642e2133e5f730703928b0b77dce70125d5dc87c0a3dcbccd37294f4a3e2680e3f5515f8c6bd10fd885f94c087ad504f4c0421cb856f0af5bc34db84 SHA512 e814e38db0db6e0ba420c64bc53815c1c9e74457390bbe45f31eb9539c068efc9354c11dbf1259b1a64bd3cd5b2cc452441f822e030af80d18fe5b5c5f627c9d
-EBUILD colordiff-1.0.19.ebuild 896 BLAKE2B 6e4aded262bf5d0bda9c070b52391ced221bb3393259d08fa529f0ce0c6d19ff7e605cb67bbdbd4807a5c0d0cd5e390970578af2bb3b9d2a40dc44ab55111087 SHA512 dd8a5ba5a96e90db9b7a6c2d43a17499bb99549924340da042a509f08b785d5d543f23a8c5d7a046853eaf7f16375fb4bc0b7262a33b3c9512eca257819a5046
-EBUILD colordiff-1.0.21.ebuild 897 BLAKE2B 4f60c207c6d25b8cfdb0f17f338a800ae4c954de48c694289551081b8068d87b0a18c59cb40c6c1e25398ab3fe12d8c7bc58f9a7ade25343801de3a60aa8cb5f SHA512 c9dcbb8fdd081053ce5d8502ec169342c92ef650e24f3165e0e9b40abf5c1fde7f1247ede606c261261b4963f213140e43efc0a1d691a405b7529a388adc71db
+EBUILD colordiff-1.0.19.ebuild 890 BLAKE2B fadaaebf7899e05973b436c474e7042df5ab301810ca7b3fa4397884825a2a861809527c0e2936b79e116643905d846aee6197bdf7b444a226e57d81ef326179 SHA512 93c60a138b64061460f4eeed75aafda1e41469b1bdace8557a4f3546215b73baa25bfe5e4489a711e2399406e8d35e0fb25f1904f3eb88b91ec2b240550be92d
+EBUILD colordiff-1.0.21.ebuild 891 BLAKE2B b15f15c129ab39db6025f3ef2f0c4d79974bcfe06472fc9b8e4520559085e3b9772cbfe3e51ad7c84997fef609b3dc20ba8ca090392b229f87ded02babb4810a SHA512 4496d7c1f7ff45a4d679b11c48b84c19ba263defe55c9d045ba8636506f0d74a431e0f6e0bd0b087559c9aee5189c267d6ba713c0e97470d7d6a7addb46ce57d
 MISC metadata.xml 350 BLAKE2B bebc16c41e666f056631f6533b4e012773b9b8902603fb5d889def4602a8838e34103894b5443f23b04b8d736f2db71dd0533dd8c7658c2273b656683df1a438 SHA512 b1c0305ceade7d04419b175b0155a5b9cf87f5ba28e58be249158159ab2f832da7e1dc3f86c88ea5f774d95d06edc19e2272e9cca9d96c4a94455c8744a21a0b
diff --git a/app-misc/colordiff/colordiff-1.0.19.ebuild b/app-misc/colordiff/colordiff-1.0.19.ebuild
index c6752b9a5f0c..85aa632ffdec 100644
--- a/app-misc/colordiff/colordiff-1.0.19.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/colordiff/colordiff-1.0.21.ebuild b/app-misc/colordiff/colordiff-1.0.21.ebuild
index 5329a79225c7..7f5c41baccae 100644
--- a/app-misc/colordiff/colordiff-1.0.21.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index 329500c35763..72b8d16b9c08 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.6-Makefile.patch 728 BLAKE2B e94780600af8855903af12f0ac2b3645d8080bb38753cdc107a04d4ead1c8b2ef26c4c68d230ba4eef3431af8a97852e1871068c90513fb2eb70ec9a34408646 SHA512 0bc5828d6c4b587e508fa01355bef6b3a95918118adfedd4c1502845706534336e20ecacda637c4f42193ccce2b4d20b51d93062002cef4d897e4d65d95defc9
 DIST countrycodes-1.0.6.tar.gz 18834 BLAKE2B b5e0806618da0dd740a890b9c4d369cf2c44182515ec91aaa08a5e19da447635fb8536611a278ffcc419b506efa07df7e71bf5d520895a059c4aaa6e0cbc9b48 SHA512 be069593f60f785ef4d2e107340b941902a9c45d81ed04f8518a78f2be610ffdd1675da3da1d07271fc7ab736aabdd9f92f060d132e7b7b41310f1b653c53244
-EBUILD countrycodes-1.0.6.ebuild 661 BLAKE2B e0d611d4398cc48059a077c99e0e2d0f10e130967e8d2435398e836f051c26adc6bc279b3c47d473cb69c4b450ae09ab1835c1adfbbaa8719de95646ec3cabeb SHA512 174ad5960a41ff37adf3be181d17c62fb7ba6aa54f9afd1c77db8e310c294779f1aa725aa08fd9f1c7bb6408ac4741b830087f1b93833d8435d0f35b45ca0835
+EBUILD countrycodes-1.0.6.ebuild 655 BLAKE2B 7c4ffa8e8a0ab759511d86ddc7d0fad227f9e7e5c5cf9b9649008e3e9cbe1af24b2c5f30fb7e190d9ce36ea421f03aff148a67c66276219250d56b4e0a2bae52 SHA512 0d33e7aba0afe6462e59e2369972c472d1e30d1d9cedfeb761ff9d2013dadff3d86743ed80be40c94cbeceb57b1e27094ea0914749a002db4be0cd8397e5ba70
 MISC metadata.xml 348 BLAKE2B 2cce9ed106752c09f0be959a0203ea56a6f8a46bbcfc6eea26198ea7d249f1643eddd4bcf4e6eb8d2008fc0fcb6fc7f0e792942f3f0d6ad84fff42cf87c808d9 SHA512 14f1460dfda768aef2ea4677f70f8641a0e957a394face81e35e42161d0e665fbf71124ec5d80db5ad7220fa8d0e458725eecc1c943acb8099457c712a56c04d
diff --git a/app-misc/countrycodes/countrycodes-1.0.6.ebuild b/app-misc/countrycodes/countrycodes-1.0.6.ebuild
index e0696c3467c7..a65cc34991e6 100644
--- a/app-misc/countrycodes/countrycodes-1.0.6.ebuild
+++ b/app-misc/countrycodes/countrycodes-1.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~sparc x86"
 
 PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch )
 
diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
index 4052d0c7b304..1bd8868bc15d 100644
--- a/app-misc/cw/Manifest
+++ b/app-misc/cw/Manifest
@@ -6,6 +6,5 @@ AUX cw-1.0.16-Respect-CPPFLAGS.patch 649 BLAKE2B c08bef1d8f6adf4b1a84b58c697bb18
 AUX cw-1.0.16-fix-configure-for-newer-autotools.patch 491 BLAKE2B 109ea5f7777205c87f6f52abb75fa0870d46a66b4ef869ac6cbc12eef1852afb3136cff4f8a8e9eef348e525fca4571aef85b398c6d1ed94c802798e48e4e092 SHA512 704dd7899d6316d2ae1ad478235370943f1bb42cc75a594e2eba36758afa2b81e0f3fff78445e03140de8ff7b41ba1f8a7fa81fbe9ea67df510838b7dc778125
 AUX cw-1.0.16-replace-isastream-with-fcntl.patch 470 BLAKE2B 454da68da8a32bf980837c28fb5fa392325bd7c7ee186386c5347fb21949a05b7cad8c6da02b74a4bc0dd7dd997360c60095a3e62e22e1f21abc3f014e477570 SHA512 84e3fdc906880691a0b87715e76729a3c00da0edef838c169113e7c9122c8d5dc421007f1b47214a12cd4f08bf01ab1dd42d635b1bf3a35c5cb215eaf15ea589
 DIST cw-1.0.16.tar.bz2 76035 BLAKE2B 4257dad6df2122efabd9d5f51e7d0f0f5103afa261b4d7781ec27a81d9efc903c55a56e7b9bb1d16bb3c6bc856f15ec6f8d7ae69935511659bbfe82475377e38 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32
-EBUILD cw-1.0.16-r3.ebuild 1549 BLAKE2B 88febd5da03e6501f87281de4e39af63ec1b1ef2c2cc79dcc7533210350acef5083b51271bc963f8a4a0994b6eb7923c0acc88e0fc21163f4deefd93f4a25565 SHA512 fbc05f1d9fe39f10a8cf46494631cc6f0f8730c763ef32b07cf040f7c5e5cf77ce8928c46a2b5b03d812b9f10f4d54464fbfc48c786143eadbeb10c25a86f036
 EBUILD cw-1.0.16-r5.ebuild 1875 BLAKE2B 1c7fc61fa80b062a33f8d05d8c2a37c3dd9f4813ba9f763c53edacdf808865ffeb65db203a24c950b9fba86a3610b6bbb6093ddd9efb957566e25df22576db50 SHA512 1cf62c8a7edead28b169a54ae9a1573aefe7ed82a34f0c7be0651d2f71dbeb20db5818ed4ea5ee7946ba4b8556e980befc0634961d77cef84fb408d0edfc3919
 MISC metadata.xml 344 BLAKE2B 7f3db60367ffaacb5217d36eee3a431fac236d8675ceb212641e7c391cd1e766302adef0912dd32c42b39df01b5747821af4dc36c11f3a79e0b4c7c57fa98bd8 SHA512 4b14684bfd5872f9de5812015c341c763da06a2e75981f67355464f68ea5f11dfa944233b1a77be73854dce0f697edcc76402ec1cd073d53d23db0ef2d6b565f
diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild
deleted file mode 100644
index edce7bf53157..000000000000
--- a/app-misc/cw/cw-1.0.16-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
-HOMEPAGE="http://cwrapper.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/cwrapper/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-ldflags.patch
-	"${FILESDIR}"/${PV}-path.patch
-	"${FILESDIR}"/${PV}-collision.patch
-	"${FILESDIR}"/${PV}-format-security.patch
-)
-
-src_configure() {
-	tc-export CC
-	econf
-}
-
-src_compile() {
-	emake local
-}
-
-src_install() {
-	insinto /usr/share/cw
-	doins etc/*
-
-	exeinto /usr/libexec/cw
-	doexe def/*
-
-	doman man/cwu*
-	newman man/cw.* color-wrapper
-	dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README*
-
-	dobin bin/{cwu,colorcfg}
-	# app-misc/color currently conflicts; hopefully 'colors' is safe
-	newbin bin/color colors
-	# media-radio/unixcw currently conflicts;
-	newbin bin/cw color-wrapper
-}
-
-pkg_postinst() {
-	ebegin "Updating definition files"
-	cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null
-	eend $?
-
-	elog "To enable color-wrapper, as your user, run:"
-	elog "  colorcfg [1|2|3]"
-	elog "to add relevant environment variables to your ~/.bash_profile"
-	elog "Run colorcfg without options to see what [1|2|3] means."
-	elog
-	elog "After sourcing your ~/.bash_profile, commands for which definitions"
-	elog "are provided should have colored output."
-	elog
-	elog "To enable/disable colored output, run: 'colors [on|off]'."
-}
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index eed1c265ba76..d8c1dbb4c131 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,5 +1,5 @@
 DIST datefudge_1.24.tar.xz 14152 BLAKE2B c0a386193e6761abade4643e2f56520738baf4bb739d4c94cec3e47a8feb5ebdf32a6e8b4a0c3dbb9584136b9855abcc68f5134e082083dfb61e977ae45c0bc7 SHA512 cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb
 DIST datefudge_1.26.tar.xz 14872 BLAKE2B fb8edc9ccf86af1357b49b2fd0b19c5b6a75a49c317baeb2915c56f9c1fa561d69cd37c8f3702cbe543f2747eab5bd1a1908788e3a8f29feb30bb42ec9a55636 SHA512 04255dcf3b8c552d14434fa9022c5970063a5d42d2b9526398894c3d926d91b380ef729565c72391b03981cabacdc9eb7eac29dc8cd6b462a9483b01e8a64d71
-EBUILD datefudge-1.24.ebuild 780 BLAKE2B cc1daf2a552f2ee2c5678152153e24d43f53328308af0c71246b30bbdceb81a06274acc58fe824a61e51a6b369b693094bbd75a7066c0597f69b826ebca7678b SHA512 9802fae325a85b9722666f2b43a56d4daf23d465e65326195d9af9bdb1a4523d3bd68a98909697883b0c48b91f2d8af7ee30814a59d6735ac8f780abcfe243f3
-EBUILD datefudge-1.26.ebuild 787 BLAKE2B 3faf122535438d82eeb911ac214b4b190a677c2c858e0d1aa5a720032cf24801daa0d436dfbb9f4093b5e42372a01852980a3b6d9409c2bf174da099e44b7b4f SHA512 c05fdb8666b27c4ed5f4a9e03e011d496da60f15a229e4399adcd49faf3218b1184daf2659b30ea7d6aaf13ae39d9b0adad2f6c9b88b815daaeefcbe93fec4f7
+EBUILD datefudge-1.24.ebuild 774 BLAKE2B e876fc300da8f24360954b81cef42e64f45042943b25afb5ddeaa73822675889616dacc6422b8828d9d284a850b7cbcc8a06b0ab0905c83f65371c69189bc963 SHA512 8f51cdc5af18a0ba2d389293152da2b86b248471af29fede9cb388978d5ed86f241ed63c4d803594e5e7e9212919e90b97e330c9c801918c7623378a58a2fc97
+EBUILD datefudge-1.26.ebuild 774 BLAKE2B 7981c73ea1dd7f08604ee2dbd5643629d38b83406d7495e09ec9497c6822355752d6059928ef8230b77b2a75a397b884d4a38b7b7ef5b47c5e7b8f8e92dde1af SHA512 6b7383a2a1ae6808894c31ba933429e3beadf18a1be4bcaf876ac5e5b95511e1dcf032d9a56a6e969563fce186861cf8911b195c4d05af773fdc9bc556e97c18
 MISC metadata.xml 398 BLAKE2B 037f58ef9b9d372a1137066db288badda6f884013296b4ea879816f539a91b5f484148ecd3c874561d24a9a3b4e336f6a73b332b30fc666f19f213b6bb37245d SHA512 c4d6086c77a47321b33e8ecfc827b51dad5f79558f1cb8845d495326d1f002e7fc5289165735fb26d1a1020e55d85f22358d313be11f5ddfb05b6580db027833
diff --git a/app-misc/datefudge/datefudge-1.24.ebuild b/app-misc/datefudge/datefudge-1.24.ebuild
index 1209277f28ae..44795554299e 100644
--- a/app-misc/datefudge/datefudge-1.24.ebuild
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/app-misc/datefudge/datefudge-1.26.ebuild b/app-misc/datefudge/datefudge-1.26.ebuild
index 1cfd453e0b94..580d25124c49 100644
--- a/app-misc/datefudge/datefudge-1.26.ebuild
+++ b/app-misc/datefudge/datefudge-1.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index b8b22564d6d1..11df35ca3179 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -13,5 +13,5 @@ EBUILD ddcutil-1.3.0.ebuild 2933 BLAKE2B 3a32592eb97a2df63a18c82e473d4ba13ab5563
 EBUILD ddcutil-1.4.1.ebuild 2938 BLAKE2B 0b104b941b0fde07f1539dab57b3201917f11c2c564c7e911bfa5e14d73a8a291d4b7822beb4e79e0bade89aff1da4d534bb5b2c722831c29f942fd7cb093577 SHA512 c10403a5a83747c9058a1851dd1abe22abb8015ab04e761d87f92e7ea537051c9b6928afe2c771fc529a685b5047e2551e1697afe650177f4854a1ad4c5435d3
 EBUILD ddcutil-1.4.5.ebuild 2945 BLAKE2B 014ff0e0a740916303ce6af069f2066ff7fbea4c5d714cc13e45b288ef784484a9e7f2a94da04bef5c2f5e9bb57595b935a62d3dbb7e4c9db7535169b5ed7419 SHA512 b60685531a199a33891a8073197b813d4d56bb9e8a9888ed19e00b4b3635525ba4305899c7d50c87061a567808dcc96d6920e5480050f46e491bc92bf0476492
 EBUILD ddcutil-2.0.0-r2.ebuild 3049 BLAKE2B 6c23467ee06a7dcfb89e4d9ee0a1a7ae1fffe2fcdf86e972fdf5005708234b320ef03e50a6ecb160df85b7a42026fe9cb2e3afe144949022c798956f1b01213e SHA512 354af8e35c242a39c6497b89a36c897a6e826bd7d330ac6f062509467f402899b7c56fdaa0fee90ccd83019c11b5d9336b4a0bdaaa01007d63df7d5d63743549
-EBUILD ddcutil-2.1.4.ebuild 2987 BLAKE2B 67998df866901783f55b7869d00ed759c2ca52a69abac2bf5376b96a8c7155e80498663a5dc8449b304f8df43e76e6594737e126e3fa25cf7cb73988358151dd SHA512 a1f007b3f9da46f03cd7a9d5ae10059021181f314ec310e156b4bfc3805dc400c6cc6b60a979c573b82335453da8ae0a0cf102ae0db21fdcc7d76fb32d7136de
+EBUILD ddcutil-2.1.4.ebuild 2982 BLAKE2B 9e15a22f121e245df6df476343659e285db428c8d1bf21356cdf41516f785feefacb89ec11de0af25a1746ad0f9261a2d7cf517ab428b99e42f7679e8d655502 SHA512 f0031252183128fb3951c0a88b1f89f4a6b575a720fec69aea68a1ef95f803e835fd13f8f70a3520f544581dcdc72eaa7d6029264fefdb7b1dddc95b724e5664
 MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
diff --git a/app-misc/ddcutil/ddcutil-2.1.4.ebuild b/app-misc/ddcutil/ddcutil-2.1.4.ebuild
index 9d9b7dc167a3..80f986094745 100644
--- a/app-misc/ddcutil/ddcutil-2.1.4.ebuild
+++ b/app-misc/ddcutil/ddcutil-2.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.
 
 SLOT="0/5"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
 REQUIRED_USE="drm? ( X )"
 
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
index 2061ed54a236..5269eaa23f2b 100644
--- a/app-misc/delay/Manifest
+++ b/app-misc/delay/Manifest
@@ -2,6 +2,5 @@ AUX delay-1.6-clang16.patch 176 BLAKE2B 2bb8a3f3a0b56f467689e5494dbb0b27aa8da512
 AUX delay-1.6-headers.patch 156 BLAKE2B fa056fbf65029060d1d5291d78be65b8821d5fe4ef5f2e2b09abddd4dc0e28f35de97e8d7a01651c8c7eacc810cb093730b9a1ac81d0e784c26ebf0828ff6527 SHA512 5482c96f6c2f9ce5f0183751d36360a22b3bfc7e29c23ba13022e51f0f2569b77014be4544c95e7b76cb3947118b36ae5dd94afb26c1951bc7f4b0746d120ac1
 AUX delay-1.6-tinfo.patch 352 BLAKE2B 9ca59090f3d6483201a8133b204fc5948f7584285050787737a2cb23444ceff6d223fa1eb7c6a6d5712b95dc457c080efe930f041d1d03e55e3a393c27cfc484 SHA512 462e098e1a03ad1743fc758ca7ffabaeea07c430c24e5db6daffb786494176f91b1e6d99a34e867237ecd97fa4be8def415a14db6c53c9ea7b6ab4af3cf600a2
 DIST delay-1.6.tar.gz 69860 BLAKE2B f1823ff114279987c6ff2e7bb15634b27f0875fede7f879dfd69f6efee7f08f76f06673ad66853ea2e1e257174dde267455f92aadf2395dd5dd5aa731590aa51 SHA512 45d34b768082ff2e4a73f1af63239f6b9e418f1cb46e5945606c0e8830ba2b8c14eeb21d7e0776ef669d2834ed6dcc66c3ddb0225c182c77e85b18b5b28d5d43
-EBUILD delay-1.6-r5.ebuild 669 BLAKE2B 8fd41f8597bde03a61c27ecec051f366dca4584541975cd7107aba04fe1da44dd97b1fb942c8a6c94fda39ab803ffd4f10a37295cf14262750ad24b9dd7118e7 SHA512 f13a3305f49d41cd3258938c71be36a469288fe1020065526a8647279434224de389301f2cc8907ca90a720a7cc45ce7302b7023aafa968bb06469810170b4a6
 EBUILD delay-1.6-r6.ebuild 1287 BLAKE2B f445131eedcabd7290672a977bf7bac56a9467e0937107443cb4dc90fc37beef2768f165ffae25531c68e693543619ff52f0ca3388c207b34ff70cad137ada5e SHA512 0e9c6dc7aaa4ea134d030da654546e5e82d907ce6c7a6fcc528c85644b1882d0c5119ce46fc8610b580e2b65b006e98eea95e2ebf8af0182c75cdbd1f6c28d00
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/delay/delay-1.6-r5.ebuild b/app-misc/delay/delay-1.6-r5.ebuild
deleted file mode 100644
index 403d03af2144..000000000000
--- a/app-misc/delay/delay-1.6-r5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Sleeplike program that counts down the number of seconds specified"
-HOMEPAGE="https://onegeek.org/~tom/software/delay/"
-SRC_URI="https://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-headers.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest
index 0866da2f80c2..a77257cf41ae 100644
--- a/app-misc/detachtty/Manifest
+++ b/app-misc/detachtty/Manifest
@@ -2,5 +2,4 @@ AUX detachtty-11.0.0-clang16-build-fix.patch 810 BLAKE2B 9583e3c87803b78ffba6d86
 AUX detachtty-11.0.0-sparc.patch 2669 BLAKE2B c1912520e5e7388bd905059a0d3f0d28726533884c4eafa89b1f6800feb2e05740dd96ee0b501f76d4f2329cf0e49b7b349d6990e12c359be13615f84e77670b SHA512 b62b7f809d79ba8f391f4f3b0c84eb969884b9de1f8ef27a50e1af84f6fe6f699c17321a6f4b225ae8c64d463c090a1bb5d105bf450a01aec4ccf8bb189449f5
 DIST detachtty-11.0.0.tar.gz 23189 BLAKE2B 734489fe35acb5bfb381b8fee1b91d60f15ec795f2ba58f5855544d913957f7da4174c15583dc4090e397c5f562e78a23c1534a741a9812980f4a9cd2d2e291e SHA512 608d68ebe9b8fae55b4295b9c50d8e9065226dbb78818535af79bd2e70cc4a831820b6c673414289548b1063843b5dc80c8b7d2371dd716a16eceb20cd064a10
 EBUILD detachtty-11.0.0-r1.ebuild 677 BLAKE2B dc4dcd52cb3634fed6a9489bd60de61ecbe49c0625307a77b1cb4881dbf34c5b85bb7f5bd59f2f140f95eaf0617903d1b1c5c0f255f806535060eaeefe0a448e SHA512 adb1b025831635b05b214d464ac64099e458d497cc5b41590a84498d91f6ec833d3ed9482d3d8ae24122df7164e02b9a675cc5d9e479be19c780a877a3e394fd
-EBUILD detachtty-11.0.0.ebuild 632 BLAKE2B 0a118db31a6f4dc05bb848f53d1949728deaa4956458bd9ca0848f16e49516605bc0a7e2ed494d090a16c3b6f6d6a6096ff0533059cb69df6fb4b9d83108a1c8 SHA512 6cdbf7fcfb37ec030344cf6ac68b544bbe8f68bad4fefde6f565c85a7ccc9cea6c825a09c0cd96bf7c6539c4019c665548d4a9971a81e2a00ea504417ca55b2f
 MISC metadata.xml 805 BLAKE2B 7414ac0367f4111cd0e453909bcc8ea89b921f0ef5c4bed76bf8751f2965eff639c1d0122605fe9e1383d16df8002f5235f0196cec6b8fe879c36e65c25a2a23 SHA512 311aec96e3feda42a65a924c56107f6e0b303e8bd1f702ca73557dbaeb6499cdc5bc062c5794a89c618312e558e66e4b0e9ff42d0667ccdd13389d92a353906f
diff --git a/app-misc/detachtty/detachtty-11.0.0.ebuild b/app-misc/detachtty/detachtty-11.0.0.ebuild
deleted file mode 100644
index 66c9920eb6a9..000000000000
--- a/app-misc/detachtty/detachtty-11.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Attach/detach from interactive processes across the network"
-HOMEPAGE="https://github.com/cosmos72/detachtty"
-SRC_URI="https://github.com/cosmos72/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-PATCHES=( "${FILESDIR}/${P}-sparc.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin attachtty detachtty
-	doman "${PN}.1"
-	dosym detachtty.1 /usr/share/man/man1/attachtty.1
-	einstalldocs
-}
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index fd3ef18f1862..116db333ec16 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -3,6 +3,6 @@ AUX devtodo-0.1.20-gcc43.patch 186 BLAKE2B 6207710d08010b608542810aeaa116cdc6268
 AUX devtodo-0.1.20-gentoo.patch 3167 BLAKE2B 505d6b85188f2bedc08d2192455a64f49a7e8e4b7aec1f59b77fdb70f485e62fd4e4643185fb0d504b6981b6073514048cf051bfc21848435150ed1ef70008a8 SHA512 ae1832330b8368ce39e02afb26bc177ba48b9f877761f01293c0fbe2ce18c88403bc0622610ce18c0a10ee5192d0edab95181e9f9c6fac85843cf2ff0db7fdf2
 AUX devtodo.bash-completion 1424 BLAKE2B 10166a35074d1f501d76a0f60e383c6f6198242b4c22ae2b17468f887e2d6caa2466bbfae290d76cf8199156703591633aaa755298c7ebcd1274faa09656a369 SHA512 6139218a2bc4d06f2af23fc04247e8fa3d70eaf3affe326dbb8b1bbbb880f2534f1c1bf4c54079231bed7c1c64465705deb5a5cb1a0f4ca5415ccddae726b20b
 DIST devtodo-0.1.20.tar.gz 390935 BLAKE2B 1605fb6ae6f416ea9b7c072463aacedf7fe997a362b3188addce9c6fbdd9bf99f2f7d4524870fb09f0a0c29e9886011a8fae737388a3151ecc489f3fe4fec980 SHA512 58cff0455c735af4530fc9321d1eade8272dd5759eeb8a688a641c9be11830b87be116801e3cd1d90a27e070775fa00d7b4d6b3399eba7aad5c752bfda9c28fb
-EBUILD devtodo-0.1.20-r3.ebuild 1614 BLAKE2B 5097efa46020c1609c8e14f76b574b1aab54f1359cc82b3cb9d3b36dfcef46ac313cbae0d0af7707b207c047bca53759911c89362c87d4a07ca0285ab660a839 SHA512 6c164a27e4cefd1df85c5704f71f8d61d81b4336cba06deb9c8789a01c634eb71bbd18a57bb596163c4a02067f2b05ff6739f8e29aa7ac558f0d64c6e2a5a6cc
-EBUILD devtodo-0.1.20-r4.ebuild 1638 BLAKE2B a0725f61b0d6bc36c3b0e1a481db69a0acbe7f8faf9bc7bcbef68fb560098981a2e5efc8700a9c234c798ceeb696f8a10c1da17d064d4ff044fb55ca8f65d9fc SHA512 983ef71861952e5913ef31215f64691531dacede67536baffc86dbf1ea9172e2c671cb1ff7a06ad244673cd452e22b62f02ca01f610bd4eb357e069a94b27b56
+EBUILD devtodo-0.1.20-r3.ebuild 1608 BLAKE2B a8f0fae2e20da3cf23cb772b2c23469d0059fd6baade912887419dd292feae77d89f99f8d658978ace147ef6efe48dab339ff03ea92d9e66766075fa4391ad81 SHA512 06f98015a727b3992c550399a3831b7032b41b59f5e8b8f124e4cbcf1086df44995ee68509a91099d77a162dcfe9db3e5561021512c2a22055b5c641a4581437
+EBUILD devtodo-0.1.20-r4.ebuild 1632 BLAKE2B 4039ecb4413e9152b5e1e56c14941e38f2d1fe40084eb7e92cf5cf4167f21eb7936713fe0abf412190afbdedd39a718a4d404a504654f78cad7956350b2fe19d SHA512 3470ed9b5f2cb505943152ad68ad2ba69dcbca5f6b7dcc870008e63c5e583979b90337eb792077af77a77269f7e648db14343453d2c8f0e3053b95fec2ffd616
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
index 4ea3f59f4e20..54a3fb17922c 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
diff --git a/app-misc/devtodo/devtodo-0.1.20-r4.ebuild b/app-misc/devtodo/devtodo-0.1.20-r4.ebuild
index 9a089f102981..572502970257 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r4.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 107915def4b3..6081ccdb71d5 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -1,3 +1,3 @@
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
-EBUILD dtach-0.9-r1.ebuild 479 BLAKE2B 8c9a4767e700d8e865670ea78a2dc64842ff0dc549ed2da4cffc264b8bb79f3aef0051f3d2161db0a2b67bb214297e1dc4b4f2bb6cc9e716db4d7da27883d184 SHA512 6d2ea959f44cdf958839fedb49476e26729efe8feafd5977abb4fca702a8f33bb8c43b6024e2248a9309e64e7b3ccc4828c89deaac4f6fd86dd5263c9be5a522
+EBUILD dtach-0.9-r1.ebuild 473 BLAKE2B 753712fb0a1edd9850aaafe05b4ae5aa349dc9535ae77c0e5c8cfd8e072999a8121c13795fcee37de2aae329ba8bd3fdebde0b953fdd59efe1a84aa33a04d645 SHA512 503826af767015197668c9964625bf988b46b1bbb326c80fd6be23a3f395926bf10dfbc79672a304e7e98749fd9d8144fd68b7faa33b6af962d71537f25d1426
 MISC metadata.xml 505 BLAKE2B 7c81074760ad953761855b5cc54ec12838ff2e0b16aae8c0dafa05a13588342b4e8172f87f5b7d7ed5eba27440f383aff08654d042e495968575670f75b3acfb SHA512 c42a25208e2554ee1b9664eee9a4f7387e801e8d6210485ca50e6b2b53a2afc88d19a25feee248908c500a49478834f898468cac38fba08c6c475a1633bbedc4
diff --git a/app-misc/dtach/dtach-0.9-r1.ebuild b/app-misc/dtach/dtach-0.9-r1.ebuild
index 6aac26b02e7e..748df1cc1c29 100644
--- a/app-misc/dtach/dtach-0.9-r1.ebuild
+++ b/app-misc/dtach/dtach-0.9-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 src_install() {
 	dobin dtach
diff --git a/app-misc/ebusd/Manifest b/app-misc/ebusd/Manifest
index 13c69387698a..aaae2b368822 100644
--- a/app-misc/ebusd/Manifest
+++ b/app-misc/ebusd/Manifest
@@ -7,5 +7,7 @@ AUX ebusd.confd 193 BLAKE2B a5560507305e5afecc9b127ede67592ff7d3a1751ba27f3a3c43
 AUX ebusd.initd-r1 552 BLAKE2B 8f40a1d684ddd054153a6b0562d06896253a407eb9497c6080f0e51c6fc5e01a3fe1529cf5568085107191893ad539a2dc21da7a71bbe6fd2e319b62da6af656 SHA512 4b29fca333c5f3bcc676c6a0e9b9a7c0c309b81bbed55b4d863a86b11ef59e051679919393efb8c396b3f2124e772aae9005f7f12642037301e1907f118eee1a
 AUX ebusd.service-r1 175 BLAKE2B b6b1ba670dc27a525fbbb4ce8d74c10cfd9e093da2602ca41afbc54f8a89ff8ff8c2c0cf6671edc2a0fed9a3b2cccebfee74209b415f75792bd02c29d0815315 SHA512 9ccbadf5b15c4b85921db7780e0b99e352c1020d5bc457f6290d7c6d6fb1371bd92ffbbbdef3c32fad89b751a4d4baae5f8582dd3405f4deb74fc716b6a3351a
 DIST ebusd-23.3.tar.gz 583788 BLAKE2B c61bf76e0c451672432689aeaf10b317adb52729ea0872cb01dca22e1f7ac12091d287dd082b87361ce37846b1d74c869588964f3dc71e82ffd00c4555e27150 SHA512 acf155d36e99db1c9c2ff04eabbfddba8493f2566b6691f609c86af0e42e3cb0594618fd51e874e475cfc7b9c742d1e010099f38e19c21f52c953ebcfb0f2ea2
+DIST ebusd-24.1.tar.gz 595318 BLAKE2B 40bbedf1af983c8bbb123b8774b013d02e8f49d653e729d5b6bf78cda50d70ff5b09bfe5993714cf311d5b90777bf6e6616557cef881120b0cad56fc7a5ac0e9 SHA512 a4ab5e21f345894c29b7af84f46f93ac4a3ee658d69ca7fb002d52233e8c041043df328212cbeae4f01220e7a6bf4ec8a26ad3757eb0cf6da157d237f5b6b0b6
 EBUILD ebusd-23.3-r2.ebuild 1914 BLAKE2B 882eb1aa123b5f2f2456b772ef8fb3721f93c229d2cb35bb778ad1b02276c13d6570bbc5523a5433bd5371a78e329e130304a833c4757371f9a3efcfa18b06d2 SHA512 43787903a02ef021442f53957b4b9febbdca91797429287e312d0c69a7e19253bacf159e2c59469303a8a820472da32cda185c5aff113c7678a64b033d0191dd
+EBUILD ebusd-24.1.ebuild 1808 BLAKE2B c11c32db6c521eefd253babed801916648bbc1f97dfd971f3da6ab8d1a6db2648911c555ebe9102e3dcf1c2f5b29580f75a267089cc76bb1043c2206f9c8837a SHA512 4b64a36ecc0a954f8576e4f06e00d4217c09f62ea22316dce6752eef4e9acbab79bbf47f1da248f47dc16802893668b847914cfb01bfb4a38dcd901c73803128
 MISC metadata.xml 815 BLAKE2B d6c87cb6506a61d1b502ab233fcb9cb878e4e315d1cd2a09ecf36121de19a06d9aee77925b19d6fc24ed274ac220c22a011dec01704f61676583697647506417 SHA512 cdcbc39babc7f6dd6a5f3f1ca713a54b44e80cf0a57eb9bdb4f6989c7425fe30eee73dd8e893f7d82e681e32e03a4089e94630ebe77686c6a0bb056e6c92c7a4
diff --git a/app-misc/ebusd/ebusd-24.1.ebuild b/app-misc/ebusd/ebusd-24.1.ebuild
new file mode 100644
index 000000000000..4cbc1244471c
--- /dev/null
+++ b/app-misc/ebusd/ebusd-24.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Daemon for communication with eBUS heating systems"
+HOMEPAGE="
+	https://ebusd.de
+	https://github.com/john30/ebusd
+"
+SRC_URI="https://github.com/john30/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+contrib doc knx mqtt +ssl test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:0=
+	mqtt? ( app-misc/mosquitto )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.3-gentoo.patch"
+	"${FILESDIR}/${PN}-23.3-htmlpath.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# KNXd is currently not packaged in Gentoo
+	local myeconfargs=(
+		$(use_with contrib)
+		$(usex doc '--with-docs' '')
+		$(use_with knx)
+		$(use_with mqtt)
+		$(use_with ssl)
+
+		--localstatedir="${EPREFIX}/var"
+		--without-knxd
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use test; then
+		pushd src/lib/ebus/test || die
+			emake
+		popd || die
+
+		if use contrib; then
+			pushd src/lib/ebus/contrib/test || die
+				emake
+			popd || die
+		fi
+	fi
+}
+
+src_test() {
+	pushd src/lib/ebus/test || die
+		./test_filereader >/dev/null && \
+		./test_data >/dev/null && \
+		./test_message >/dev/null && \
+		./test_symbol >/dev/null && \
+		einfo "standard: OK!" || die
+	popd || die
+
+	if use contrib; then
+		pushd src/lib/ebus/contrib/test || die
+			./test_contrib >/dev/null && einfo "contrib: OK!" || die
+		popd || die
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r docs/html
+	newinitd "${FILESDIR}"/ebusd.initd-r1 ebusd
+	newconfd "${FILESDIR}"/ebusd.confd ebusd
+	systemd_newunit "${FILESDIR}"/ebusd.service-r1 ebusd.service
+}
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index c8b248217e60..a61f76819fd6 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
-EBUILD editor-wrapper-4-r1.ebuild 866 BLAKE2B 61b1a7c3cd13bfd9339d92a3e264632c6183ff1fdab2c9025c8cbc3acff22980542b008b3af5b0916b6f386f96894e92a1d8c3d4f534dae2d521e684dacfd602 SHA512 94755a869d52c6069d82f4a2c5fc9251a5ffa441ab06835268330f656b4e408c12dcddefa7ca6bde0c95e7b0b8f1a72a5f8a1545d25bbc4d87c87a22baf2bbdc
+EBUILD editor-wrapper-4-r1.ebuild 860 BLAKE2B 0a21bd2c45b524cbd66ec339714b65fdd2ddad21414c4c9292c30cfd75ba7e40f4c780ad6e3eed9ffe131f739c22f6196f3be19681ee2a8c84d29318bd71b8df SHA512 fd725d1f154a8aef32a49a3f8e2f05a9554d2a07d98ab234c58192893a8815a9a657865ea0e751477bfd39bf2569aa8a03419e1ef3f8d3f65b773ac8c53addea
 MISC metadata.xml 368 BLAKE2B 0735037743f0e78203e78394c9145ae9ed510ed3420d8798104a477071a97eaa4a4995dc7b72f05893b6d788e8d9f5092b506ad5708fe51029a7613024b09d49 SHA512 b7a083d59d58736c4b38fb57622cc423b1a63f9f08fcd7757c15e005d880696ac8776929bcfb0dad2d1895cda8faab8e3ee00ae211d422501c8f2d4125b56f81
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 816b190aae02..b0d166f20034 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 881c00dfd34e..82c74f57c721 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -9,7 +9,7 @@ AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed27
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-7.17.16-no-jdk-linux-x86_64.tar.gz 168795535 BLAKE2B 642ae6f07db953e7fa783dcd63c6dcebab61e85ea600bede09e9596bf9dee2d71c43e5c28b80bd4c091d792ed3a95d10cc75ffb1074ad4b3cfceb081ed25027f SHA512 3755373f5068a08e4619b4e922bc2d3d97d41791dbf5aa84564574fc84abee9c567b16095cf0e11d48910627e3c183ff1193bf2d5ade59891bea2b3f994aa7df
-DIST elasticsearch-8.14.3-linux-x86_64.tar.gz 588481989 BLAKE2B 6c85d0ff9a7920a085adcf594d649bddbac1289a30607500e26c410c22c36ff61c389576c77079bcaf0af4ef035bfbf60b1742e694d499c99f7a93b82129a850 SHA512 5c9df84b225e4a80d6f86d84e4f9afaa23fd51c0f62827d085957447057361db3c3adc485eaec18f6c98615739babf2e5c7c4cc2a7a6351c79f384150c293391
+DIST elasticsearch-8.15.1-linux-x86_64.tar.gz 605974468 BLAKE2B 8fc2476cd2629cf8bcd9c2183763aba1880f76357809f661da9c3df6538bdf7bc21e897356cb4e35084ef1333120539e494893177fffe0aaa1e7ea4cc3f52fcd SHA512 3eced0f59446f60170b7ab3372f58bbda713e2166bb936ef0f74a027e579565b469d3f8888715638e6dfc3e98f88e1b73f7de8a6fc37be236ade4a099f9cc808
 EBUILD elasticsearch-7.17.16.ebuild 2374 BLAKE2B b8e8a2cfc8eb77cfa591ed73795bd923f12addbb101e2df852ee10fbe2ef1b3e74280e76fd13e03117b5dcecfce91b22b897839d014a22044b1a456413e6e878 SHA512 4f5fc0ada22ffad450a778bbbf248721f2fb52b8b9eaaa1cf44da897e65ee110a7eb4ea3cde3b625c9921c96a85729f0bc9994231a0df023f0e29b1b9f48eb74
-EBUILD elasticsearch-8.14.3.ebuild 3505 BLAKE2B 5d08a9df6275aba8a2b21082a70b57ecbba1f231f3d9023fce4fb62beef1c03bb1387122e90c2b0d357eb41d50ea60de2ce317589a76def50f967c8f28f976b3 SHA512 bd1806e6b83d4f698327710fe5d17cc97dfc9e5bf4393cf565661a121a523c9bc2cea7147578e9dabd39f4fcc2a888b7071f7a74a0befaa4a1044c0f7e1e0702
+EBUILD elasticsearch-8.15.1.ebuild 3505 BLAKE2B 5d08a9df6275aba8a2b21082a70b57ecbba1f231f3d9023fce4fb62beef1c03bb1387122e90c2b0d357eb41d50ea60de2ce317589a76def50f967c8f28f976b3 SHA512 bd1806e6b83d4f698327710fe5d17cc97dfc9e5bf4393cf565661a121a523c9bc2cea7147578e9dabd39f4fcc2a888b7071f7a74a0befaa4a1044c0f7e1e0702
 MISC metadata.xml 502 BLAKE2B d82165cdd8bbb6628c6e32ab0ff46d78561593b900267c8b39313266a148da06e999a6e28f4268232684f0b9e36f7c42f56be5efb9fd6520baea383d19e82c99 SHA512 612d2c4f19965c79d2b8d9cd0c2feb66436e6d2090759dcbacd61bcdc18c058f0ede17a7b283483e5dc91510134ddc2ee8d345fab3cb474e9b6b7a715e739b07
diff --git a/app-misc/elasticsearch/elasticsearch-8.14.3.ebuild b/app-misc/elasticsearch/elasticsearch-8.15.1.ebuild
index f024f4b1ce68..f024f4b1ce68 100644
--- a/app-misc/elasticsearch/elasticsearch-8.14.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-8.15.1.ebuild
diff --git a/app-misc/evtest/Manifest b/app-misc/evtest/Manifest
index f2ce3a8b1d67..51df37e235be 100644
--- a/app-misc/evtest/Manifest
+++ b/app-misc/evtest/Manifest
@@ -1,3 +1,3 @@
 DIST evtest-evtest-1.35.tar.bz2 18686 BLAKE2B b2f747fab1f47c425133fc60697448972351e22d3ae606d3c548ead4e53f359eb1cebd2ec555afb678785670bddf3ff55d13b47f3160d4a49ff9ee496f041099 SHA512 d9ec506ad326af7749bdf9e92bf96af7eee29ef9ced645a12f99453019f6c072e2a84d67f59cc6014d27f0e4e53c3e517de1c5302b0789eaaf8ad9ca3c824282
-EBUILD evtest-1.35.ebuild 665 BLAKE2B 1cd84abdb72e696f0d0b43be66fa27eeeca5773196d20a06de71e43964fe0171882b880cb9d02a1b1e769f79da4c0b30047f69bbd13e229deda7fe2ed8454074 SHA512 4f0d4c7f3a12c572e9be96f51a2a05e203beb053a6ccdfb687f20e63ac4024882b9750981b3d88c8b5bfa0f1282cd0f056099ec7656517119b39f9c0468a531d
+EBUILD evtest-1.35.ebuild 659 BLAKE2B b3ca0426049cb1ae481df327fa0818a2a303ac57965fc1cc70ad9d89856c705b4837c08331ef18fbf233ac095189a67424329fdefdc8daaef73d6ec90ebfc409 SHA512 477d1e330c3cd600dce8be1467bc40f160cbfb0d5ee05362a413a198a515d366f9e9561d6c4a4af81c35cebeabface9cd8dfba7c25ceb1bbde514790e0cfe08c
 MISC metadata.xml 260 BLAKE2B 0d1a8d489b7103e417693cb1cc748bc26041fc49365e07e77c6dff3ff36be01b9fc3e9cb14099bb88b571af04b3d73e62099d912645372c83b2e5dd5378a647a SHA512 1d61fd2a8680afd5283a967a3147f1046b41bc7b017680ac17aacfdc158f7c0802e0ef3f98865ba82bdec44262dcf948c1617c6744e1279d6a293a486c50ba2e
diff --git a/app-misc/evtest/evtest-1.35.ebuild b/app-misc/evtest/evtest-1.35.ebuild
index 8ce2f1bc4bc2..fe03576bec21 100644
--- a/app-misc/evtest/evtest-1.35.ebuild
+++ b/app-misc/evtest/evtest-1.35.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="app-text/asciidoc
 	app-text/xmlto"
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 562d556df6cf..c00c31fc7fa2 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,11 +1,9 @@
-DIST fastfetch-2.20.0.tar.gz 1076860 BLAKE2B 61c50a4c96962063f18ae895d2f7cbe505c9276fcba8fb5a3d7e9cc6b6854709cdb955681a868b23421f172f5cecfa51fb526f17d6800e072d96698efe7758bb SHA512 96b02688d8817ef84bb926ffa3c77ee95c8d402a6f1e5daeb8170484e6092f953f05a5ab463cdce544adb052a1e89b4ee530cc9f09e54223d5f666099e0ad6dc
-DIST fastfetch-2.21.3.tar.gz 1093534 BLAKE2B dca99e337e1239958add6323c159f58de5f38fe92c9a7c778d04b127e1467066948e4bc5503afb1054ccbab914eb35d8f35cd2a3cb88bf2ba595255fac5f2ece SHA512 e097d9360b7c5b93b30ad117e47ae5375c48c7e941eaaa56ee5f39b7757374c1ecfe321bec0999ee81aa52deff1be001ff057b621d34a90e95ec6ea83bf9f0b6
-DIST fastfetch-2.22.0.tar.gz 1099230 BLAKE2B 4faef7574bc8897f17c9e59f05f033f8952d97ed56677f0ebe5afec11b7b708fce5d907431dda567cc71b0dd067239d97614b6035792009fff340a069691b547 SHA512 edb4532d220e031d666eac3ae12a004e1481a7c36c68a94b17323953822d0cedb80cdf34c84a184766e9bad64089aaadc3828b5e13f8867e961533c6919dbeae
 DIST fastfetch-2.23.0.tar.gz 1105725 BLAKE2B 8b79deb0f35d8238979441014ca049fcfa838c27323fec13127f5a48e6b28feb03965135c1a338b6bd1e59913e660fc91196c27acbe1b693bc5ff7727efaa5cb SHA512 aad3d549c0f4be3b1f99e7bbbf992dccf79f9ef7ea6a26bfc31ba574b1a32496a1cf75b85c32e0643941cad4061d7ba003b42924f9f272a825a1a09b628acc39
-EBUILD fastfetch-0.1.9999.ebuild 3065 BLAKE2B bce9ea6762c36f428b3b7de8942cb769252e4dfc1ec67cfc3a038c9156f020c10f64f131c5d0b2e851981a37cfe65ef80a4ed1d0d59e217dfa114eedc013fdab SHA512 3b3b45346c44819263ae340fb7f5ad69a89a2dde51ac06572f32921895f7e0925d35004695b543c2fa76862967ece7e337c035a3105f6fd613f07b69ea44afcc
-EBUILD fastfetch-0.2.9999.ebuild 3065 BLAKE2B bce9ea6762c36f428b3b7de8942cb769252e4dfc1ec67cfc3a038c9156f020c10f64f131c5d0b2e851981a37cfe65ef80a4ed1d0d59e217dfa114eedc013fdab SHA512 3b3b45346c44819263ae340fb7f5ad69a89a2dde51ac06572f32921895f7e0925d35004695b543c2fa76862967ece7e337c035a3105f6fd613f07b69ea44afcc
-EBUILD fastfetch-2.20.0.ebuild 3162 BLAKE2B 77cca2254a1bf42717cef5a65374d7ebde42d3a71fe7edc4c4bd24a3d5f01d2cd756501eecf5dd281bfd66f72ba92b4176856ba43b083b6d7acdd6cb3d485acd SHA512 bd68b36a040cb3ef169d5efc9d4ab5ba43166b955f769d1818a343e70ff6543e4c7daeef038bbea4e7b476e72145ca1b5983685780759bfcf8c1e31c01a31b12
-EBUILD fastfetch-2.21.3.ebuild 3123 BLAKE2B ab575d0b4d8ca12d6026947bc55fde52e571237afeae458b8d06cd7978ce3f7e7e1e1249401fe61112abb618e904e4d1b6bf0c7f184fc52c811eef8f130fe932 SHA512 90bdf85e12edc92dde5d3c7b44b8d7f48830a5dfadc6f2118230e0d0cdd5ba28cd6a4d8470e8fcd01597ee31b00a8a6da8fa3f8b0e7915b2f3a000248129f0c2
-EBUILD fastfetch-2.22.0.ebuild 3123 BLAKE2B ab575d0b4d8ca12d6026947bc55fde52e571237afeae458b8d06cd7978ce3f7e7e1e1249401fe61112abb618e904e4d1b6bf0c7f184fc52c811eef8f130fe932 SHA512 90bdf85e12edc92dde5d3c7b44b8d7f48830a5dfadc6f2118230e0d0cdd5ba28cd6a4d8470e8fcd01597ee31b00a8a6da8fa3f8b0e7915b2f3a000248129f0c2
-EBUILD fastfetch-2.23.0.ebuild 3123 BLAKE2B ab575d0b4d8ca12d6026947bc55fde52e571237afeae458b8d06cd7978ce3f7e7e1e1249401fe61112abb618e904e4d1b6bf0c7f184fc52c811eef8f130fe932 SHA512 90bdf85e12edc92dde5d3c7b44b8d7f48830a5dfadc6f2118230e0d0cdd5ba28cd6a4d8470e8fcd01597ee31b00a8a6da8fa3f8b0e7915b2f3a000248129f0c2
+DIST fastfetch-2.27.1.tar.gz 1123299 BLAKE2B 27a5dcba7c2b14baaf62e1372bc38e79c08654a00da4ebbd5f2918e1d2360745b61a5de45e9bdabf1295e03a7003da2db354133da0a19bd97013f59e60ae5637 SHA512 68742a963fd2df830ed8ef89548407bfd1eb5946f665c53fb1e4bc9b3ed3ae36db54ad0660d75395e5f4d239acfa51101cedba360a1a39f78c39f46c1fe559f6
+DIST fastfetch-2.28.0.tar.gz 1131275 BLAKE2B dc119a91b61b6a868140cf7dad8854f998b05b04ed0b8d3c36597fb5f39594f46acda7f26f6aa43392015f36af40a45e2773524440295a944a17198f19d9ea00 SHA512 9a08da7328234caa9bd77ac2393e8c0f8006dc1e9d97f7ceec4d1b737899e0b10ae8b726485bdac70da49f985c5386a341806555c27dfb73fb35a513704352ee
+EBUILD fastfetch-0.1.9999.ebuild 3140 BLAKE2B 590305770bf5609261c4f9650515fe09f901175753535457bf6aa233e37c8a1a17024646774c1305ecda4f179fb3c21779bc9618d601bd41f4df803e2606aea0 SHA512 6e31411e743d366098d2a2c548f3b02a64cace516a84156246b50cf076721e5a4093214e91219cbcbbb2baf7f84024b6f04fcb692af4a5d963cd3ba7d53f685d
+EBUILD fastfetch-0.2.9999.ebuild 3140 BLAKE2B 590305770bf5609261c4f9650515fe09f901175753535457bf6aa233e37c8a1a17024646774c1305ecda4f179fb3c21779bc9618d601bd41f4df803e2606aea0 SHA512 6e31411e743d366098d2a2c548f3b02a64cace516a84156246b50cf076721e5a4093214e91219cbcbbb2baf7f84024b6f04fcb692af4a5d963cd3ba7d53f685d
+EBUILD fastfetch-2.23.0.ebuild 3120 BLAKE2B 22a6a23477768bef0c5d520f5f92ab81957f31077ae3aa1d7a02e0259709d7543b67667a290f88cb30afcb3f70a4e45345b5344e6cb843066a9d6535d43d1896 SHA512 e1549c257776c56098c3f48d4965a0f15fde3282b97dbf1306bc7bf3b6b783579f7ddc4b067ca2861f15fa74bb657c0bda20554b52bf1d041f4e33ffca8b2a67
+EBUILD fastfetch-2.27.1.ebuild 3140 BLAKE2B 590305770bf5609261c4f9650515fe09f901175753535457bf6aa233e37c8a1a17024646774c1305ecda4f179fb3c21779bc9618d601bd41f4df803e2606aea0 SHA512 6e31411e743d366098d2a2c548f3b02a64cace516a84156246b50cf076721e5a4093214e91219cbcbbb2baf7f84024b6f04fcb692af4a5d963cd3ba7d53f685d
+EBUILD fastfetch-2.28.0.ebuild 3140 BLAKE2B 590305770bf5609261c4f9650515fe09f901175753535457bf6aa233e37c8a1a17024646774c1305ecda4f179fb3c21779bc9618d601bd41f4df803e2606aea0 SHA512 6e31411e743d366098d2a2c548f3b02a64cace516a84156246b50cf076721e5a4093214e91219cbcbbb2baf7f84024b6f04fcb692af4a5d963cd3ba7d53f685d
 MISC metadata.xml 1179 BLAKE2B 8d17b388fd4cec14661b39e56997c818a1aaff73b52de225f5697d85e1042a50a0cef77d7b1636dd3caa852ae459d5bb00b0d0e3072769b4aa2db3d58366edf1 SHA512 bb2c646dcd7196406c2c16ea12c51f029c3f31b6a50e9c5cd7c2877650d50f5e03802d67006422b7e8fb2fafa241db5fd01d29321cdd1726bd5210f532b3b77d
diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
index 4fb2091c80a6..6186f29ea3dc 100644
--- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
@@ -20,19 +20,21 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick opencl opengl osmesa pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl osmesa pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
 RESTRICT="!test? ( test )"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs dynamically
 # make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
 	>=dev-libs/yyjson-0.10.0
+	sys-apps/hwdata
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
 	ddcutil? ( app-misc/ddcutil:= )
 	drm? ( x11-libs/libdrm )
+	elf? ( virtual/libelf:= )
 	gnome? (
 		dev-libs/glib
 		gnome-base/dconf
@@ -83,6 +85,7 @@ src_configure() {
 		-DENABLE_DCONF=$(usex gnome)
 		-DENABLE_DDCUTIL=$(usex ddcutil)
 		-DENABLE_DRM=$(usex drm)
+		-DENABLE_ELF=$(usex elf)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
 		-DENABLE_GLX=$(usex opengl)
diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
index 4fb2091c80a6..6186f29ea3dc 100644
--- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
@@ -20,19 +20,21 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick opencl opengl osmesa pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl osmesa pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
 RESTRICT="!test? ( test )"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs dynamically
 # make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
 	>=dev-libs/yyjson-0.10.0
+	sys-apps/hwdata
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
 	ddcutil? ( app-misc/ddcutil:= )
 	drm? ( x11-libs/libdrm )
+	elf? ( virtual/libelf:= )
 	gnome? (
 		dev-libs/glib
 		gnome-base/dconf
@@ -83,6 +85,7 @@ src_configure() {
 		-DENABLE_DCONF=$(usex gnome)
 		-DENABLE_DDCUTIL=$(usex ddcutil)
 		-DENABLE_DRM=$(usex drm)
+		-DENABLE_ELF=$(usex elf)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
 		-DENABLE_GLX=$(usex opengl)
diff --git a/app-misc/fastfetch/fastfetch-2.20.0.ebuild b/app-misc/fastfetch/fastfetch-2.20.0.ebuild
deleted file mode 100644
index c5461c00eeb9..000000000000
--- a/app-misc/fastfetch/fastfetch-2.20.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Fast neofetch-like system information tool"
-HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
-	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
-	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
-	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
-else
-	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
-RESTRICT="!test? ( test )"
-
-# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
-# make sure to crank yyjson minimum version to match bundled version
-RDEPEND="
-	>=dev-libs/yyjson-0.10.0
-	sys-libs/zlib
-	X? ( x11-libs/libX11 )
-	chafa? ( media-gfx/chafa )
-	dbus? ( sys-apps/dbus )
-	ddcutil? ( app-misc/ddcutil:= )
-	drm? ( x11-libs/libdrm )
-	gnome? (
-		dev-libs/glib
-		gnome-base/dconf
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	networkmanager? ( net-misc/networkmanager )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/libglvnd[X] )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-libs/libpulse )
-	sqlite? ( dev-db/sqlite:3 )
-	vulkan? (
-		media-libs/vulkan-loader
-		sys-apps/pciutils
-	)
-	wayland? ( dev-libs/wayland )
-	xcb? ( x11-libs/libxcb )
-	xfce? ( xfce-base/xfconf )
-	xrandr? ( x11-libs/libXrandr )
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	xrandr? ( X )
-	chafa? ( imagemagick )
-"
-
-src_configure() {
-	local fastfetch_enable_imagemagick7=no
-	local fastfetch_enable_imagemagick6=no
-	if use imagemagick; then
-		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_RPM=no
-		-DENABLE_ZLIB=yes
-		-DENABLE_SYSTEM_YYJSON=yes
-		-DIS_MUSL=$(usex elibc_musl)
-		-DINSTALL_LICENSE=no
-
-		-DENABLE_CHAFA=$(usex chafa)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DCONF=$(usex gnome)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
-		-DENABLE_DRM=$(usex drm)
-		-DENABLE_EGL=$(usex opengl)
-		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=$(usex opengl)
-		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
-		-DENABLE_LIBNM=$(usex networkmanager)
-		-DENABLE_OPENCL=$(usex opencl)
-		-DENABLE_OSMESA=$(usex osmesa)
-		-DENABLE_PULSE=$(usex pulseaudio)
-		-DENABLE_SQLITE3=$(usex sqlite)
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XCB=$(usex xcb)
-		-DENABLE_XCB_RANDR=$(usex xcb)
-		-DENABLE_XFCONF=$(usex xfce)
-		-DENABLE_XRANDR=$(usex xrandr)
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/app-misc/fastfetch/fastfetch-2.23.0.ebuild b/app-misc/fastfetch/fastfetch-2.23.0.ebuild
index 2609a6c86f16..099a79ba92bc 100644
--- a/app-misc/fastfetch/fastfetch-2.23.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.23.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fastfetch/fastfetch-2.22.0.ebuild b/app-misc/fastfetch/fastfetch-2.27.1.ebuild
index 2609a6c86f16..6186f29ea3dc 100644
--- a/app-misc/fastfetch/fastfetch-2.22.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.27.1.ebuild
@@ -27,6 +27,7 @@ RESTRICT="!test? ( test )"
 # make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
 	>=dev-libs/yyjson-0.10.0
+	sys-apps/hwdata
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
diff --git a/app-misc/fastfetch/fastfetch-2.21.3.ebuild b/app-misc/fastfetch/fastfetch-2.28.0.ebuild
index 2609a6c86f16..6186f29ea3dc 100644
--- a/app-misc/fastfetch/fastfetch-2.21.3.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.28.0.ebuild
@@ -27,6 +27,7 @@ RESTRICT="!test? ( test )"
 # make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
 	>=dev-libs/yyjson-0.10.0
+	sys-apps/hwdata
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index 4d16a525106a..97e216be8f65 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -1,6 +1,8 @@
 DIST fdupes-2.2.1.tar.gz 144719 BLAKE2B 904fd70650847e48e135e47ef77e244ee847151f6ff88ccda2aeba5158038de8507b2ea23a7172e9c1fcd634ae38601c66da225014b9cfd65fd506ce77e7d408 SHA512 4911d2f776480691e7bd7045c181d49159add5b479188b05f0878a7af365cee0e430093e71ff172c04b876c58efc3be0f24c9d25f0cdebf1c869931175bc8608
 DIST fdupes-2.3.0.tar.gz 154700 BLAKE2B 0266920a124f210955fdcfd3e689db50f4dd8062c68f18f6e7d3bc35d7be7002e8088634253d37ebbb59fda5edb7c9642c5d7f0e8ade9c70cbd3067c3778d676 SHA512 7801538b84797af94a5e9300cf5605b775380b7eef05ea1f70a5c6a2521d09c66dc6f310316a062c241fcf2086def52dc24be42a336c4bcc8a450f8578d310fc
-EBUILD fdupes-2.2.1.ebuild 979 BLAKE2B ec70ea2153408cecdf91a59addde66b115faf0d4297d7477b56435b9593c8e23d1ec82ead42f846f4e78f891c8cdf5fe74a1d4a8a2dbcfc35974f67ecdd1f063 SHA512 e3718eb7f61cc03a6efcaf91a12641cb58682dd3e9826de032d25fc56ac04bc2d2d38245c7feb170f5686816e494a3850106dc70d68f7d7112b0464f59676f97
-EBUILD fdupes-2.3.0.ebuild 1036 BLAKE2B 0a1494e5aa9cbf9de7a0cd9152e0800b06ed89e482f378cfbde0527818cc9b2725b7b2912559c971dbcc0d082a118871f0a351d3dd8360e78a2e9a972e15d102 SHA512 272735db6e6cf8644a5e933e8cc69095d5bd350ab0fa0498897bc78f376f464b8fef0e869fd5e608b068f6e56452c1d657a508943f0d97cbdc4a3d38b82e20b9
-EBUILD fdupes-9999.ebuild 986 BLAKE2B bed740b4937ce26cdac0a55c8579f0c36341a67fd4bb494dfc95ea9e2a0b3d27f3164ffb116156e22e1ee8dec29e3ffbc3ac312b2108bed01b895b685269e7fd SHA512 9b188308540dc189d5187adc79de5605e8eb2317fec25fe6923bdb1c49c5439649d1e586a19db9453dae88861cc723a2f95dc7c1d5bd57ad65486a1c15e6d84a
+DIST fdupes-2.3.2.tar.gz 155115 BLAKE2B 3b5d96731636b7ebba84542ef6f5a68d990b80597599cd401cd3359da1622b444c3870b371e54c2379a92cb39490bb8a1e16ce33c81c91ca536ec8d66adf37d1 SHA512 50a3e046a1261566aa325a855a65e1f1f2ac040f44751cbf635e36a1dcfc8618da843da05a8f0f48d155617b1d70eef1361fb3b5add429ae369395c91f284aec
+EBUILD fdupes-2.2.1.ebuild 973 BLAKE2B e4a47ba30f056b5a3dd0bddac97a30e843ad73857889785a94db8a3bb55c79949e7004c053179f36609cd7af055631bf31b1d0eb9c8446239cabbe9dc8fd6471 SHA512 06a512a63e064c8d87c0df3eac1e560e67f80411523706dba26edce291f2ca1ca026da8db1b2a76df94348ebbc112e60e5ca3a74fbc99faa94f6c42e35675112
+EBUILD fdupes-2.3.0.ebuild 1030 BLAKE2B 0f64514cdf7f6b24f4ef8f4e143dce2c711c474d984951039a28199d1cc0af793dd1a971ff1d8d51cb23ba90641c4ebf25581935fb71242adfc5be6b72f7b43a SHA512 0da853a2d61defa267a923bd3524df663af69449a28f74aa5bc06a4fdfa365f4e1c4fb939d5fd99c7722910420dd9d93098085ce5ed7dbd27b0cc6c80dd0c157
+EBUILD fdupes-2.3.2.ebuild 969 BLAKE2B 3f5af90447926becaefaa3d3a55c1970145a311caa158f89918ffbcc73d1feb37962df74ddf738cca7a9c7ea13d2db35c9a27623160403dfcca0d1b23ca82dcd SHA512 370c861286b3653cd8e8d0d0036bf5513bf1d6f4cf2652e6502f80e4f360130fc235e610008f98464326166b55fd29df7f5fc65d81c541476530f36af6e7775e
+EBUILD fdupes-9999.ebuild 969 BLAKE2B 3f5af90447926becaefaa3d3a55c1970145a311caa158f89918ffbcc73d1feb37962df74ddf738cca7a9c7ea13d2db35c9a27623160403dfcca0d1b23ca82dcd SHA512 370c861286b3653cd8e8d0d0036bf5513bf1d6f4cf2652e6502f80e4f360130fc235e610008f98464326166b55fd29df7f5fc65d81c541476530f36af6e7775e
 MISC metadata.xml 354 BLAKE2B 1856a8a97481585a4c2df78ed004e7f560a9ab5433ca73a55f7895078d166c4f94a21bdb099cecc79ef6fda4ac7a68f5a9a5c50f3a8ddac5f4b1e5e42e1d9470 SHA512 5a21ed62cd9553f55ffb9ca06e904a2ec4540a9656934e2e4c47b85f5a63667afbce639851cd9b6b2123a41611fa1dc71c71793163f44dddc12c7019c6dce871
diff --git a/app-misc/fdupes/fdupes-2.2.1.ebuild b/app-misc/fdupes/fdupes-2.2.1.ebuild
index de6d94f0f316..ad9e7dd3d7c6 100644
--- a/app-misc/fdupes/fdupes-2.2.1.ebuild
+++ b/app-misc/fdupes/fdupes-2.2.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fdupes/fdupes-2.3.0.ebuild b/app-misc/fdupes/fdupes-2.3.0.ebuild
index bbe30a2c963c..6f44c8117cd1 100644
--- a/app-misc/fdupes/fdupes-2.3.0.ebuild
+++ b/app-misc/fdupes/fdupes-2.3.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fdupes/fdupes-2.3.2.ebuild b/app-misc/fdupes/fdupes-2.3.2.ebuild
new file mode 100644
index 000000000000..c735e2285b46
--- /dev/null
+++ b/app-misc/fdupes/fdupes-2.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+ncurses sqlite"
+
+RDEPEND="
+	dev-libs/libpcre2:=[pcre32]
+	ncurses? ( sys-libs/ncurses:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README )
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with ncurses) $(use_with sqlite)
+}
diff --git a/app-misc/fdupes/fdupes-9999.ebuild b/app-misc/fdupes/fdupes-9999.ebuild
index 3578fdc09788..c735e2285b46 100644
--- a/app-misc/fdupes/fdupes-9999.ebuild
+++ b/app-misc/fdupes/fdupes-9999.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
-
 DESCRIPTION="Identify/delete duplicate files residing within specified directories"
 HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
 if [[ ${PV} == *9999 ]] ; then
@@ -12,16 +10,17 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+ncurses"
+IUSE="+ncurses sqlite"
 
 RDEPEND="
-	dev-libs/libpcre2[pcre32]
+	dev-libs/libpcre2:=[pcre32]
 	ncurses? ( sys-libs/ncurses:= )
+	sqlite? ( dev-db/sqlite:3 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -35,9 +34,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with ncurses)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
+	econf $(use_with ncurses) $(use_with sqlite)
 }
diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
index 6f045dfb27a1..309cad1927c9 100644
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -2,6 +2,5 @@ AUX figlet-2.2.5-musl.patch 894 BLAKE2B c616940cf436a9434062acff8ef26e8f5327eee8
 AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede5369eb2e4f04bfafdfdb680d6fc62670f1299db6978add0298c833afd6471ff26992db96fbd0a78f6874 SHA512 1a9d06139bbb105c9d909d1e7bfb64b04d6ccba6e0ebfa0968f75264da5582c2f449ad5759f36ec90bf068e69005c2eac2d0565765b02a13044531601b7b9d18
 AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
 DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
-EBUILD figlet-2.2.5-r1.ebuild 964 BLAKE2B ffd1722e39932ffe494a5e10eb3873df3721be6e397abc621852bfbf66b26fac056406cc2234e645a35f6ed92a38c4f8eca41b499d6b356318455b4473194d07 SHA512 2fec15c81d80861fd1c5a11de8e6f0a7c595e6fe7ff1c90b5870dfbfa9f5eb75fe0aaa4ab2ed73e553d7d08852a4012539e8d6ccc1c8437bc61a4bc904c60934
-EBUILD figlet-9999.ebuild 805 BLAKE2B 9562e2503c2395d88e78e832c5ae1fb5fc2a49c83871cd868cda802138db038f685dcbe60ffe77d9cfcea7b75281fb5596bee641d8ad9da28167452b4a127302 SHA512 1486ee9197ebab6a17e781366037f5e8cd24ead017dd2c87de373321f18bf3e908e952f983b2e9be6bda7914e51938324e8fe257487ccb015cf180495b1c7304
+EBUILD figlet-2.2.5-r1.ebuild 958 BLAKE2B a9e1bfd7cecc29e06997353aa4a091e4a25e561ae64312ceac74fdbaa0824edef4533bfd940262c436d4cb13b987d90cd8cc41f24912068c5af2947b0b25bc27 SHA512 3f531009d602255b5268b1a1847e375e32e8808a61aa734d891735a57dc9df5afeaed0fac50e697ceb75e0042812bce8fb852b4f2b520fbb7c6a6cd3eff47edc
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 2d98e79b36b3..716fd19b447a 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 PATCHES=( "${FILESDIR}"/${P}-musl.patch )
 
diff --git a/app-misc/figlet/figlet-9999.ebuild b/app-misc/figlet/figlet-9999.ebuild
deleted file mode 100644
index 30e2a9d7e973..000000000000
--- a/app-misc/figlet/figlet-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 git-r3 toolchain-funcs
-
-DESCRIPTION="program for making large letters out of ordinary text"
-HOMEPAGE="http://www.figlet.org/"
-EGIT_REPO_URI="https://github.com/cmatsuoka/figlet"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-
-src_compile() {
-	emake clean
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LD="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		all
-}
-
-src_install() {
-	emake \
-		BINDIR="${EPREFIX}/usr/bin" \
-		DESTDIR="${D}" \
-		MANDIR="${EPREFIX}/usr/share/man" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	doman chkfont.6 figlet.6 figlist.6 showfigfonts.6
-	dodoc README figfont.txt
-
-	newbashcomp "${FILESDIR}"/figlet.bashcomp-r1 figlet
-}
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index 7c186a4eccca..9df67d8db1dd 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-0.20.7.tar.gz 1414198 BLAKE2B 18af2f136557d5d5674e05669839e1213c1c8234bfb2a14875057989040cae2955e7a569456a93fb181121afa796e711a8b26e26397d743dc6d3ac2eefd7088d SHA512 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
-EBUILD gentoo-0.20.7-r1.ebuild 1311 BLAKE2B 6914d982f9dcb0aca6e232f1f49751138e6e7834d895803ad4e734d309719429c7c36e17abcd810ee089621e10d6f59ac20d3025f658c6755c4fc74d1a3758b1 SHA512 e7306455e759074c6a990056b89145ee1aed0d50e6446520f21eef54bb5beec2a2c1958f3723aa15f7cc3e5e8fe0ebb422a7c1e2ed8b8e8882df03a5a69b901b
+EBUILD gentoo-0.20.7-r1.ebuild 1305 BLAKE2B bfbab01da8e89ac4e84c522fcbf0e62b843bce5143198d26e463af581177bf9812f0c825b33ba500fe3fb0f419e0982f5c5c98055daa4c4001feaf2be03f1dea SHA512 343552b186b2bad9f1f30be6182fde5c80d776dd3950a1f6a531b05d2fa26b3ad8e6cbfc510a82267a7223b709d695041e1a9abb053009ec5d2bc5698fb4bb1b
 MISC metadata.xml 244 BLAKE2B ca4fd7b6fc894aade3e399f4432afd2448893d740f1b4a0901008f469e52cd8ef0b131f69407980a941f17e8653ee139775cf9aa5671cb9048e5ae77e60e1752 SHA512 1ed51fd5e080356033938c4866484a9ed1237008ddc4fbce57a4f97241a2fff19b89eccc34dbef0a8db97f18b7b0564192d46b354e95495cb5631fedc68e3af7
diff --git a/app-misc/gentoo/gentoo-0.20.7-r1.ebuild b/app-misc/gentoo/gentoo-0.20.7-r1.ebuild
index abad24a65e9c..abb94889b886 100644
--- a/app-misc/gentoo/gentoo-0.20.7-r1.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index b90a62fc569c..3b18684073a8 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,3 +1,3 @@
 DIST geoclue-2.7.1.tar.bz2 106458 BLAKE2B a2fc44d4941936d8dcd495d77d11b0d948d7031ca048b97ff0940c7fcdd37ba604655f2e255c5e0dd5cc7a82a2d5a15b18aab4825b2446560e225c13df6da3b8 SHA512 972663a6f8c969d0e1a5f911af2b8afed486d5c0ba06dadc19bcfbe1ea22cef10243b2bd0084e5c45b70977cfa5650c8f15f760e4bc4e7dbd946745b67c9188b
-EBUILD geoclue-2.7.1.ebuild 2329 BLAKE2B 257711bcabf4cd7b4313881375355f64978a92b72ab923f8f1edddc2a46f5d641b5385e92cada5a1c6477c778802d22d525a8f97c0014bce7530ff34ff56db11 SHA512 cfc44ed512412954b0d662998b36c917a8e3c8faf6e5e81551d7a43533f651e93deae5914b6600c42aa9868149251e4755ec42d8231b530e0c35195d739f5e94
+EBUILD geoclue-2.7.1.ebuild 2323 BLAKE2B 3a8cd04374a94f2e4396955f0bdbba063ad9ab0e676650bb2b1fbd4e22b17f83a4ae3bca48dc3e9dcb0a78f6328ebd9b7e09c30a98ef78837c3320e470b6e228 SHA512 02a83c7e98343239a05e6e93aef3d1a1c3adeadde7938818277e9e9acdd7d6418493b06bc0ad54da01919b7fd0a41df41d9bdd878f8aa2ce7ccd7b47c19cb6ea
 MISC metadata.xml 1006 BLAKE2B f61bb5fff6412551ad5377786b08e2e488adc53f18eea163e7d0351fcc7b9ba767dd7f456f123ff226a963464c401e99ad0b52264a034c044ae3f323b0e7c7a0 SHA512 a19a0d84fc21207ce16ca38b0b2db4faf554ba4237fc0aada39f58c2934c3f0a4fc20d6210887e2c107e30ccf509e0915469e669a82cfc35e1e85ff64c741eab
diff --git a/app-misc/geoclue/geoclue-2.7.1.ebuild b/app-misc/geoclue/geoclue-2.7.1.ebuild
index d798815d307f..f713abb5d70b 100644
--- a/app-misc/geoclue/geoclue-2.7.1.ebuild
+++ b/app-misc/geoclue/geoclue-2.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
 inherit meson python-any-r1 systemd vala xdg
 
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection gtk-doc modemmanager vala zeroconf"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 9b5ca24530a6..308d85f00c1b 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -2,5 +2,5 @@ AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f9
 DIST golly-4.2-src.tar.gz 15348982 BLAKE2B 21ebed4c282a77a3f61aafa98936c0bb39b39a7c97505e96fc43ac720bd2eea4cf20996ca28c801f79a46577a0cf99ff60614ce134081605d14ca5972c841d50 SHA512 b9f5cfdfe9b96590411695805dd8b875329c81027fef98dff3f16b832018be2ad3a06583bb64e12fb305268feba2347ef63c4586ff0e645721a8085f04ab382a
 DIST golly-4.3-src.tar.gz 15488205 BLAKE2B 0789bc3e50f43083633f699c5e4ff20fd314cfa776d22463dce3169095e57daeadda4d9671f1b566d6786771caf029f98e4593b250cf29a73abff0c200e2f32b SHA512 daf3a0ef8b7d3f97df2c3a05a245c93eb124ebab4e7a7c0d267e22b4b7271a11cecced20b53fa88dfde145ce11450aac98e0e774f8b6419b3084952938e5a854
 EBUILD golly-4.2-r1.ebuild 1495 BLAKE2B caca34960addf12c73f9051c261b3baada5f7111ed33a8a9dd747321e560ee7ab7eeac9384b0fe7d1df20778ea608ab719d2f6c6d7aa68dcc44139370c60f8b3 SHA512 51d0eea039da7a48241cc71d117ebd5ba645e7ed28f8d69e15c7b4a6f3fe8f31a07f88399de5382cd1026ebdcfc5ab028acf08aa6cd5e03999b393821a3ef3b9
-EBUILD golly-4.3-r1.ebuild 1489 BLAKE2B 2a2729e43dfdf44981125ed19b8dd04dcb5772a3d66117e193363bb408e024a8af4a2ecf32d0299675fea81ab7a2f26286d5daa7767bb4373fe8e8de46a20e11 SHA512 42098a356a3474220711d573cf09e9d254adb170dd7bb3ac079edf46d05e06925d91ded45a31174118c71751d001b887332f867200f03d9b75fa45831304fd7d
+EBUILD golly-4.3-r1.ebuild 1488 BLAKE2B 2a839b66c985cef2885fe908c7dbadc0de6b7238ac2218434c47f8e3eff9811c69e8624b4fe3d6e672a604211b182211829293aa6d554d4831de5924d406dcfa SHA512 aa37c82c7900b949d111e00c11cf27be3defc71737f3f85ca3b528b1006802ea3fed550de98a849939f6e8e314052d4cc57e10e3284f94d3ab04b479ae1f0725
 MISC metadata.xml 571 BLAKE2B 64399eaf28ab52d39c1338758ca1abc2f67f195e4320b01d411d00fc3e434065d25cbab6c886dddfcd18611cef4d057c0b74c22c73e432ce1c3efb22e523164a SHA512 7ddf9bbb0cb55f5beb5377b2f0a7823e125195d0019f45dfd26c0868fe57c69913d11946de5060416856ac68bca863fd06a1a1128704a8fa53fd494df4b106e5
diff --git a/app-misc/golly/golly-4.3-r1.ebuild b/app-misc/golly/golly-4.3-r1.ebuild
index 26ed848979da..5c967731ad8c 100644
--- a/app-misc/golly/golly-4.3-r1.ebuild
+++ b/app-misc/golly/golly-4.3-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 74c4b59c3a31..6c8eb4e5171d 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,6 +1,3 @@
-AUX gramps-5.2.1-test_locale.patch 1192 BLAKE2B 74c870c893a5187e5f73cd5f7fd4e5b667d6dc07984ce573ac4b1e3235f5ddc525ebe69e52edf49e9b884668e6ad5ad48f17b3b687cc5a3862a673ad3b057044 SHA512 5266e3fffde071f345e191c3c47dc74683ea645973e7a3863ab2e27d44ac7de12d5d075e67b6dcd44c7f8397dc1f11ee79515ef2903c76edab233c76bc907f21
-DIST gramps-5.2.2.tar.gz 21070723 BLAKE2B 8edf794e766663a1536cc50599a418ccb6e06ea832be14227aaa29336a1165f54c00cfb5fa7ed6657256b6660d3217ac4f4e2e62d41097d66808f0f4f554238c SHA512 4e2480081c16a61e9b0d4b0bbecccf4e6af6a40498d6994d8103ac37a7f3ce7993359fc0a9ee72cb06173ab82e17029e1a731bcf4af360cfc73e3c44c9800ef5
 DIST gramps-5.2.3.tar.gz 21081011 BLAKE2B 1ed8bc46e3c0d49b77194e52a060e5e3627871620f87bb7aca1b112972aecbd94a382cbc03ac07f8ef0424b4e47abbb4245ec4761fce5f5b019bdf41591530a1 SHA512 830af5c7276ff4e6c3a43ce37f1cd7bf345368885489701d17e4fe276f468890b267c5c72d7055e6043dc715e7a7f950e5a2084e31863d338c3487f29561ac75
-EBUILD gramps-5.2.2.ebuild 2134 BLAKE2B a879d55499ed3561595af2d8f23a4d95c3132e63308ca26fe1c127f1867a37902466aadd9a060ebe5631e09e001b21a3fb5852e62c8407b79dd9712ead3975a1 SHA512 8dc696d7284bfc72c300c80447b9dec0c98d940a14d1fec416e150c32311243d9c04ab3a48343e670928635d47ad12a1b8387578d22b1384cb52ded4638ea616
-EBUILD gramps-5.2.3.ebuild 2504 BLAKE2B f4c738293237127749933a94188313c7c213bf769367ed897e3b446d436fd1404bf35aaec9b8b8d09daaeaa699828a7352375da841f558fd7bab27fdd291b8a9 SHA512 f25534577a413764dbf69821d1b1149ab531c2ee2f7c1741256593830c39d6cedcc885a87589ab87293b763987dde97ceef808b72698a0296a4d68c14ff857f2
+EBUILD gramps-5.2.3.ebuild 2503 BLAKE2B 2548ea0e83a444e7af787f03c772f7e3e6c6cd59575fc970cb5dac81d80d4218529bbf99a4dfb8b76c62a5770ff52e3f5378465499b3c4539daba65f5c12cc0d SHA512 d744067dffb58bd2a13e8d48a2037913e779a36d69b780704b8f2527b8dd8b0456523c2b248d2082671a8a31296e4dfd5434338279e31a24b8d20064d34f933d
 MISC metadata.xml 5521 BLAKE2B f0ded0e16a02c46c4f4fd8e1abf60b53bab2feb81d24465cc59b1ca8113b49e6a3a0dba04fbe6828da07998ecb161505ae60dd969c73d503b78b07622697445d SHA512 833c7014cad20b694f91bbd093202c825017f08c67e6f86fd5b1bb0d69828ef9f4a834770faf5ac0e5fd5e028342bbd00c6cc44c3d8e92cf34ef81b8f552ddae
diff --git a/app-misc/gramps/files/gramps-5.2.1-test_locale.patch b/app-misc/gramps/files/gramps-5.2.1-test_locale.patch
deleted file mode 100644
index e1e0b7997075..000000000000
--- a/app-misc/gramps/files/gramps-5.2.1-test_locale.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-GEDCOM-import tests explicitly set the locale to en_US.UTF8 because they
-assume a US date and time format. That locale is not guaranteed to be
-present and checking that in ebuild is a hassle, therefore use C.UTF8
-instead - it's similar enough.
-
---- a/data/tests/imp_sample.gramps
-+++ b/data/tests/imp_sample.gramps
-@@ -1719,7 +1719,7 @@
-       </style>
-     </note>
-     <note handle="_000000fa000000fa" change="1695230065" id="N0037" type="General">
--      <text>Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM.</text>
-+      <text>Objects referenced by this note were missing in a file imported on 12/25/99 00:00:00.</text>
-     </note>
-   </notes>
- </database>
---- a/gramps/plugins/test/imports_test.py
-+++ b/gramps/plugins/test/imports_test.py
-@@ -54,10 +54,7 @@
- # ------------------------------------------------------------------
- 
- # These tests assume a US date and time format.
--try:
--    locale.setlocale(locale.LC_ALL, "en_US.utf8")
--except locale.Error:  # seems to fail on Windows system for some reason
--    locale.setlocale(locale.LC_ALL, "English_United States")
-+locale.setlocale(locale.LC_ALL, "C.utf8")
- 
- 
- def mock_time(*args):
diff --git a/app-misc/gramps/gramps-5.2.2.ebuild b/app-misc/gramps/gramps-5.2.2.ebuild
deleted file mode 100644
index 28218dd45ff7..000000000000
--- a/app-misc/gramps/gramps-5.2.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2001-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="exif geo postscript +rcs +reports spell test"
-
-# Many tests fail unless the deprecated BerkeleyDB back-end is enabled.
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyicu[${PYTHON_USEDEP}]
-		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	')
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-	reports? ( media-gfx/graphviz[postscript?] )
-"
-BDEPEND="test? (
-	$(python_gen_cond_dep '
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.1-test_locale.patch
-)
-
-DISTUTILS_ARGS=(
-	--no-compress-manpages
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the ${PF} variable,
-	# and that changes with every revision.
-	sed -i -e "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-
-	default
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# setup.py option --resourcepath appears to have problems at the moment
-	echo -n "/usr/share" > "${ED}"$(python_get_sitedir)/${PN}/gen/utils/resource-path || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-misc/gramps/gramps-5.2.3.ebuild b/app-misc/gramps/gramps-5.2.3.ebuild
index e65eb3ca41c1..081982f64d19 100644
--- a/app-misc/gramps/gramps-5.2.3.ebuild
+++ b/app-misc/gramps/gramps-5.2.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="exif geo postscript +rcs +reports spell test"
 
 RDEPEND="
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index e41c4848a142..afa90c4811d9 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -5,5 +5,5 @@ AUX gtypist-2.9.5-link-infow.patch 453 BLAKE2B 6fd312a511b4d151a42679a329e47acf0
 DIST colemak.typ 8922 BLAKE2B e3c422e9172e215406a5165a44c51c38f3372c9988f1bafdb537463a9a3209f1759a312c2a5d316ec3a2a0b39563521b87aa6944cdd0b4cf94c960cbe70c7ca3 SHA512 f2c2816836c83d7b640f7f703a4924c62ff0746e0d4cf2a2ca36d434017770272518b835ea273815c93ab9df1c0e4d142f5fea1e5f0b1484ecdc652a53bdc499
 DIST gtypist-2.9.5.tar.xz 929356 BLAKE2B d83506ee8ab26290fae47f98aed4e5e63260f39d5391a9a735d009f34a787cd670b034375c946c7562545b84ed4655d51c385209d676de76cf4891ead9845ea9 SHA512 d6891cd58d23f9b023aec97dc825cb15f7371ab18e82133b9a284d3329b1526bda8e1c5d7225f335c5ec673280cbbe3ad92471eeb15db4ecf29e7feffe27e095
 EBUILD gtypist-2.9.5-r1.ebuild 1579 BLAKE2B 4305543039039e43c990faab45f2065cad4aa5f1800cc54e79341cea096a5be3c2076e2b84484197c9799159f31748b1c71fbbc40618fa91820dc49cc1058aa7 SHA512 d9684f3f9421e0877a061e616a31f76e59f56d6db10fcf1c794fb1e96b1fc306dad9c1736cc510e297c41582ca1862fc7fc94d06fd816068b58f61632eb285d2
-EBUILD gtypist-2.9.5-r2.ebuild 1731 BLAKE2B 217fd1fbfd6254f3752b61606df236c3aa31b5fd43f29f460cf1078d54275bd7b724d46ff6790f1a3cb977be7222faa5d5ee7e262e91d50383857f37dc4e25d8 SHA512 c9cde7b53e10ea40123e4999eb6007e59b6fa3cfe00801b9fcfa498b4751eefe0ae0a1c89abdb666eac1b2e464a19e295110107a73ff3a3a73b6a2dcecc14137
+EBUILD gtypist-2.9.5-r2.ebuild 1728 BLAKE2B 5365602281fe9b85afbe91843cb618d31b71de7b79facf26364d59afefb5d317b605c1a1b0bf12148c49f4c6054e50117b7ae6ceddc9fff00bdf8ea243b643e3 SHA512 68681054ca50abb5bc7e8e57bae9a03ad471a7d3e8df6a71bdbe82ea8ba256e5f12463893cefe30c40e7944b08f4c17ecc4ab548f66e16dd9446e7ba8c3e97ae
 MISC metadata.xml 485 BLAKE2B 170769676ef1f0491fd62bd5d2ea6a090f1341b5edb22d7d073203f6e7ceddfff4e9a0b3c84e965975e3216fe4b2dd9be71a630108fc857c0d34d5c77389f79e SHA512 a339886b430ccd8eeee7ec4840412872b34c953ccc1ae0ff14b7ded54f8bf84ff317b22ba1a700a7c069245b23eac48767ca0b6e4a8014a55f70e4f3aaa5d81e
diff --git a/app-misc/gtypist/gtypist-2.9.5-r2.ebuild b/app-misc/gtypist/gtypist-2.9.5-r2.ebuild
index 450f18d97cde..51f826ba61a2 100644
--- a/app-misc/gtypist/gtypist-2.9.5-r2.ebuild
+++ b/app-misc/gtypist/gtypist-2.9.5-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ppc ~riscv x86 ~amd64-linux"
 IUSE="nls emacs xemacs"
 
 DEPEND="
diff --git a/app-misc/hilite/Manifest b/app-misc/hilite/Manifest
index 5c08401be19e..e1f31485e4a2 100644
--- a/app-misc/hilite/Manifest
+++ b/app-misc/hilite/Manifest
@@ -1,3 +1,3 @@
 DIST hilite-1.5.c 2872 BLAKE2B bd6f89863100906a731008cc3c1b0480e3aa655119d73d651f425a2686ab0a861637f5818c671d453ce26fd831251699e6eb3b59d3e5b5938e2e1cb4de19a367 SHA512 571fb962e430d3c9e5494d802f529529a5bd0bf6dd7f398e7c55dd5a8effc568f9153edecf50d2e296b97eb20b2ddaa52c2214b9dd989449aff3b93a0547ad45
-EBUILD hilite-1.5-r1.ebuild 580 BLAKE2B bb6cdff80ca1a83dadc473a64dcd2b935ea2a87376cca177744704b5f13d0fd7a36f5bcb7af75702f14c69319a0674f76daeca0879ed7c7ca39dacf0493f86d5 SHA512 568a04d625109acefd4335414f3c664cdf3c8e9feb4de5d780954cfdc08b4e0608eaffc967ea3c1638a75a63608d725959310826c308811496b8328aca28527e
+EBUILD hilite-1.5-r1.ebuild 574 BLAKE2B 2d0c4411edfb9b7a2c99dfc6d3519408a3aba1d883cc07e7fe4679433e3b37a84456d43b561e7a0b648ebbce64afcd56a3553c345fcc370ae12f037cf4a3a8b9 SHA512 5c10572b73973f97e486f12ac877f8baecaccc860730da2af0af420184a7d1ca4cb52951e4aa14d6d7d9ab6fab19ac4d49edf0429da64c36742479a24a37dd60
 MISC metadata.xml 342 BLAKE2B abb14a9fc204ed5167a2ad8ed0b2b599d440a53383dd05cdaba7ef1a4a2e95ba42eb7cb33ad8c82b144027b35bebdc3bcadd03b506108dcd3ba9726cbf87f194 SHA512 786fdee2d772af50804565d2a311e85a5a18da17b62eb9c6c3b4f00bc9b6723ccf9026462217c7e46b54a864bd495a870f1d320bfda296699e2330de57773ce8
diff --git a/app-misc/hilite/hilite-1.5-r1.ebuild b/app-misc/hilite/hilite-1.5-r1.ebuild
index 507624ac9af2..23ee4dae55b4 100644
--- a/app-misc/hilite/hilite-1.5-r1.ebuild
+++ b/app-misc/hilite/hilite-1.5-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_unpack() {
 	cp "${DISTDIR}"/${P}.c ${P}.c || die
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index b1047b2f2d34..eb1ac7f15126 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,5 @@
 DIST hivex-1.3.23.tar.gz 738076 BLAKE2B b536e1b4b930b88b4bbbf8a4434e5ed7d407409acdbe68f7da67fa8198e1813bf84e918505eca7d341f15b41daeb0bbcfc974868a68f999e26941db759557fd5 SHA512 068fe81a442c8045bf9d98f0c6b782330141d8f1e104a0f191c04a2cff25ee6396c2c4777c107d595a471eb4bcbee903400c9f7946cae036165ac201587f861e
+DIST hivex-1.3.24.tar.gz 741279 BLAKE2B 9f4a7d66db75a8636bca9b818bcbd57fc82e1dabb324c3a087cba4bd16b3e8c97afe8b9208f409e1759615d7ac0f811c1b1764a2dc7ed04f30208587e3598206 SHA512 4b9be259e0359344aee2dce1e4df56d928b0e429abcc099479ba95b2940fb80cd285f22e6a914902bcc716e8b4b528f204bea10977913fc701ae45aacb66669b
 EBUILD hivex-1.3.23-r1.ebuild 2820 BLAKE2B 4a351f13696f05523f83ceb13892842f58a384e65212de06f7583d852d351fd2d6d7ac79601bd9139d6a42757e00b28eca39ae295270b37d0d20b8204f994536 SHA512 a4c9ee5eccab861e9b5706f4bd5ece1bc709acea7aa61c351ab82e70314775e77b845fe57d24787b891e6c61b60dce0c6b2a3de8f6dfdd65826b5f00890d12ec
+EBUILD hivex-1.3.24.ebuild 2789 BLAKE2B 38d6bf12437b03ad83c27b9befb4ed27a8d8bbfdae965041cbc154c6da3e24e986a11bb1c3d4e87918249fa1fc2c474df1b6a35fd9370b290b647cb08a5bbb64 SHA512 63ed3aceda2bfdc28535aa871be28915a00507e5b6d7779b20691df23a74f9d2fed2d670dcc89edd2789a51e24f3d8910faf5302b6604a9fbe24ad75b0b6f609
 MISC metadata.xml 249 BLAKE2B 6f4e10a8e257d2bb0d3eb8396ec0a4cf29d381ab118c8ef082dff01403cd79db12de157a1e35f0823aead216efcdcf7eab982cf326ad0fe149e9e0cabc205159 SHA512 b32d21b3e68e122d51c5c344f88095410c2b7e9cba5714579c087a2348bb45b0cb542abfec0f6902b205a60e045595c9ab5474694c1ea4bbb0610d4c5a89867f
diff --git a/app-misc/hivex/hivex-1.3.24.ebuild b/app-misc/hivex/hivex-1.3.24.ebuild
new file mode 100644
index 000000000000..fa123690b8b4
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.24.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32"
+RUBY_OPTIONAL=yes
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit perl-module ruby-ng python-single-r1 strip-linguas
+
+DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
+HOMEPAGE="https://libguestfs.org"
+SRC_URI="https://libguestfs.org/download/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="ocaml +perl python readline ruby test"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	virtual/libiconv
+	virtual/libintl
+	ocaml? (
+		dev-lang/ocaml[ocamlopt]
+		dev-ml/findlib[ocamlopt]
+	 )
+	perl? (
+		dev-lang/perl:=
+		dev-perl/IO-stringy
+	)
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	ruby? ( $(ruby_implementations_depend) )
+"
+DEPEND="
+	${RDEPEND}
+	perl? (
+		test? (
+			dev-perl/Pod-Coverage
+			dev-perl/Test-Pod-Coverage
+		)
+	)
+"
+
+ruby_add_bdepend "
+	ruby? (
+		dev-ruby/rake
+		dev-ruby/rdoc
+		virtual/rubygems
+	)
+"
+ruby_add_rdepend "ruby? ( virtual/rubygems )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )
+"
+
+DOCS=( README )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die
+}
+
+src_prepare() {
+	default
+
+	use perl && perl-module_src_prepare
+	use ruby && ruby-ng_src_prepare
+}
+
+src_configure() {
+	use ruby && ruby-ng_src_configure
+
+	if use perl; then
+		pushd perl || die
+		perl-module_src_configure
+		popd || die
+	fi
+
+	local myeconfargs=(
+		--enable-nls
+		--disable-ruby
+		--disable-rpath
+		$(use_with readline)
+		$(use_enable ocaml)
+		$(use_enable perl)
+		$(use_enable python)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+each_ruby_configure() {
+	local myeconfargs=(
+		--without-readline
+		--disable-ocaml
+		--disable-perl
+		--enable-nls
+		--enable-ruby
+		--disable-python
+		--disable-rpath
+	)
+
+	export ac_cv_prog_RUBY="${RUBY}"
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use ruby && ruby-ng_src_compile
+}
+
+each_ruby_compile() {
+	# -C ruby deliberately omitted as we need the library itself built too
+	emake
+}
+
+src_test() {
+	emake check
+
+	local dir
+	for dir in ocaml perl python ; do
+		use ${dir} && emake -C ${dir} check
+	done
+}
+
+each_ruby_test() {
+	emake -C ruby check
+}
+
+src_install() {
+	strip-linguas -i po
+
+	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
+
+	use python && python_optimize
+	use ruby && ruby-ng_src_install
+
+	if use perl; then
+		perl_delete_localpod
+
+		# Workaround Build.PL for now (see libguestfs too)
+		doman "${ED}"/usr/man/man3/*
+		rm -r "${ED}"/usr/man || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+each_ruby_install() {
+	emake -C ruby install DESTDIR="${ED}"
+}
diff --git a/app-misc/hyfetch/Manifest b/app-misc/hyfetch/Manifest
index 05a961c4da0b..3d433ea1abce 100644
--- a/app-misc/hyfetch/Manifest
+++ b/app-misc/hyfetch/Manifest
@@ -1,9 +1,9 @@
-AUX hyfetch-1.4.10-config_fix.patch 458 BLAKE2B af8e1dc998f2353a3883d7f6482e60cd7b5571cdaa1cd5022c1ea159b7b6e10a8fee8b98dbeebc83ccadf1c8ad1d4be6830dcc54609bbdfc9c813f0582b91b52 SHA512 76b6049795bf90c0e6a6d9e9b207d97abf994bcf8ed806dd10b56017bb0c396ff0055de47670b1b9580000f880bd0925e42e5cf5a00dc5dae030c17ea986cef6
 AUX hyfetch-1.4.11-neofetch.patch 757 BLAKE2B 76191ff1e69315294bc87ffb0e7652f286411ecd9455d6c2f7501cf1538665bc0ee0ecd4a2b46a4f9429ddb87278fb6e2ba8a66ff2bbe66263b2a2b58815db22 SHA512 7672d81a5700c17d80411dffd8785651a2860fbea55abbffa074c041d59d196c78e0de3fd95fee5506703afab9c7c955a47d751a7e1d4e74c5cc5c27c56ebec7
 AUX hyfetch-1.4.11-pyproject.patch 3720 BLAKE2B 782a79e425230e8233cffdc80bd3b67d24591b9a1cf78d06571dc3cf6b106d365fcd9e9acaeb605db76b4e7fd7d9a6e7ce3e7ba2535251db96dc74e5bac6f9b0 SHA512 6503c9e3b8f2570e9d2a0483100fec81f820c9a1465460dc4baa55c1c83af89150932a87b2c6cba64cbb4c8c8ad50b11cb96c1f15a071498162372f1c8039c66
-DIST hyfetch-1.4.10.tar.gz 266471 BLAKE2B 294002c2cd986055f6392aa61bb8de1d3d558712cd327243e7c2e756aa6e00ff23372fd0ffcc60db8f978110a3d8d1d78c6f683e304fc65b19d2f076e10347f2 SHA512 3f44bd9c0b030b435949db0c0cbd4913e7ec15e857df0dcf2fc3b7d10dca0a4c8ecb9862157f60eebd15b7a1c233c51a74f341b440892e0925871e42215c80e0
+AUX hyfetch-1.99.0-neofetch.patch 757 BLAKE2B 496647f592fb7630569dbf27bfc5b918441ce687e7ee1f9cdd85885111ba5c0f6bf2415f12a0a0f56128f3c267a60cbc0bc97713fa8dbfbe3353d405e27e45b0 SHA512 39e051f8971af71408b484c1aa1efd6c80b51a04d03304ba1d135bf31521284c30b0296aea326c49e54a5b68e66a6c4bf9ddbbaa1c0a9a87623de09d6cd968ec
 DIST hyfetch-1.4.11.tar.gz 275741 BLAKE2B 0739dc7bc2a90989dcd4dbdd6d14ce8ba62def2a9e069ae16a3a1435118e3639edcc112fc3fa0b8dd54684744e500672c7397315b78d965b68da2f9b9f702b13 SHA512 13c757fed68c9aa1caa503553d6d29c0b68284029090b970b863dec3240dabb28a852ef0ec0f2742c6c268e30a15c48018a651e74ba0e6782b5aa14f2b1d1312
-EBUILD hyfetch-1.4.10.ebuild 1238 BLAKE2B b520677f1a2c28ed0631900823562533f68e929156618e4c237af9315ef9924f88ab48699bc5960de2f87727b8128ce48ced6f0102922f701195bff4993be6aa SHA512 14d47e35909e381cc446a36d125b7e9e015f840df57766dc392c3dcdfe5fca88503c247f2a734e1169b58f3675f1eacf0a24ac7e5e198ae92680b8fc51ec7644
+DIST hyfetch-1.99.0.tar.gz 315607 BLAKE2B 73e44d936124c993251b0d5f7261a1707136aee8fad8b1c660c0932223636db6cfbd1c6747bd16ee94370d6578e0220a96fb58c608ca26791957e855bc70deca SHA512 e6d662ab028cd159e69b09d2929fb7b28d7ce470d2d6c7a5ef9af688ee7ce973d893d4bb13e70be0846a5d0d5808560d92608014d877113166a5e8af11ed8275
 EBUILD hyfetch-1.4.11-r1.ebuild 1589 BLAKE2B c9614de74267eb4c6e15eddf5073f345e96d2bce4eeed169083e6b8ecd82bb202a1aa6fd6dc0b46f532abfbac8fb67a1e8808bc01b9e55ec0e93217ce92c63aa SHA512 f6778e5a5f554b06d58c86b471c5a4f6dbcdab4e2463e3da2677b1e8507f6a2f07a168f8dad2e973c1b8cb4a355627e883bde82303fd6b2b31ff70e73f61ba82
+EBUILD hyfetch-1.99.0.ebuild 1485 BLAKE2B 2edbca1c32dd59ea03169a2d44a363671c9d8da79a471976f5246d16faab8268c93e39237b0802a3c3a222c9c5ffeacf222b51f2f982f7544c3d5237d3cf6913 SHA512 1dfd777380579df4b1aadac2ba4a5bae33b54c49d92bf096c18a7769af8c04ede9f62711e20040318644463b9e53dd29c4ddaf5cca4093cdf39bea1aac813022
 EBUILD hyfetch-9999.ebuild 1690 BLAKE2B 0de1fea52d1d5cc86d54fa005851f7cbfc01047114abbb0be3f3e83cd861e50b022eb411c48a7b9e32fde47c04ed3d35cdec9468168495256162df52c6e73551 SHA512 de22e49b2216ee4e8a871ff180963b3c60d5f2a2ce68a4c4c2b4ddd5b96821abec8bee229909bdfddf8a32ee410039a3cb8945d3227f4c91b9f54f95a06b14ad
-MISC metadata.xml 789 BLAKE2B ef77de73030b9f76fe7d11cf6aca05d795ae116881ee0d6d9ebc0cae7859e38736beca8e37067b32df0a3b063536dfe52d234e8af0005766cfa824d635cde771 SHA512 d40d3e0dc8be25f27b076b3b6a17a957a4307e9d585c1776717b1aceabaf83533bae0e2a4d7d8f8d904beadc4d4e634429bb87ce23445eae15ebe727d728cfa2
+MISC metadata.xml 780 BLAKE2B 63938d07f534bfe39391dcc8bdd0106a4c86e2cd203544823030ad48a68122c2dfa81e09c344a5782c41ab56c0660721fe5669bc7e2a467c860aecfa11d1bc0c SHA512 0d4b6351c8c0853ef7963e5c80f0400b417b4ecfea41108e235e484b542c6a197c0a50a9efdf9cc395fe2ff3aea0c08ac517ff04cf50a547b16a36d5f52ba109
diff --git a/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch b/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch
deleted file mode 100644
index 955eaf60ca30..000000000000
--- a/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-check_config uses the global constant CONFIG_PATH instead
-of the path that gets passed to it.
-
---- a/hyfetch/main.py
-+++ b/hyfetch/main.py
-@@ -27,7 +27,7 @@ def check_config(path) -> Config:
-     """
-     if path.is_file():
-         try:
--            return Config.from_dict(json.loads(CONFIG_PATH.read_text('utf-8')))
-+            return Config.from_dict(json.loads(path.read_text('utf-8')))
-         except KeyError:
-             return create_config()
- 
-
diff --git a/app-misc/hyfetch/files/hyfetch-1.99.0-neofetch.patch b/app-misc/hyfetch/files/hyfetch-1.99.0-neofetch.patch
new file mode 100644
index 000000000000..4f1a1f6a3b5c
--- /dev/null
+++ b/app-misc/hyfetch/files/hyfetch-1.99.0-neofetch.patch
@@ -0,0 +1,22 @@
+From: Cat Kasin <cat@aulucya.gay>
+Date: Thu, 23 Oct 2024 19:31:10 -0700
+Subject: [PATCH] use system neowofetch
+
+Signed-off-by: Cat Kasin <cat@aulucya.gay>
+Forwarded: not-needed
+
+---
+diff --git a/hyfetch/neofetch_util.py b/hyfetch/neofetch_util.py
+index 17829ac..1fcfcfc 100644
+--- a/hyfetch/neofetch_util.py
++++ b/hyfetch/neofetch_util.py
+@@ -254,8 +254,7 @@
+     Run neofetch command
+     """
+     if platform.system() != 'Windows':
+-        bash = ['/usr/bin/env', 'bash'] if Path('/usr/bin/env').is_file() else [shutil.which('bash')]
+-        full_cmd = [*bash, get_command_path(), *shlex.split(args)]
++        full_cmd = ['/usr/bin/neowofetch', *shlex.split(args)]
+ 
+     else:
+         cmd = get_command_path().replace("\\", "/").replace("C:/", "/c/")
diff --git a/app-misc/hyfetch/hyfetch-1.4.10.ebuild b/app-misc/hyfetch/hyfetch-1.99.0.ebuild
index 5584d2553d7b..5361fd610c69 100644
--- a/app-misc/hyfetch/hyfetch-1.4.10.ebuild
+++ b/app-misc/hyfetch/hyfetch-1.99.0.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit optfeature distutils-r1
+
+inherit optfeature distutils-r1 shell-completion
 
 DESCRIPTION="Neofetch with LGBTQ+ pride flags!"
 HOMEPAGE="https://github.com/hykilpikonna/hyfetch"
@@ -14,20 +15,28 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/hykilpikonna/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.10-config_fix.patch
+	"${FILESDIR}"/${PN}-1.99.0-neofetch.patch
 )
 
+python_install() {
+	newbashcomp hyfetch/scripts/autocomplete.bash ${PN}
+	newzshcomp hyfetch/scripts/autocomplete.zsh _${PN}
+
+	distutils-r1_python_install
+
+	dodir /usr/bin/
+	cp neofetch "${D}/usr/bin/neowofetch" || die
+
+	rm -r "${D}/usr/lib/${EPYTHON}/site-packages/hyfetch/scripts" || die
+}
+
 pkg_postinst() {
 	optfeature "displaying images" "media-libs/imlib2 www-client/w3m[imlib]"
 	optfeature "gpu detection" sys-apps/pciutils
diff --git a/app-misc/hyfetch/metadata.xml b/app-misc/hyfetch/metadata.xml
index 3a8c9e49c124..b066103e3431 100644
--- a/app-misc/hyfetch/metadata.xml
+++ b/app-misc/hyfetch/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>baileykasin@gmail.com</email>
-		<name>Bailey Kasin</name>
+		<email>cat@aulucya.gay</email>
+		<name>Cat Kasin</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 00ef253716dc..a80b6ca61656 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -4,6 +4,6 @@ AUX icdiff-2.0.7-tests.patch 784 BLAKE2B e9551960101822173623eb411d67116d6691cee
 DIST icdiff-2.0.6.tar.gz 39715 BLAKE2B 931799040c158c522b3788941bddaef074a5e769cc56b6d80ca9515ee0c437e0ec0b7453c7409133c5567b98e7d41355e1d9f647d1939c78d07c2bf4c010fa5e SHA512 23ed93cc68ae44e661d61cef7e489249fc39e9f8fd18cac5551e89a713aef8cd2ecb37b0f301f543a4ba7003c74b5a311430ab8666760a76ee8441a4ac920ff5
 DIST icdiff-2.0.7.tar.gz 40150 BLAKE2B 54e8528a5e0fec305787a42657dc6f54849a1732509b231ecf948856f4e681ba75654bedf7bc964d96a2b1c2e95d672c837e1ebc55c9a291f572c91600a2e4aa SHA512 0fb3a8f91120ecd5dd55254fdea0f055bc46905c3b257efcd1b8b0b47927b2b2575b7255e3e260c97b76cd2f40548c8a3653a622a7a1aaac528a4cdae64a8b16
 EBUILD icdiff-2.0.6.ebuild 693 BLAKE2B 5507251e7bf057fd9342fd201a0b3697727347d705b53033ea0fe17ecffaa856126cc2c71d1016cfa67eeca6392ed0d26009047089de5ee5a83ed9025e6c83a5 SHA512 2de660d451e75f7a652ab2712e05d731b0a4661756669cd18aa9000fa64d705f018a9b9c14a51b12ee9d805e204d895342fad406b7318517aac36cc39ef4347a
-EBUILD icdiff-2.0.7-r1.ebuild 694 BLAKE2B e2ff92cde821f4c7e9ef56c68f3b62287e52a8596150f59dceda5b97d7af7f306cedd15021dc6759835e2ed2147ac8d453b2cd349154f864041a4fa05093f032 SHA512 d6712340a414badac4fd5d906ae80f79031772ad0984be87dbff31fa92a78ce7a69b1eb5d1cbec00b0cb3755bfd30ecfda90fb63c469fa3c3eeccc3c1cc91710
+EBUILD icdiff-2.0.7-r1.ebuild 701 BLAKE2B ce95688ff2e6b41f2af73d1cafc7427294f54f14dc60ffa5d95ee87d1e0f0051a5df2c1d6f4ea7a55c60f52f29b2dce1d25676b1c9be575f5a94adb72d0ea0d3 SHA512 2526c38c21b7b645f1b1a3aecb563c784c94ea22f02b4b2fc03f525f5fd5b0e10890adc32ad8db075a6a83b61e8d737380263eb04f17807c06d91b018b2ea792
 EBUILD icdiff-2.0.7.ebuild 693 BLAKE2B dcbdc93344a504bab496fc4def39d5525f7d435ce02e47f231bf0a30c1d1db3bd9c4bb3e33f31856ddb7234d6b30b20168239070752b17c25633c969f02f007b SHA512 eee62adb2eceb2a0de770c0c82a573b05e267d89064962fae2e4236d663f62f0cbab74d2ea9cc5a13f7ccbf40315049f2200cb6ed3d3a1b543c50c3843109085
 MISC metadata.xml 343 BLAKE2B a9942d59eb56cb6389a59b3d5c2995a5131f53cfe82ceabd2b608a57e9110066977b5eb1c7413f2a76a147c64a7580a4b75c76b2f03abd43d667b5a1d6aa8a23 SHA512 9b0da11632fa80fb598a5fe673cb15bdf3612ad9bd5cf84d9f5e2aa7217cd133039db509daabd6d98fac202c453b82ba40bd927401a346cf4c6039c47b45e697
diff --git a/app-misc/icdiff/icdiff-2.0.7-r1.ebuild b/app-misc/icdiff/icdiff-2.0.7-r1.ebuild
index 8b8fd9dff54e..d08f8f95a65d 100644
--- a/app-misc/icdiff/icdiff-2.0.7-r1.ebuild
+++ b/app-misc/icdiff/icdiff-2.0.7-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 PATCHES=(
 	"${FILESDIR}/icdiff-1.9.5-tests.patch"
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index b2c75e1bb04f..e7f491d7c83d 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -3,5 +3,5 @@ AUX inputlircd.conf 75 BLAKE2B 5de0021457cc642073bd3491344ed404c59d8cedd80c6a451
 AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d1272428c874d0d7daad69b93e3206b271e75f98f1fcf1d57d5a5a44bcd39969d44bafd5c88bc575f SHA512 0d6299a2b1ffd2b6161013888e06a59b531769ce2723b00c1ba55e9420ed4a6055023b1d892e372d1d9c438eabe446a6341adfb2dd9b19371727d1c92b5c27b1
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
-EBUILD inputlircd-0.0.1_pre15-r3.ebuild 895 BLAKE2B 220078875f6e8f1030982d654a58e1b1af35b911a9e107132bcaabe048bf2bf81f5539cc516e3b49cbb97067cc9ff3fb924d7e2c07b06785b91dc9e653911501 SHA512 98fed4f9bfc51f7aa655bac2738b8b7b42aa599f77f9394d4199a620e7ab3c31be27b6529ba30629e1bb52bbb94f6f7426b7b7e0a34d4c15d98f6526b42f1e0d
+EBUILD inputlircd-0.0.1_pre15-r3.ebuild 889 BLAKE2B 2611c2a9b0b735eeb4ff031622f7756b819f7f76878317ca309f89f2835dd3d12a553e675b9cf6a400d09d3a641e04d5edd0e0887f38af096629d2cc260fdf3d SHA512 dc8b8bd267d5821237b29883ded79104250a2eddd273269f0b41b649f0ce6fd4a5be388234dab22d4171d12f40b849820c62008092c8ee4f98b5f39b4a6544f5
 MISC metadata.xml 259 BLAKE2B c37e63028ff67345f2840423e9d03b3e011b4132f4c80ce8a4b6c94e9ad069be10dbf4e6f9a96a848619b673dd0670ae41fad3e51ce382bee44e097d2245bc4b SHA512 33692b38a520781ebab5dcf3c02f4b5a082a3e4d001527e7c7f6e283eae28aff68ce0fecfce53809b9705d84cb110ff8c9bed38f40cfc918d4760984a94f9a96
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
index c7da09f84652..93c1bcc0c88c 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 2a50a3edbcde..4125a27fcfc6 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,5 +1,5 @@
 AUX jq-1.6-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3
 AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0
 DIST jq-1.7.1.gh.tar.gz 1323338 BLAKE2B 17e3b68e23f9a7f1aa8749ede6c0b8fe435990899886f0c96da36d130c17d13609ba7f910321316f0c3b35985360f8cb5e6a3b12caea5e9bc7792e128798f137 SHA512 af9c444e5306423182f467a53acdf45bb8aefa058a47f490ce16395f0aebfb7627e3843f65e96f41cd9d4b72b8ad274ab0bdb061abc6990b1158f86d2256d4ec
-EBUILD jq-1.7.1.ebuild 2217 BLAKE2B e61a4350121fd8f13af941c30d3995b9932709dd1bc479666cbc1b873cb653b4a83e494dbe157440e3fb61e1d92b0a68383e0c53cf16d19f0728d1b31207780d SHA512 4ccd85145e3613621ce47e3d4c6e2fce307065f29f2f60bfce8dccfa10d016574a0a376581ff608c752ac71b47c1c7215049f86fe32c3882b6dfcb0d0c8dba69
+EBUILD jq-1.7.1.ebuild 2211 BLAKE2B 5a378e10d88c80323dd577124c780dd81cdfd816a577ff03ee6a70bdad9047be15045e259e8a766b9fb3638089120557434f71411b0e208368515288a558e8b4 SHA512 20f88a0e9b3ae298a30bc9048925a865946763c58b7a6ff2c7e3d2130401314f653a78505ef2a4213172e374dbc02c1ac88ede61e59e44d093806353676bff28
 MISC metadata.xml 619 BLAKE2B 07d8852baec2c77bdef39bd1bb742ce1148dfdde1c76af80727ea7dda9ebfdc61ee24e3992c3f868c312fb258b8f7a2064996b3a609a801eaeabe09b7a10f6a0 SHA512 10824dca3462dcf96b2025d71f47dbddb3b1fa7ba864fcb5d0a7782423213323143c7c224174b1ac9d69e0c1094285286c213809f023d25542a865fc064d1b04
diff --git a/app-misc/jq/jq-1.7.1.ebuild b/app-misc/jq/jq-1.7.1.ebuild
index 81be3fadd8dc..b657985218d8 100644
--- a/app-misc/jq/jq-1.7.1.ebuild
+++ b/app-misc/jq/jq-1.7.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
index a2ab9881dde1..96f5f60941bc 100644
--- a/app-misc/kryoflux-dtc/Manifest
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -2,5 +2,5 @@ DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125
 DIST kryoflux_3.00_windows.zip 18211783 BLAKE2B e50cfc196d37216a7c929c4aa915b5cfeb7f38805076aed4e1bbc9dbfcc946fce18db0a2e2020d77cf581e2df174f2e3b6eb2b3d9060795501b1769d258ad05d SHA512 afa42fd3460d796dd3694059a86484ea94ab3084c52dc18d6f14e5b790d66e0f13514fbe2efc5c32abd3e471cdb0ac10cc3f7bafcdfb41371a6caddda83e2a00
 DIST kryoflux_3.50_linux_2.tar.gz 15309688 BLAKE2B adc315fb29c35b7e16f07ebf9bbd7f8939d92fd5db875f8bd3ed77b8a6d69a895c4be5c94eda571844a01e06f3c594c11a7f08632a259abb7192daffa66bad09 SHA512 91d821fab98a7582d299c9783076e438921621193d87712d676472f588a43a0d6394187f203a939619c8336c45650ec6e9f9f5f45dc4255d56c16f512af98352
 EBUILD kryoflux-dtc-2.6-r3.ebuild 2582 BLAKE2B 1c2e93de9e4d0c9875f7790d439b6548958ceea5a6f6b09f429a9a6f5935fb2c83212db4ae70c01cf387fbef44c05267749d71f435f45ac93efe3867b736a39f SHA512 1ada41066276011c96dd2e4c239ce2c845c063338bb8a02897b8211af2cc5b5bf540c69fc2015e799c5821f796c9a1407503001e71944961c64b941472a6b6fe
-EBUILD kryoflux-dtc-3.50_p2.ebuild 2730 BLAKE2B e57f078aa7e8ebc8f6b8850382795e06480b40f7776c50b088fee00e3eb1d0c37e4b014881a305795e51d3d4b8ca2543c1018bc50e5a255b49712223a76d1fe9 SHA512 aac32f24523c0f2aaf73894a1b88ab01d68f0fea989ed20767dcba02904ed9e026ea0b0ee4c48636ab416d5d7e28a6b008ffc691712e176971baa3e9212a8409
+EBUILD kryoflux-dtc-3.50_p2.ebuild 2728 BLAKE2B b6b90f7e020c3103cb9adaaefd41dc0cd7dd716b421e437f2cec506e33f9fba4ccd37627ef702ac2840aa2551d7b1c51d8f8f6c5b153591f7cc22ed83dbdb6be SHA512 54ec5561fc3bf411da8f7d05e6f5a3681543636d59e6ff5c595d99ddca4b76f1cd5da02c454c7f481202535798e8ee0ddf6c456476a731818334cf9070a26804
 MISC metadata.xml 413 BLAKE2B 1cb4e2bd2cc707542fde7a9c04ec455a349eb521f26bc2704a873578ff574dfaf8f74721c86ad9cfdd174b218ef31836098f889c0f8fc5c43ba9be75279740ee SHA512 f16d5eb1ae4f08cbf0876dd461bdbe8bae6d804790589b293f5998cfc7dd630e7e9e8b17183cdd658b47ae8fd8a37a76b750f868245007817209cb3a7590e2e2
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2.ebuild
index 90455e68024f..5bf63a64383d 100644
--- a/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2.ebuild
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2.ebuild
@@ -37,7 +37,7 @@ QA_PREBUILT="
 
 src_unpack() {
 	unpack ${A}
-	unpack Linux_Release${MY_PV}/dtc/$(usex amd64 x86_64 aarch64)/${MY_P_DTC}.tar.gz
+	unpack Linux_Release${MY_PV}/dtc/$(usex amd64 x86_64 arm64)/${MY_P_DTC}.tar.gz
 	use gui && unpack Linux_Release${MY_PV}/dtc/kryoflux-ui.jar
 }
 
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index eb8b42deaece..5be83a058011 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -9,6 +9,6 @@ AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-6.0.tar.gz 117486 BLAKE2B 3340b893574f0c18561b208824cd80cff19c387d981af6ca63f56e691cebd2030e058ef367d91a999fd662592582da38b21a5a31f3f8364dbd87a43bd2c2b608 SHA512 ebd7513f90e79bb21acd984c671a1d1ce8421411d2b2948b01e6e08f7c9826184f9b9d528e0cfc814df8d8015d444a09c45025c344115ac9a6c2cff5743f03ad
 DIST linux_logo-6.01.tar.gz 119482 BLAKE2B 369e99ab4fbc77fc41d3598c11a4a5c8c1b7bdd246408b0fab5f623fb6a701edf6e2e5f2ce494e9c8aaac3d00cc47525a0daf6525cf9bbbf068d5eeba93a9f6e SHA512 1949758289b79baa9219665f59f92edab20dfa4c3e33fa32ff99ea1da36eccaf65a5ac1135b70cb8309c13d722a651c639c210383510347789f949e9f5148809
-EBUILD linux-logo-6.0.ebuild 2250 BLAKE2B b5b761be7192b4feed66279c7f6030f98b1bd3e9170ce821d7176a1df082afbe6b5b0507e0bfa2d544cfd5f281bd3e90201b9dfa2890f882d64d5ee252b2723a SHA512 60247bed264de2ee22f4ef5462011b0444c86355df9b521621df6a5a0937adadaca6573a33ea6caafb2e42f15c4a2a629e1fb594e59d5feaf0a13e8119c30fb2
-EBUILD linux-logo-6.01.ebuild 2260 BLAKE2B 2de4adf28bcc41e219bd263d3a8c488cf3c01f0273900d0b89a5ff8b9814ed96f524f6cec16ca917ed6a8201c1a2067432b431ecc1ec42372b0dcc9bec403cf5 SHA512 90ac0336cbf59f7cca2535b8448259a2116b4b0003b1c8b6ec52900ad59e3240d31059638613c7f14e34f58795355322137023edbd70f6b9114c6de97bb9a608
+EBUILD linux-logo-6.0.ebuild 2244 BLAKE2B 37556a529f4b37e30d69af0aaf288240bad19f3e64b06d2f6974c44a2077f4e3de09e801fd53cc8bf355f3b4901471b4ca772b70b9029b4336b04b86e7605d67 SHA512 eb954c5cb89987a37c13111198123c9278e423e8c0d71b17a94ee53564e8f118119f8ec91331bb466ee245b9174845a21e3e150e7b5f14ad0b2675c1ca2c5c40
+EBUILD linux-logo-6.01.ebuild 2254 BLAKE2B 8c845f3a355a5387c54706d161cca36317a991d97970e795037e9965ef35e2655961c1f9e00bd6bb741b518deea6c32df2bf5cbc2fb8986a40889651e4f0cad9 SHA512 eeb17f3de6526d5ee03b3ba6d1338eb98b63fd3d384322434243678d6fe290da57c1c2c433b3c6f26dea5c2d7e7db3a406bd3dc247619bd2594b6895841633c4
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/app-misc/linux-logo/linux-logo-6.0.ebuild b/app-misc/linux-logo/linux-logo-6.0.ebuild
index 39a3fbf85e07..b3a457390887 100644
--- a/app-misc/linux-logo/linux-logo-6.0.ebuild
+++ b/app-misc/linux-logo/linux-logo-6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/linux-logo/linux-logo-6.01.ebuild b/app-misc/linux-logo/linux-logo-6.01.ebuild
index 5afa22d83281..2809a3d104d3 100644
--- a/app-misc/linux-logo/linux-logo-6.01.ebuild
+++ b/app-misc/linux-logo/linux-logo-6.01.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index 251449932cd1..dc73b03adc1f 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,8 +1,8 @@
 DIST livecd-tools-2.10.tar.bz2 9999 BLAKE2B 866bb49d70b8008df30357beb0be7692cee44053bcf25f9544f67ad3ef1f53ddd38604d70ea7db791e6a81cba8de4bc62cd31753bacd01d45d5e6cc558da3d7c SHA512 dbd66a9a6e94b90d06231af2e4d677d97394b765502a72e81a7dcc7ad591d458ad28c69f1de96dc8c9fb10e7ac7031f6595aa89ab8d343f6bfcde875889fdfcb
 DIST livecd-tools-2.11.tar.bz2 20785 BLAKE2B b2abca39a296a399e7328ca5ab247dcf0c79053f76d3105aa7d56430dc5cc26508653252daa9b50022969e91ea881b8bc752788249bd3c80899a591557546339 SHA512 f3a9abe439911de8b52f9255609a20308c88f415c8eebf9562f038b5770640786e3bd60945d069fec0d43b1b713716e699df7578f381f6475e9fafbfe5398374
 DIST livecd-tools-2.9.tar.bz2 9987 BLAKE2B b24ee78aa0111950322b4424d630f640aa2d525c5c87b5ff3397628ed3e1c55eb2dbb71c32cbd5e57fa3a4310af1f541c1acd370b4f829dce49d2beb6f1be442 SHA512 89e892dfa8581e0f1f8208fecb7a686f19da100751e3430b014e90455c391efd2a3d25f3fff046576f8f739090715a2c14bc8c0b1fc9fe7db03455d84426a889
-EBUILD livecd-tools-2.10-r1.ebuild 1070 BLAKE2B d5124efc978a42bc5e9e0ad47ad3ecdee2b818819e10b97fca188a6a017e50b934c972d8405b8496f2d7ded9c971772780407c843e6995effa46d995abc07c37 SHA512 d2928742d30e45ca35442bbc9e21795846ace30712db59db1b5b09fb7d65898e7c1625f94488e899ec8976f79566af9fea8ac5d49a753fd040b3f9821f1432df
-EBUILD livecd-tools-2.11.ebuild 1301 BLAKE2B 3036822b1bbcce1bbfa15c198404880bfbd841a420f84eeefb5fe7f223c3c79107b239581cf667118b21deda5aa36ec67a0fb238403a33136984dfa7df9bb89e SHA512 002dc48403d9ab23c9ca57f4c6e70ae8b270877a45b24840943e1b7f242162c62916841d358772e2f3d64b5a5c65382d74ea122098ce8d24c7814314437ed9d2
-EBUILD livecd-tools-2.9.ebuild 1026 BLAKE2B ce880fcb8ccedfab74688952d6ff2250a3fc0c0a98a3101fac95d1a7d3420ef951627df5c7fe7271fff6b31035ef87fa2ca13577a379578b43fb2e9f13a0ba82 SHA512 2554192c952b4a3ca201c7cd430705b66cf47fd4c06a1b69a7a4aad0ab45ea147c9bdbe1ebfa21b6d888fc42c026c317bb2a994072c3ce6905d3fc8076ee620c
-EBUILD livecd-tools-9999.ebuild 1301 BLAKE2B 3036822b1bbcce1bbfa15c198404880bfbd841a420f84eeefb5fe7f223c3c79107b239581cf667118b21deda5aa36ec67a0fb238403a33136984dfa7df9bb89e SHA512 002dc48403d9ab23c9ca57f4c6e70ae8b270877a45b24840943e1b7f242162c62916841d358772e2f3d64b5a5c65382d74ea122098ce8d24c7814314437ed9d2
+EBUILD livecd-tools-2.10-r1.ebuild 1064 BLAKE2B 17092ce5625c9e9835dc4650c9feabd6b1e15468a9282421626f44c4a36a1de3ab3b4c3fa9b4f39b0d5e0a9a3c1bf9503151f5affd58bdcb59e2e63969d00b6d SHA512 7f0f5bd97c1cb0972645a2c8fe380f126836a84b4fba07ca6bec3bf5e73d905935afeaaeac4f341a7900aff35cef81c5ffe6c0d1beb4c523c9f2eaa67b8344b2
+EBUILD livecd-tools-2.11.ebuild 1295 BLAKE2B cfb5501de9c2da3c34d32b5793c53dca35ea2f8b989b8616ccb71816d7287439bd20bd8c01f92b4724ee8655dadca34f28b142c7d79c9552b9a4bc0561e70d21 SHA512 905f48eba7587c108ffa2069565bea1f4c1c44edecce3f7f8b972372ee15d9f3ab8dff5c2ffd6250ce1745d9f4d8ca53c08f4cebbb68c7e5ac49f2a94b9cc5eb
+EBUILD livecd-tools-2.9.ebuild 1020 BLAKE2B ca70dd3226f92e26ca7fa3bd3d7e6ed247713c6fdc11d9a9fa8db4169f5ef01acfbbc923b369c1e79e25fb2d7b3c22eddd3ed107c37efb5f71e1af3905d58bc7 SHA512 b176dce2b41601febc3be2727239d67aca852d3cefbd96570c0ff63cba3cf17c9ba7eda3a274e4a35c224ecd3af60a6ccb5416253fdbcaf5a289c74c2d8ba3d5
+EBUILD livecd-tools-9999.ebuild 1295 BLAKE2B cfb5501de9c2da3c34d32b5793c53dca35ea2f8b989b8616ccb71816d7287439bd20bd8c01f92b4724ee8655dadca34f28b142c7d79c9552b9a4bc0561e70d21 SHA512 905f48eba7587c108ffa2069565bea1f4c1c44edecce3f7f8b972372ee15d9f3ab8dff5c2ffd6250ce1745d9f4d8ca53c08f4cebbb68c7e5ac49f2a94b9cc5eb
 MISC metadata.xml 257 BLAKE2B b9901b8caec50c3348db0f5bf23d8b69576570ab12219f1360d78f98ca20b858a0324ff0cff52f85859ce8ee383d6837a670f3957f8d475cfb80eb4a47427c13 SHA512 c89180536fb53175fe55ca76a3fe9d0fece5ae0cab281e0ad0fbfb4135bab69a0dde45f97998372d3d2ddc16c948f074f45661fb1b946265fc6b94aaaf880489
diff --git a/app-misc/livecd-tools/livecd-tools-2.10-r1.ebuild b/app-misc/livecd-tools/livecd-tools-2.10-r1.ebuild
index f9680280e457..fd37718ae458 100644
--- a/app-misc/livecd-tools/livecd-tools-2.10-r1.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.10-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm64 hppa ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/livecd-tools/livecd-tools-2.11.ebuild b/app-misc/livecd-tools/livecd-tools-2.11.ebuild
index b088e11e6125..f33e2bc4c01c 100644
--- a/app-misc/livecd-tools/livecd-tools-2.11.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/livecd-tools/livecd-tools-2.9.ebuild b/app-misc/livecd-tools/livecd-tools-2.9.ebuild
index 28340d004b27..343a97482b54 100644
--- a/app-misc/livecd-tools/livecd-tools-2.9.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/livecd-tools/livecd-tools-9999.ebuild b/app-misc/livecd-tools/livecd-tools-9999.ebuild
index b088e11e6125..f33e2bc4c01c 100644
--- a/app-misc/livecd-tools/livecd-tools-9999.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/logiops/Manifest b/app-misc/logiops/Manifest
index f0aaa59c1cda..02080543cadc 100644
--- a/app-misc/logiops/Manifest
+++ b/app-misc/logiops/Manifest
@@ -1,4 +1,4 @@
 AUX logid.initd 509 BLAKE2B 950294904989544d1dea65f516493a986cbe8556a17e66f7be0cd33f19d514b38e820c61241d32785d6f3607d6f2c6a2af4270ab60dc72dfcc5a5ffa7b91779f SHA512 bf98e11c87d9486dd3f59494eae7fda9536bc6a90166bf8fa5c4226d189a86bc83aa9192d0b8f6e962cdc7d0f76e295d50c7c345f9ae445926670ecfe3b6830b
-DIST logiops-v0.3.4.tar.gz 117080 BLAKE2B b68d470abfde28cc12cd553889b0150c99e072f157b8c7ef1c8a1850b74de48fb987942e4bf36a1f75d612ff639f304d2cc128b94f1f2bcf1be4d4eb4867d142 SHA512 482a26e6669aa3e35202e2281a41d0f4976a1f989fd5457d337b291573461198006b8a8d639ccdf65ed18749d0d0bbab12f8d3514d75964d3616851973c08e05
-EBUILD logiops-0.3.4.ebuild 1457 BLAKE2B a0e21d15f1e968c717bb2c0cf16673f0a4b62681f9173972d10cdb01e08e374fa9c71ef94df99356f4f9c1667e74a4686513ade95ac186df035686670928698d SHA512 2107e5c42f30b74f3e2c7e926b3536f4f47e94b5e84b7b7189ae6deb14e389df223473b01088649ef41512956bcfdf5a82f9f6a97672bdaa4c1bc1e45a81b0b2
+DIST logiops-v0.3.5.tar.gz 117562 BLAKE2B 113ecc82a1a3c459a287800ea76f6cae6939df92dbce5b6314d6a180a1e6842373175f9ed895c26ac0c5846f1672032825a7e25769fbf4c1089a7836101cbc4e SHA512 92dcb40e9df296eb6e61be80f6cefefc1d5cc7ebe1f18098844cccbb064ad583b8e1b4c0c6ddbf5315ae591624fe2c9d2273f45263b4e6c9d7a6b6c397241257
+EBUILD logiops-0.3.5.ebuild 1457 BLAKE2B a0e21d15f1e968c717bb2c0cf16673f0a4b62681f9173972d10cdb01e08e374fa9c71ef94df99356f4f9c1667e74a4686513ade95ac186df035686670928698d SHA512 2107e5c42f30b74f3e2c7e926b3536f4f47e94b5e84b7b7189ae6deb14e389df223473b01088649ef41512956bcfdf5a82f9f6a97672bdaa4c1bc1e45a81b0b2
 MISC metadata.xml 394 BLAKE2B 6ff8b462c12d3e99a5362e39bc7f9915d7ded195ade7e3006b49313722c69935dbf266154375d7438f7099f46b4773eee8093b8324304ab75fc26fd45090049c SHA512 31dd662e8c6b51205160dc491de0ce6f4b8665a435de337e2265ed7e846d2b3115eef0fc47473179127caa3aae8e663885f7aedf27ab1c905b432d293c6d9e71
diff --git a/app-misc/logiops/logiops-0.3.4.ebuild b/app-misc/logiops/logiops-0.3.5.ebuild
index 8cef364fb31c..8cef364fb31c 100644
--- a/app-misc/logiops/logiops-0.3.4.ebuild
+++ b/app-misc/logiops/logiops-0.3.5.ebuild
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 15ded4a5f6ae..349599ba8c2f 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -4,11 +4,13 @@ AUX mc-4.8.30-fish_fix_broken_national_characters.patch 2236 BLAKE2B 4d1b018106c
 AUX mc-4.8.30-mcdiff-segfault.patch 1534 BLAKE2B ff3904f22a3f46251833f259255abd15015d47fed685447fb7f42b4d8adc042adb3104b4e41c2bedc0552335e681ca5df7404cd9cd0e4066a8a84714faa718c2 SHA512 41aa773416a3bd2f035ed584b6179f237b216010bd541b1a881f95f25eb5d05abbe721af2ae3c64dc39916525ff284cf0c5bf2ddde89e4bcf3647f7c5cad4e2d
 AUX mc-4.8.30-musl-tests.patch 300 BLAKE2B 52dff36517ccd7643cf594e556b0f315081ed39d01735f6da351bdf3dadc70ce1b14e8320b5edb08a8ae1a2db533f1bea60ef6bb1c37bc24a80a0c671384349d SHA512 73b32f64c5976a1b4518d2cdb8c802d9a93c71aab3781c6edfc731d7088ac67e3a09687bc1cce8a3597117b333e13ba96c50c4b26a21f5ad4c81aa76f03cfb41
 AUX mc-4.8.31-musl-tests.patch 1979 BLAKE2B 33e3a27b1063f254e015129a8b7544b6f5c97492b886b0ba9f51166be41b1bcfc118288047a7faac64b7ee948c9cfbb61943ab7699670cfcc5e606cbbd50ac38 SHA512 b1bdecffe89a63e3a9bd19eef63db169a3adf96c3643d9bc8cd2101d8ec23c267b283449d2e164ff67df0551fbe7c48f45e00a38ebb3f513ef0c0b0f6baaf449
+AUX mc-4.8.32-fix-chdir.patch 3915 BLAKE2B d6e1a46b4ac8e9db8da309976be5fe3727ca4910a6543e14972e71afa284748b14ecaba1405fc6f86d4c6155d6d0e52779e4b13f8ed9c10ffa32652d768083d9 SHA512 847d9ee8a7d7468b2c17e376bbb82b1e90a18d25d835eebf31845da6124de037a5a8c87fb3291652cd327faf1d04bf7d7e94bb098db85c010b4e9596356d5742
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 DIST mc-4.8.31.tar.xz 2385632 BLAKE2B aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea12def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe SHA512 dc2272a0016ed782eafc78efda575b04d064ffa7984a146f3389dea81f4c7886647e7d1f097b547f7ae00190c10e35979a24400a6bb936c023f190a82934c12d
 DIST mc-4.8.32.tar.xz 2385648 BLAKE2B eb2ac2474c86dbcfe43b4f229cdc458bdfc9de2acf1d0206198721b56ec188010aba24063c1fc079ada295c73ab915786749be1ead599a582832ca649b9a8347 SHA512 f7f46e4f065331ede638a79c821ab5ef65952ba99cf71710d4282efa9ed7de75f06c786a8f8feb27d487417f438a48959439b40bb6456eb64796d46518a3f4a8
-EBUILD mc-4.8.30-r1.ebuild 3229 BLAKE2B ba2bc855289dffb0750eec94f045fa337b337e4863e96a4a3110c71260227fcd1e56530ab87deb87d69a19c579b1d446002015a19930d233edee84c48e326be8 SHA512 ba5d06fdb16fc8b7f925b021a3a99cc622446f241973cd7bc61c47bfafb80c511cccc58d494a23533e4f2dc3f322fe974f655b6d0cb39bd35a04549a3b1d1363
-EBUILD mc-4.8.30-r2.ebuild 3337 BLAKE2B ed90e75a4f486c9807fde430308f58d35a8aa90934f2e0aac4804c373c05dbf15bc10dd7912015d77d902dffbe544d9e61ce74ad8a263bdce53f546077a62aaf SHA512 939a3ec1016fd4fbb7dcf734751113a79a2ac91e444b0ccc00426c8c9fdbf5c0c904a7af6a49740cdab5211b4675942b3e35226a207ea09aaf16796009737ec6
-EBUILD mc-4.8.31.ebuild 3522 BLAKE2B 98ad323ae6beace1dc780e4c618ee8a84256fd139bb0489cba032848ec3079b7c1b315a2505c56aaa8fcbabaa1c42b08b71014f2bc5a6558f03c1407540f0016 SHA512 7bf5a44eb979d5e96381a622e0a994ceacc8299f48cd7cea3c0650cb965b4ab0745ed345578ebfbbb17ba3256fc93006e520845a46aa014d55439897b42ca809
-EBUILD mc-4.8.32.ebuild 3549 BLAKE2B abb1921da7477b6301b0b304a21a2c1c02e635ba28980a3892c897e3ac197aaf689ae86ed87ea6ca62baf2b118e52283ab93367c153cf70b45464ab48f473fe4 SHA512 957a41380fe0300dfdc808a6d451f302c66f4fcab150cb8586dde6144b35d3307915215f02365e113fb9574c1758bf4992a45a206a5fe6aa60ac986a81211341
+EBUILD mc-4.8.30-r1.ebuild 3223 BLAKE2B c9fea0e19733cc8608c97e94ab2855a533e354e59bb9fecd2d7c0dd386d03094bcc36db479775b0ef6099d5dcc0417a9facf7bfe31873b5acc464178471ff841 SHA512 ef1ead28d300d64e396b979a33c528abcc23e473f6136f614acaa5c6f1b85112d1d26db6552db924aa6199684c16f5eeec35e0ed4788a35c8b7a5bdb9b14a267
+EBUILD mc-4.8.30-r2.ebuild 3331 BLAKE2B 755c9cefdd530fae6614c65f7138dab9354260eaf5d25faeb815dc90836c1f631e6896e7fa4a51d781bb8a2f54b573cb19f070d06447491994ec0e0c0ae72158 SHA512 768de0ef01537742dbac911235d50b282a0487be6decac311a2bc3b8008c480ffbfd503c5b34d3a9f92a7914cd2d67f106d52e51c6d073b9ca119de49fcaf9d3
+EBUILD mc-4.8.31.ebuild 3516 BLAKE2B f6e992a30c0ad59747d5cd9c8a96dc48579390cc0f3ed6f2e00d08a11ccc868cedb69714d1d368efec48d335b30114f9f429d8e0b1ddd15ae375697a58107a33 SHA512 c35b165a9ca27bbbb9bf2a41f079250ef0da78b768f50358dad50ccc74a7ac58a3f4b95cee07421060dc00608225ea396c8f0072f2e2af57ca089b89cffc2674
+EBUILD mc-4.8.32-r1.ebuild 3572 BLAKE2B ecd96fac748caf770adbfee82ac8b1ea7ccdf4ce4217883325417611f35d92f55c26fced17967d34560c059ba1f86d741feaee9bdfbb49c4a1fa9f0ce84d248d SHA512 f6b5639fcec140627ed1d54886b62dd964db8940b9b4e54dd252a966a41d2adee91b8f0f1b205e4f561f6e3f86896a32f7cf556dac9c70d9f95550e3fb945456
+EBUILD mc-4.8.32.ebuild 3538 BLAKE2B c64e5884755a371c72ba092eaef81464469f635082f5faf755c6d833b565aaa8d547935ca370ab3be4461263ef0e91a2390503fd0e8196468eedc21c5ca91854 SHA512 5caecccf6565b124e8d21d7a3f69979ae0589dcd8c824cd49527aee91485de682625502c7ab6853ed99f316d1df8c16be2a58e082016bf45d76e95546d87516e
 MISC metadata.xml 675 BLAKE2B 706055e17dfe81af1715d1e5ee101e6486d8a0f1fd7791fff17c7f42fdcb1c3a559416c8e413b4c7ab1db6dd9bf2d4b94f67e8cdd035933c38885ae6ca42f8f6 SHA512 a86533b06dc0f64efafda59aa795ed3a5a9bb027bd4c1145d4aedc2af84cb1d64244409a0bcc42d5bb4048ed07190c7f86ebc0c31aa55d95c8837fde676d9284
diff --git a/app-misc/mc/files/mc-4.8.32-fix-chdir.patch b/app-misc/mc/files/mc-4.8.32-fix-chdir.patch
new file mode 100644
index 000000000000..9b74da211f73
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.32-fix-chdir.patch
@@ -0,0 +1,129 @@
+https://github.com/MidnightCommander/mc/commit/7a3a763f0ea07a825ca2af4642e31f9e358a9fd0
+https://bugs.gentoo.org/941099
+https://midnight-commander.org/ticket/4535
+
+From e2d96fa802abebf888dcc2cc938cfd06abca8eb0 Mon Sep 17 00:00:00 2001
+From: "Yury V. Zaytsev" <yury@shurup.com>
+Date: Sun, 1 Sep 2024 12:01:37 +0200
+Subject: [PATCH 1/3] Ticket #4575: adjust mc-wrapper to fit changes in #4535.
+
+Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
+--- a/contrib/mc-wrapper.csh.in
++++ b/contrib/mc-wrapper.csh.in
+@@ -1,9 +1,9 @@
+-set MC_USER=`whoami`
+-
+-if ($?TMPDIR) then
+-	setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$
++if ($?MC_TMPDIR) then
++	setenv MC_PWD_FILE "`mktemp '$MC_TMPDIR/mc.pwd.XXXXXX'`"
++else if ($?TMPDIR) then
++	setenv MC_PWD_FILE "`mktemp '$TMPDIR/mc.pwd.XXXXXX'`"
+ else
+-	setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$
++	setenv MC_PWD_FILE "`mktemp '/tmp/mc.pwd.XXXXXX'`"
+ endif
+ 
+ @bindir@/mc -P "$MC_PWD_FILE" $*
+@@ -11,11 +11,10 @@ endif
+ if (-r "$MC_PWD_FILE") then
+ 	setenv MC_PWD "`cat '$MC_PWD_FILE'`"
+ 	if ("$MC_PWD" != "$cwd" && -d "$MC_PWD") then
+-		cd "$MC_PWD"
++		cd "$MC_PWD" || true
+ 	endif
+ 	unsetenv MC_PWD
+ endif
+ 
+ rm -f "$MC_PWD_FILE"
+ unsetenv MC_PWD_FILE
+-unsetenv MC_USER
+--- a/contrib/mc-wrapper.sh.in
++++ b/contrib/mc-wrapper.sh.in
+@@ -1,15 +1,20 @@
+-MC_USER=`whoami`
+-MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
++if test -n "$MC_TMPDIR"; then
++	MC_PWD_FILE="`mktemp "${MC_TMPDIR}/mc.pwd.XXXXXX"`"
++elif test -n "$TMPDIR"; then
++	MC_PWD_FILE="`mktemp "${TMPDIR}/mc.pwd.XXXXXX"`"
++else
++	MC_PWD_FILE="`mktemp "/tmp/mc.pwd.XXXXXX"`"
++fi
++
+ @bindir@/mc -P "$MC_PWD_FILE" "$@"
+ 
+ if test -r "$MC_PWD_FILE"; then
+ 	MC_PWD="`cat "$MC_PWD_FILE"`"
+ 	if test -n "$MC_PWD" && test "$MC_PWD" != "$PWD" && test -d "$MC_PWD"; then
+-		cd "$MC_PWD"
++		cd "$MC_PWD" || true
+ 	fi
+ 	unset MC_PWD
+ fi
+ 
+ rm -f "$MC_PWD_FILE"
+ unset MC_PWD_FILE
+-unset MC_USER
+
+From a3ce493ae25f35f29919332d4794c17109f56901 Mon Sep 17 00:00:00 2001
+From: "Yury V. Zaytsev" <yury@shurup.com>
+Date: Thu, 29 Aug 2024 12:13:40 +0200
+Subject: [PATCH 2/3] vfs: fix tempdir path building to account for trailing
+ slash on macOS
+
+Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
+--- a/lib/vfs/interface.c
++++ b/lib/vfs/interface.c
+@@ -775,6 +775,7 @@ mc_tmpdir (void)
+     static const char *tmpdir = NULL;
+     const char *sys_tmp;
+     struct stat st;
++    gchar *template;
+ 
+     /* Check if already correctly initialized */
+     if (tmpdir != NULL && lstat (tmpdir, &st) == 0 && S_ISDIR (st.st_mode) &&
+@@ -789,7 +790,10 @@ mc_tmpdir (void)
+             sys_tmp = TMPDIR_DEFAULT;
+     }
+ 
+-    g_snprintf (buffer, sizeof (buffer), "%s/mc-XXXXXX", sys_tmp);
++    template = g_build_filename (sys_tmp, "mc-XXXXXX", (char *) NULL);
++    g_strlcpy (buffer, template, sizeof (buffer));
++    g_free (template);
++
+     tmpdir = g_mkdtemp (buffer);
+     if (tmpdir != NULL)
+         g_setenv ("MC_TMPDIR", tmpdir, TRUE);
+--- a/tests/lib/vfs/tempdir.c
++++ b/tests/lib/vfs/tempdir.c
+@@ -45,6 +45,9 @@
+ static void
+ setup (void)
+ {
++    /* Ensure that tests behave consistently irrespectively of the environment */
++    g_unsetenv ("MC_TMPDIR");
++
+     str_init_strings (NULL);
+ 
+     vfs_init ();
+
+From d081bc68aa6ad3ded515ea490118b0a38a1ec204 Mon Sep 17 00:00:00 2001
+From: "Yury V. Zaytsev" <yury@shurup.com>
+Date: Mon, 2 Sep 2024 16:51:17 +0200
+Subject: [PATCH 3/3] main: remove `O_EXCL` for wd-file since creation is now
+ managed by wrapper
+
+Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
+--- a/src/main.c
++++ b/src/main.c
+@@ -509,8 +509,7 @@ main (int argc, char *argv[])
+     {
+         int last_wd_fd;
+ 
+-        last_wd_fd = open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
+-                           S_IRUSR | S_IWUSR);
++        last_wd_fd = open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+         if (last_wd_fd != -1)
+         {
+             ssize_t ret1;
diff --git a/app-misc/mc/mc-4.8.30-r1.ebuild b/app-misc/mc/mc-4.8.30-r1.ebuild
index f8dcfce73f52..b33a09f7f141 100644
--- a/app-misc/mc/mc-4.8.30-r1.ebuild
+++ b/app-misc/mc/mc-4.8.30-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 
 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
diff --git a/app-misc/mc/mc-4.8.30-r2.ebuild b/app-misc/mc/mc-4.8.30-r2.ebuild
index 3c52e9a0e0ba..aebf71e0e108 100644
--- a/app-misc/mc/mc-4.8.30-r2.ebuild
+++ b/app-misc/mc/mc-4.8.30-r2.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 
 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
diff --git a/app-misc/mc/mc-4.8.31.ebuild b/app-misc/mc/mc-4.8.31.ebuild
index 8b8437c5c57f..b3936648c6f2 100644
--- a/app-misc/mc/mc-4.8.31.ebuild
+++ b/app-misc/mc/mc-4.8.31.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+edit gpm nls sftp +slang spell test unicode X"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-4.8.32-r1.ebuild b/app-misc/mc/mc-4.8.32-r1.ebuild
new file mode 100644
index 000000000000..4b9b9cd1b411
--- /dev/null
+++ b/app-misc/mc/mc-4.8.32-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${P/_/-}"
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+edit gpm nls sftp +slang spell test unicode X"
+
+REQUIRED_USE="spell? ( edit )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.30.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs[tools(+)] )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:=[unicode(+)?] )
+	spell? ( app-text/aspell )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+RDEPEND="
+	${DEPEND}
+	spell? ( app-dicts/aspell-en )
+"
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
+	"${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
+	"${FILESDIR}"/${P}-fix-chdir.patch
+)
+
+# This is a check for AIX, on Linux mc uses statvfs() regardless of whether
+# LFS64 interfaces are available in libc or not.
+QA_CONFIG_IMPL_DECL_SKIP=(
+	statvfs64
+)
+
+src_prepare() {
+	default
+
+	# Bug #906194, #922483
+	if use elibc_musl; then
+		eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
+		eapply "${FILESDIR}"/${PN}-4.8.31-musl-tests.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--enable-charset
+		--enable-vfs
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
+		$(use_enable nls)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Bug #759466
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "You are emerging ${PN} as root with 'userpriv' disabled."
+		ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
+	fi
+
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+}
+
+pkg_postinst() {
+	elog "${PN} extension scripts depend on many external tools, install them as needed"
+	elog
+	if use spell && ! has_version app-dicts/aspell-en ; then
+		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
+		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
+		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
+		elog
+	fi
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-4.8.32.ebuild b/app-misc/mc/mc-4.8.32.ebuild
index a26ebf139e63..f95393cc6154 100644
--- a/app-misc/mc/mc-4.8.32.ebuild
+++ b/app-misc/mc/mc-4.8.32.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+edit gpm nls sftp +slang spell test unicode X"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 513f3022ac0e..ffc016713690 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,3 +1,3 @@
 DIST media-player-info-24.tar.gz 90017 BLAKE2B 4b8dff7ebc910cdee986756d211f7cec0c08d5089bc5478360bcea3d24613118d3e2557633866345b1970a39a1de5ff10648ea71b7ae6ec7e7ae5635b6d46bc3 SHA512 b762f82280d7ddc3ecc4cf612f6fb3bf887c56a3ece7d9e4a45ebc7e750d71a20ba70dbff63c2b5abaae0f1c3e079545e95d8eff07ae25e27add09e92b2b1544
-EBUILD media-player-info-24-r1.ebuild 1037 BLAKE2B 5fc9174583bad88ae8df7bb88c58ab999b7bdf90c88bad3d2fcb856ebabd63916dc11d5b72b1e8157b9051ad9cc51a546ef1ebb5c320fb03ed3a0787d0841b33 SHA512 2ac0f3c4f619e4d9a354b06caac076d98ada3c5b6409df182b0bd65e65ec2d15ed26fbc45b2216a6d1a76f8985ad0e20866e77595648ea9304ae94f99c822836
+EBUILD media-player-info-24-r1.ebuild 1031 BLAKE2B 08c840e4833d2c983907dcaa4a0ad20d944e50da7ac1c7ccad3903fd0acc95040ecce11d9a53400a03dbe8f5c27fd6a292e40dbf571b5d4ece0a82944ffd6042 SHA512 cd73769788d69afb90afcdee8c24924f74f21fb65236522d973cd84ad0f7e270b5ce1d898ed7e8e9b5fb64e5eb30f7ad01b4dd6cf63fdfd14d4e0bef6925a0af
 MISC metadata.xml 376 BLAKE2B 62885801e918b5af31a0e8e2e0ff168603f07c5090821c84bacc64a7c831c783e4667dee30837efa616aff3b5998d7c9c6180d2ef8339283ac2b8e4674c05efa SHA512 82a0415ed82367f2735b8b71112fde4f9f3290f3be2dac95e0815ca60516abcf0ff31c5a1b3ff0be6aaf3350d7926cc483e72cd84da22bb351818e6e2f0618d4
diff --git a/app-misc/media-player-info/media-player-info-24-r1.ebuild b/app-misc/media-player-info/media-player-info-24-r1.ebuild
index b9ea52f19e83..abe84813a2a2 100644
--- a/app-misc/media-player-info/media-player-info-24-r1.ebuild
+++ b/app-misc/media-player-info/media-player-info-24-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 # This ebuild does not install any binaries
diff --git a/app-misc/mencal/Manifest b/app-misc/mencal/Manifest
index bacc74bc1972..cfcba0ceda6c 100644
--- a/app-misc/mencal/Manifest
+++ b/app-misc/mencal/Manifest
@@ -1,3 +1,3 @@
 DIST mencal-3.0.tar.gz 19560 BLAKE2B 741628e02756cce02386f6439a015c9c1bf8801c1eaf136a761f2dc823b38d746d8e4af23e7c22ec0147f153130c11dd01912f477ffcdd75bf0141b1cdc23276 SHA512 0a99af941b9cea4923a90065813d8434c908d52e4ead1309114a28b565ca8b8e81cf132740be4ab88159b61628c22fba65cd8a74213b58d4db69a2f315d737eb
-EBUILD mencal-3.0-r1.ebuild 477 BLAKE2B a954b605f65d8dcec6bdba835ccf98288de35b3a7aabef31f6b28599cf6e83c7084c67d8e0382ae152f0de4b6503b4bd8ab407f0ba1509ddc28067d85d46d8e6 SHA512 276d44bccb600e4a523464616d5946fc5df5412cf48c9c7640fe9effbed02589d43daf23b6d2626733f2a67d50be3063b74a8717fc82727878e9aea34d4aae17
+EBUILD mencal-3.0-r1.ebuild 471 BLAKE2B ebd3c9ca414ba95e2d592e1490ea7433d0e092e1af7045a8cee435bfc4e5a0b4bd2f0ab2cd5fb2f619ea42a9acfc7cd686953cf0059902cf514b38fcf9275e60 SHA512 6ccb795f1d58c8a000a28d48d7834d931fcaf6dc9479281f9f5c1fecef866241cebd81cb0d06ee4dd3f9cda335797c063e3ee1e5aa12020841b20b49d2aae9e6
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/mencal/mencal-3.0-r1.ebuild b/app-misc/mencal/mencal-3.0-r1.ebuild
index 48403bd96179..82f9ff2ea5db 100644
--- a/app-misc/mencal/mencal-3.0-r1.ebuild
+++ b/app-misc/mencal/mencal-3.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.kyberdigi.cz/projects/mencal/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index d03a6f585fcc..c3b000a1a586 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mailcap-r2-1-54.tar.gz 28518 BLAKE2B d56fcd5d662bc7feeb20b310f7582e4b670d400e1059371bfce8a5e36a69ea24675c6016b7ed6bde9ba8d078a0ad10281ede3f7060f063302dba2ec7da707b5d SHA512 6c68df26caac326ce14630e2cec582ab88cda27710155f336dbab4681e76a94d2818452ed39f2e9edd2d960603b783a6e801da6e7c400bb708b910e61ed66b6e
-EBUILD mime-types-2.1.54.ebuild 665 BLAKE2B 7aed92858d83835d65f569f2a206945356417b52473e2a4c6d7ec6d78595a9861edcb7d56a61a16b190aec8355a05470ce2282a8b8ee5c5abb04811cea7786c8 SHA512 b34ddb26b5171f0bf95ac16247c9e44f6acd357c1031db1ba041b027fb205ed097d7f83039a4e863871ef54945622dbfe70301128b15cc77fcf09e0a685366a5
+EBUILD mime-types-2.1.54.ebuild 659 BLAKE2B 07918fdeb4fb96751ec88d7a4327808070fcf5346781f7a62d12e04ce99c1557b38ec97508386175c8d58151676519817523bdf22fdda499119c255899c09841 SHA512 a538f03afd4719ea89bd0f173736d3339cd767cdc2eb96393436da626752b2bba33f9bff6baee225f9f24dad26d87b48158e430ed9f2819ff666d5a2c78ed302
 MISC metadata.xml 375 BLAKE2B 99bf5d56e901b14785772545f1bec77972fe9d759ab4df47d822d6cc86e0b739874c50ba4717468a82e43944b7e6026b1a9f0eaeb9e3bbfbdac793084ca6cf86 SHA512 a78d4975d7c0252238749dbac0ce56aabfb4707f22e19aac9c718cb685102de5dab160da7b34556dfd5c2f2b845cc24880c46c1a248908046c5b994dcd3273cf
diff --git a/app-misc/mime-types/mime-types-2.1.54.ebuild b/app-misc/mime-types/mime-types-2.1.54.ebuild
index 0edaa98636d4..7c9012d97b1d 100644
--- a/app-misc/mime-types/mime-types-2.1.54.ebuild
+++ b/app-misc/mime-types/mime-types-2.1.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://pagure.io/mailcap/archive/r${MY_PV}/mailcap-r${MY_PV}.tar.gz"
 
 LICENSE="public-domain MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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="nginx"
 
 S="${WORKDIR}/mailcap-r${MY_PV}"
diff --git a/app-misc/mmv/Manifest b/app-misc/mmv/Manifest
index 8df9a0dd5eec..4f5d087dfed3 100644
--- a/app-misc/mmv/Manifest
+++ b/app-misc/mmv/Manifest
@@ -1,6 +1,8 @@
 DIST mmv-2.5.1.tar.gz 833810 BLAKE2B ed6ba51490b2c758b47f5e57d4a45a6ccd094da8754fbe96ea990da6e4e9aacaa2cb13073be91cd6e764f7c676877bb17e1a558dd3c75caa0bfaea56ac8441b2 SHA512 c238035cbda20e3a7df508a83b2919f4a7684a0fcea5772899de06359096d729891c501f08be6d15a075e426ebb7246636bfc2fec9190605b975ce3c035f03be
+DIST mmv-2.8.tar.gz 936255 BLAKE2B f6410c4e8a02fcc33788afaf4aea03cb8bfee960bcfa7ac721ecce352b3369c8905bbf4aff1f24780a5f9482d83258ce3d09770fc759eeaa9e1d2f7ac4b54724 SHA512 8dabfefbc9ca6267e60720dbac6ab830f9a3874d0163d060388ca83019a4519edc7f617e3f4a738d670e925bdf9a12ba5250a3803d1d68f92b83fbaa3d1e4216
 DIST mmv_1.01b-19.debian.tar.xz 12436 BLAKE2B d75251528cfdbfc343880450481973dad932707c00af38b1bf4b74f917f3e74b0b60aea2aa5d65b8ee63edf8beea61bedd6fa1859f109a7c3e02eabbd0a1bbeb SHA512 86fb93180a8645a40f45d0b9331693f6a86fbe1a378857350c9573e45261e008ab2154836df09a4f569bc35b6601d0317a0f1f1a901530e26e391c3a25c666f5
 DIST mmv_1.01b.orig.tar.gz 25656 BLAKE2B 4e3c7c27831fb5aeeb09461116330a993998da510b32a7ba3b1151c0d14a336eab7cf37bc3ac91720f38fb41258a60488e5d066b152d0c717f5413f8514d9026 SHA512 4bf4e096b930bdde225ba5de761e968af3aed33dc13194b1a1a79078cd27e158b04aae131b5167cf5f844e35355d67359443cd598db22da15a5af06752438917
 EBUILD mmv-1.01b_p19.ebuild 1175 BLAKE2B 430204d312707482a634dd29b04235ea3164205406fdbde40e8c640f06439971370d69c3657be26e064ba06e0a2d4d800f561392cfe207b94dc16295d2ee1462 SHA512 534bfe6d3167f9cdd5bba1f9c17bf259705614ccdb8a0068fe8b2a58bd71d59781b3a3c4653cca2757ec4704be89f0b9cc41d6c240f04ee052c618565490b05c
 EBUILD mmv-2.5.1.ebuild 518 BLAKE2B 1552a3c774129662524aceadc8d014376231476101ae1feee04d10305c0d17a91dd5975ac4ef0cd86829ac49095f2049fb0a7a6a9aa1968749f1a7884817f154 SHA512 12f12ca6f6e664eb0e76c329af2daaf843821e7bd1ec887b8782be8c2f11d017ffcd8d55f3266f94fa58d1d1eb21e666a00c91996243cb4d421d0a05c707c69e
+EBUILD mmv-2.8.ebuild 470 BLAKE2B 74f64c6892f0985ef2bd4bc210a969419fc2fa0e776ada17fb9f9f179dc817be519fc19f091f272b90788cbd83cfa97daf061bbdad73765af62ef18b3883d353 SHA512 d2af340ac83c39ff7034ba31fd7159dcf07c4bd539239868d48df32560250961a9f782f0637c0772905f34a124b6a180ff4eea405496e9cb1601a91c7fee0a18
 MISC metadata.xml 343 BLAKE2B a9d61b016fb0367ed8f8da8460e4b85edc800fc506cf2f21610b741507849ac570c1bbb262ea372247d57e12d77deb95ce7ed71f62517ce8a4687df8ea2425ed SHA512 1b134cec1035b57eb35b68baf9568d1212e89177c182c74409abff812bed897fc041a1b1bfdc9d8491c503e5afa1bda4c3fd7c4fedfb60b95ed49dd0453aafe3
diff --git a/app-misc/mmv/mmv-2.8.ebuild b/app-misc/mmv/mmv-2.8.ebuild
new file mode 100644
index 000000000000..1e8b1343582e
--- /dev/null
+++ b/app-misc/mmv/mmv-2.8.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns"
+HOMEPAGE="https://github.com/rrthomas/mmv"
+SRC_URI="https://github.com/rrthomas/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+QA_CONFIG_IMPL_DECL_SKIP=( MIN )
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 52f90ddd4262..a6ab98e1c421 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,5 +1,7 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.notify.service 332 BLAKE2B d11f57574ec2cadd6fdaf87080a81fe19a8a78c9b93bc34b388c55def3a5a4feb214700c63899f3cdd87ddb98ed43079035e8363d3f16a345dd0ca52ec7266c4 SHA512 08514d285c333e24a4f5ebba249a59742cf8ba372d434b022416a87f9f667c9c6ac9c64bc0c4c6624d0ea0665a1d15ba2ec244bf77479f5ee11d954595e06723
 DIST mosquitto-2.0.18.tar.gz 796351 BLAKE2B 6e1d8078ee2813870d79489f312857a12614dc8f1fa3c72269ab29555897ec61d7ba54fcb5e5383f8e852cdb6fffa1d7cb2003ce15da12b986989a6187a186a0 SHA512 63f7e2811964bab5856848e6918627c47afc6534ff60aad5ece3d2fa330b407c9df14027610826e343ee68ff7d8d5d93f2459713061251ded478c42766946767
+DIST mosquitto-2.0.20.tar.gz 799972 BLAKE2B fe1445ff6e2a6869ca911dbc556a2ea3d8826ddfd7dc1c46d6c409a320e58cbae4a3c62f02e3cad96cd2d09d30acd8667e1be2cd197211ca80de2ba782b7c7dc SHA512 4c16ff0ad0e9c6fe5c65ec5a82bef123d9e6490f42658d646e1fad60f098530b7cbbd743460c52d4dec8bc27698c84a557bd539b35ac6c81444539822a544c4c
 EBUILD mosquitto-2.0.18.ebuild 3200 BLAKE2B d56fdcace90754235640c8c9b0af24281149a5df333e9da77ce108af5ca8c2352eea5bdb562cd34a02e958888962dc1446d0468cbe2fe7ba6bd09a5b82a1b197 SHA512 569259f170089cefb9d75f50407469b6752b8bed0998ccd88fc240b532dff11c9ee72cef7a0f55c76a56e5bad696801227ef22f09b700b1d0486e395bc18344e
+EBUILD mosquitto-2.0.20.ebuild 3202 BLAKE2B 1d1bb57012999571f5ec001b8faf23054edada3738fae92383ac6e1ebcccf47cd036a998b510ff7d86e51ed1ce2bbcc7fe3a8a4e6e6e2939db765a000a95a0f6 SHA512 4e2e8a60765cca455edc9194c0330ba55bfa1ac951109b334d32155b1f9c8360b750b04c6c0a8ffe666b5838357518733eb27c610291c46c68bec96fbddf58ff
 MISC metadata.xml 612 BLAKE2B 414070cdd858c5fd76b266459ff7b2a66992e8b11e672212f78e366863cd221aa83516a546c69668217a06b087b7b81853fcdff332368355cd1ff8c1292f0c4e SHA512 64242d12473aad0f0d80865da2499679849f6b55f751d27c3cf38e0a5555a305a2cc59f8dfbe4b9d50f0a6b6bc85062b989511c7118045b2c9c3e1e0d1022747
diff --git a/app-misc/mosquitto/mosquitto-2.0.20.ebuild b/app-misc/mosquitto/mosquitto-2.0.20.ebuild
new file mode 100644
index 000000000000..d0aace08a34a
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.20.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+IUSE="+bridge examples +persistence +srv ssl systemd tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+	acct-user/mosquitto
+	acct-group/mosquitto
+	dev-libs/cJSON
+	srv? ( net-dns/c-ares:= )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	websockets? ( net-libs/libwebsockets[lejp] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	python_has_version -b "dev-python/psutil[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python_setup
+}
+
+_emake() {
+	local LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CLIENT_LDFLAGS="${LDFLAGS}" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_SYSTEMD="$(usex systemd)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+src_prepare() {
+	default
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove failing tests
+	sed -i \
+		-e '/06-bridge-reconnect-local-out.py/d' \
+		test/broker/Makefile || die
+	sed -i \
+		-e '/02-subscribe-qos1-async2.test/d' \
+		test/lib/Makefile || die
+
+	# Extend test timeout to prevent spurious failures
+	sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \
+		test/client/test.sh || die
+
+	use test && python_fix_shebang test
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc README.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	insinto /usr/share/mosquitto
+	doins misc/letsencrypt/mosquitto-copy.sh
+	systemd_newunit "${FILESDIR}/mosquitto.notify.service" mosquitto.service
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_cut 1 "$v") -lt 2 ]]; then
+			elog
+			elog "Please read the migration guide at:"
+			elog "https://mosquitto.org/documentation/migrating-to-2-0/"
+			elog
+			elog "If you use Lets Encrypt TLS certificates, take note of"
+			elog "the changes required to run the daemon as the unprivileged"
+			elog "mosquitto user. The mosquitto-copy.sh script has been"
+			elog "installed to /usr/share/mosquitto/ for your convenience."
+			elog
+		fi
+	done
+}
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index cc15a0ccfd0f..9b69e30670d4 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,6 +1,6 @@
 AUX neofetch-7.1.0-fix-arm-riscv-loongarch-cpu-model-detection.patch 1517 BLAKE2B e51c0fb3fc9ccc014adf58d83ad3ca9d422e9476d0bf23cb65c23928f532c83cac4a867c858191b7e987f1f71b8b0fc11738401c63bee1902caa05216d553581 SHA512 4d2d54e2fdf87b6091ee4933cba3ebc851c6f457ae435a12484654e19694f5f5b71b324c432dcae06bd9aeea36b6ab25493a80b721b8aeeda89eea462484362e
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-7.1.0-r1.ebuild 1275 BLAKE2B 42860a6720bb3305ca86f1a9ba039c9b3f44aead776d59e703d0ee89271d8e98205612568bede6d45d2ce75723a4273c0f5644fdaf65f8f8ae6432881aacb5e2 SHA512 9f92aae75b9a682199073f0124e04eb9614d37747104c9cb5dca7ec6316b9eae44705ae2556e2bbd5480c89d51ca296b57f19e890c5727f19ebf0b3a26887449
+EBUILD neofetch-7.1.0-r1.ebuild 1269 BLAKE2B ae5b5f6275dc35e1f38445f8cec25839b07d5c48fa862df4a4968eea22ed0fd13b1169069563adade5be7447c6af9e3bad45f46559ae1bfa7b0af8ae0106b9c3 SHA512 157fd71b31921e4f3f397d6f8e73067527b6e300dca8d49a8f8ea819761e74a1875097f5f9d1ce16842e3af95a3df40838582050b0baa96acf9caf626c933c67
 EBUILD neofetch-7.1.0.ebuild 997 BLAKE2B 75746c17d8c2d14627e712f4edf15dde818a3295241ba6f438406b98fb836cbd0123e4d63b900012b62dd1189e25c7ec46ddaea2ba5d93f5f028e1e5f3c13fae SHA512 11ccc277add31d055b2c43bf0e16806dd1a4bc1dbf88db27447595f67d8406018ad45c1ad8f3ea78174487e786b9a4966297839a3a9daa5f1352130735c9343d
 EBUILD neofetch-9999.ebuild 1224 BLAKE2B df1cb8be43763403e60471f77eed30ccd29df2d9d3ebea683c2da598d8197cde1d1ff3a3bac2598639244784f446e39e6b00125c603ccef00d3baa4d9579fe1e SHA512 1bde29fa6d5f704abaac16896f74e12bed61efa58893078a4dfac11d4097b2bb41410d182c87469e28c2a33676befef092e04399039e0e8548dabe444f7331f2
 MISC metadata.xml 863 BLAKE2B 3a4dbfbeea790e95fafbe9b47169bd43c127be69f21ffb2c0752ad2003304ef7628f0c95388288cf00b5d567b83626ac15cb015a8fd9c4c6cacc1137410a7887 SHA512 593a76d4beb607cf64a5dfeec978d7c6be6ad2a1dc36aefa44c2e18724d09c76133d3bab0fc5692f2bd997c86156337142b5115e7d34d4da59f91e69f44d4f30
diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
index 766e7a9f7491..62839358e96b 100644
--- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 59fe9f4cee2d..b5f07e3ef6e7 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,6 +1,7 @@
 AUX nnn-4.9_fix_colemak_patch.patch 1054 BLAKE2B 276dc125dcab2050c5376e8710565effa2a3a738d84b63d2ab53ae0f85d0044bd4b25105d81a45bc6937d1cc71b0fed30ea694a9482057e6043deaeac41d530c SHA512 90337b80babbedfd16a8e4d03d0747c43faa8a8c92e2c1dbc04d1672d7edcb4dff39a08edb049a3677312747bddf80d46d0aaf23795df295b0d8d24090368310
-DIST nnn-4.8.tar.gz 253547 BLAKE2B 36e6e1dc39bfbce7fa72fd322339395fa78a410c93043860be845ff3d5be3178fd37966f57da17f115cab8a6973462d44243052a6c736665ef9a180cd9fd6978 SHA512 932e27ec1d7cd3db6ccba33edb3d1ad2620109cde3c4114b734eef3e04d6c6c22ddaa1c4727908dba2a107dd4cfe1f5193aec450f680a390671f48e63d0133bd
+AUX nnn-5.0_fix_strcasecmp.patch 274 BLAKE2B df58f4e41fa1605d7e33680a57f2bacc97d6a424138f611c72b022263d2ef54192341c40b08f16eb09a00906884bed4eca1e5f8ade351a649d16d42ec6bd2345 SHA512 c09af696635b92f6a3b75fa43bf6b31973e435a63ef64b812d817f31478f3c1d3b1365f48f7e5cf92aa207cc4b45847e93a1a269dd029b92ad6bc14676d29702
 DIST nnn-4.9.tar.gz 255144 BLAKE2B 3ad257f931dee7803c44f9f4db478a8de0c898a2d8e818457aeb00dcc7936a0a1f51ce3c199a1421a014d197c7f9d2f17bccccbc985b93d78e5994b9cc707c94 SHA512 3c16ed1cbc5466b05306e38c6f5d8eb7ade9cf5ad766f9ff3bf7d20d5bfb9bdf1564527e27191e2cd85542c25245f338e1236630de3d1c8e5fbd10d54d628a14
-EBUILD nnn-4.8.ebuild 3172 BLAKE2B e08054dfbf5d37ef5f5f2893a7ff1a19a5bc85361d3355e520ccdd02b616b73effb61cc828e87fd27897eecb1e91990c78aa22beb7deed0c1aa48a77de928937 SHA512 cc5f215d7d099b03227dca7951cd23d06f6c143d01bbf02e395fc12cb978b250d83a0e43cad993a6c409f1d3dc76dddac8e5d977ccb5724faa695187aa3aa3df
+DIST nnn-5.0.tar.gz 258474 BLAKE2B d8d5ca626c163ae3adbce9260f48b7c09673ffa70c3f9707ed85a077477f0cf1ce46ca1c91811539863f0a25a1289cb5f136180e10b872ce854744a507d79740 SHA512 648889de4e636882bf92d45a9fe273288858d76a28e34c6fcb27fc3d1e1b576eaec7e611f55a7f809a067ebf5a09c3a209ad84f44e2da528cfce71ed98a7a999
 EBUILD nnn-4.9.ebuild 2910 BLAKE2B ba09e093e78dfd29afd1c6efd23a0fa7e75969902fc6cd9ce6b2a08df40ba2c108dd0f18714d9de6e61a8f8da8e41881ac70c1ae3863cf15c47d8594b441cd6a SHA512 690ed2e57b1d069bce3cda632e7e25f1762f798a1949f112e22350ba5c81d577ea6f137145a056ee399078db5fd1ab5e61dcf90fe5c729587cc33cdb60af1bc8
-MISC metadata.xml 1236 BLAKE2B 9afb37cabe29313f3b7203be1583fab01e067c798d5a9bb0ab5a4d5bf172d016feae30f2bf02577d390378d3292bb1f51aa4ffeeaf34c738c330bea020bbe80d SHA512 05ada5daf33b0fa8df18bca4432dea9a1dd9bfb0e74ecb4ae6d4b0860437aaf5f3850ef67283a28a4edb49fe747fb65ef9a27b829529992ed6826436530d07df
+EBUILD nnn-5.0.ebuild 2908 BLAKE2B a44d58c2307d2f5cd89bcf876a5bdeb78f9af51314f772daadc4d6349053051e564691516fc3f89c1b9c9bb1e5fa5b61f85de498d411fb0db1fe68824f72aac9 SHA512 798de098bb18601c7302be8d82a7f1fe5c47ebc19300100282f01b71e894d3d5e646d9f3f25abc2b96095488a07d7c70b030943c8a62902d909aff08588b4bd4
+MISC metadata.xml 1159 BLAKE2B b4f7d5bac9e6aac166c1e7d9cd834f0efe99137e13dca959c5dac8f9b88de25756c9e260dedca4dbacabfab020ffa23552a195db137ddae650a8028e9fa64c61 SHA512 f4c4443351f8a82c493017756df5ca9e9d238b698b9e5b6598145a154e64f630c76b31f5e046c808c21d698dd1c8f95ffd1d2c67a1ba0f5cb889fc9f1806359d
diff --git a/app-misc/nnn/files/nnn-5.0_fix_strcasecmp.patch b/app-misc/nnn/files/nnn-5.0_fix_strcasecmp.patch
new file mode 100644
index 000000000000..15fcdaca3c64
--- /dev/null
+++ b/app-misc/nnn/files/nnn-5.0_fix_strcasecmp.patch
@@ -0,0 +1,12 @@
+diff --git a/src/icons-hash.c b/src/icons-hash.c
+index f0f2b0947..699af33b5 100644
+--- a/src/icons-hash.c
++++ b/src/icons-hash.c
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <strings.h>
+ #include <stdlib.h>
+ #include <limits.h>
+ #include "icons.h"
diff --git a/app-misc/nnn/metadata.xml b/app-misc/nnn/metadata.xml
index 74ffd32d3078..474677649a8b 100644
--- a/app-misc/nnn/metadata.xml
+++ b/app-misc/nnn/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="8contexts">Enable 8 contexts (instead of 4)</flag>
 		<flag name="colemak">Key bindings for Colemak keyboard layout</flag>
-		<flag name="colemak-dh">Key bindings for Colemak-DH keyboard layout</flag>
 		<flag name="emoji">Display icons using emoji</flag>
 		<flag name="gitstatus">Add git status column to the detail view</flag>
 		<flag name="icons">Display icons using icons-in-terminal</flag>
diff --git a/app-misc/nnn/nnn-4.8.ebuild b/app-misc/nnn/nnn-5.0.ebuild
index c4e9d82febc1..934a1b8efc83 100644
--- a/app-misc/nnn/nnn-4.8.ebuild
+++ b/app-misc/nnn/nnn-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-IUSE="8contexts colemak colemak-dh emoji gitstatus icons namefirst nerdfonts pcre qsort +readline restorepreview"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="8contexts colemak emoji gitstatus icons namefirst nerdfonts pcre qsort +readline restorepreview"
 
 DEPEND="sys-libs/ncurses:=
 	pcre? ( dev-libs/libpcre )
@@ -20,8 +20,11 @@ DEPEND="sys-libs/ncurses:=
 	elibc_musl? ( sys-libs/fts-standalone )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${DEPEND}"
-REQUIRED_USE="?? ( icons nerdfonts emoji )
-	?? ( colemak colemak-dh )"
+REQUIRED_USE="?? ( icons nerdfonts emoji )"
+
+PATCHES=(
+	"${FILESDIR}/nnn-5.0_fix_strcasecmp.patch"
+)
 
 src_prepare() {
 	default
@@ -30,10 +33,6 @@ src_prepare() {
 	# When using nnn's bundled patches, the 'install' target should not depend
 	# on 'all'. See: https://github.com/jarun/nnn/issues/1493
 	sed -i -e 's/install: all/install:/' Makefile || die "sed failed"
-	# The Makefile uses O_COLEMAK-DH to control the Colemak-DH patch, but that
-	# does not work with the array approach to make options below. Hence, we
-	# simply rename it to O_COLEMAK_DH.
-	sed -i -e 's/O_COLEMAK-DH/O_COLEMAK_DH/' Makefile || die "sed failed"
 }
 
 src_compile() {
@@ -47,7 +46,6 @@ src_compile() {
 		O_QSORT=$(usex qsort 1 0)
 		# nnn's user-submitted patches
 		O_COLEMAK=$(usex colemak 1 0)
-		O_COLEMAK_DH=$(usex colemak-dh 1 0)
 		O_GITSTATUS=$(usex gitstatus 1 0)
 		O_NAMEFIRST=$(usex namefirst 1 0)
 		O_RESTOREPREVIEW=$(usex restorepreview 1 0)
diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index 3f2718b00b4c..ece3b739e4d3 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1,5 +1,5 @@
 AUX ola-0.10.9-liblo.patch 1236 BLAKE2B 072f35fcd8c475025945b66b1d71b09e3b666dad876c464bb94fd9f6aff54b785d111a4c7a39fc7d245d4bdfdb3d949d55959cce7f986633f762dd50c57fa3c9 SHA512 1a192667839611871134000fcbf3c1e05933c664efac6c65f840351126c6cd4d015a83d7787d71adf5acfd7fed338f72657694728619be0983210788a7b3a780
 AUX ola-0.10.9-nullptr.patch 7412 BLAKE2B f03facd9b48493a47d35744d33edab8fbae87e0440053cd7f1610af40fae1a4d56b6a20beb2b3ca8b4fb64d023795ca9e12fd8149d69a150bc105f9978eaddbb SHA512 669ab2bab44cbab87f8c99f92799faa1422a0d0aaeb7da3c8b2dcdb71f47515e93f773b8fab372c66aa47a23797fce0725722ca25354e868ae2926510282058d
 DIST ola-0.10.9.tar.gz 2578760 BLAKE2B 8cace370b21788d0fe65e56d33fdc9436a5103837d370e3e7e07b43318d4ec3b29536b55c4b117f515a4698ebab88f58718759a0cf9a00f79d0b839e7a79d581 SHA512 e8e2f4249d6e1f63f6c36ae548d9e3a82080f0da82829f923ba6b4d63685fb89f9baccf4588fd6fcbf756708d91e27d022c0d623e7c03c84ec058e7dc7c46bdf
-EBUILD ola-0.10.9-r2.ebuild 2588 BLAKE2B 8662178c6e92158c0155515eddade5998e87929c917103e08a9f39a15d6d49d51df7cbc7615837f135ee1b3f2359b4d4d4457283e0fcc3427975e0ec0a0a1daf SHA512 b3f9a085e034bed14a39b61d55bc43ceed8eaec945aee9f372d78b76e3f11d5eb64696d5114e1afac70e301d9ae8c8618c30c1fde925600e76726052a04c8fde
+EBUILD ola-0.10.9-r2.ebuild 2587 BLAKE2B 499f1385dc2c4736b4884a24355aa709383ad639b06c4297693001d3fefc1e8156af1cd76b31dd11171dc0a70f1f8d09c210d8463df93b94ad9dcc0e4257f0db SHA512 6b0a3f5f2a89703f0139dd9c72e67ebe8e447bd9b8f46eecedddbf2ba828ce6793395b0502fb83d267f57248fe34986c0f5ec84788b766ca0c008137ff875c36
 MISC metadata.xml 934 BLAKE2B 6485301ffafec05ebb41b3b5eee75a94e8afbc26894317bd0a7b1b81c028b34e9353c3b9d311ea3404004bac5441c72dfd38d1e6f3725bfbe1e59ec9e095914f SHA512 cf598a1498feb59eeb21c1bc4e68739e186842f99cff3817665a89180598b22b006e525cef87de2f8ba71bf4bcf4b72623664a6d93db652dd678cbed898c2885
diff --git a/app-misc/ola/ola-0.10.9-r2.ebuild b/app-misc/ola/ola-0.10.9-r2.ebuild
index 1cd74bb29e17..e34b79db1983 100644
--- a/app-misc/ola/ola-0.10.9-r2.ebuild
+++ b/app-misc/ola/ola-0.10.9-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenLightingProject/${PN}/releases/download/${PV}/${
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples ftdi http osc python rdm-tests tcmalloc test usb zeroconf"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 81efb54e1fe7..a6d66ff0c0e1 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -2,13 +2,11 @@ AUX openhab.env 167 BLAKE2B 6e67342c7eb05fb4f3b2e57769ad51d0db195ad707719caa4adf
 AUX openhab.initd 257 BLAKE2B 79ba1215667579b116a4b8b7ab6252546b79562ae5b64e5bd7f21304ee6071e2cdababa35c27063e984955afca768777339a60a1c67d66950ef04b852fcc931f SHA512 5c00a12810c0166ed853c0414c402ea6e5b79b27a91ea13ad875adef563d9d8349a986a428344cfa2d10af5b8b66ff30412764e4a133a9615bd00bb018f279e2
 AUX openhab.service 518 BLAKE2B f00b13946a588b1b2b9f94775d5ef281cac777888426bd97a87b72eed39fe23a609a51e819e690ebaae1c5ca5c4a37bb7874a64a52d39a305012602905be9e52 SHA512 e07cc1465bb8eee24cd1435b468279fcb2f95acbf44866306b0637e2d7e46c0aef50bb3ce9e22cafe5140d4b534df77bfcbdc7d7e697def9db94a0207f2e1dd3
 AUX openhab.tmpfiles 352 BLAKE2B 23bab4c007c924cdfaa602654f19030d702b855f3baf62aaa016d944c8caf4f93252ae3ab9b3442ff6a8a528fcdd7a12f9767c29bfed7837c8f2cc2594955c26 SHA512 cb7cc7483915512f65664a9439b07c25b15c3066f321c8087cece2803e937392f9f0888a5c836949632c9b0974fb2d6cc577d8f785423cd42aa6ba575ba8fcc2
-DIST openhab-4.1.1.zip 110909555 BLAKE2B df89e2391e8abe926635fc1e0fbb5c7b1f6a03a87ba643d68a3c8bf1ef52f8b6ca862d8655112a225e1ec2f2d9cc90e0906c40a5dc00f52b53fcb4bac8059378 SHA512 50125e025e4ed8f3ea93359a777e0944150cf157b853bc3f6e777c04956c59346d77d4f3680756241d3d71b8c57014f777601cb5ca836b8e80046ce5a5aac770
-DIST openhab-4.1.2.tar.gz 110558399 BLAKE2B b77800898d5358caaadf31e921351d5431a09cf97ad881e091c0f7f7ca6efa13439f39075e15d4887df3b28d2548b10cbf44176328570cf2b8df8fc15bc25ecd SHA512 ccad90d1905f2190cd54284353981453d4d38f1206a427b91094dfd8e8a25e31cc15921544ac883f501ee33d018226b07e12e04bfd5c928771ff090826de3cba
 DIST openhab-4.2.0.tar.gz 110566875 BLAKE2B 25f07801258b958d3845cc43360eac9707416c424d61a8a2eeda55d522735bbf2690c989588cd40dee09ce72aee7aa53e2704d048645190981101cd293c5090b SHA512 83cc0c171de303bcc01198a94963933a7fde93f84a8ccf3cb27511de680576e14d03482d13abc0c0fdcbda6069a6d6f46dee44cb85f597aea2a8641c6693337a
 DIST openhab-4.2.1.tar.gz 110592664 BLAKE2B 6c1ef4ff6a25904a6bd56c5bbb5d6c08163e14723a61966930ffb96183a5890f86ddc73d316d8b48712b262eae80b7e086cdf53510d5a1a09a596b591fe3d037 SHA512 1d8b4b6b7ef4f76ecaee0355842b5bbfce9c422915bdc345e974bfe7d1c275dc4f8bc317f3e53ed6778d7875c7e7757bb3d26e68e016c1d3fbf1009a6a1e070d
+DIST openhab-4.2.2.tar.gz 110594562 BLAKE2B de7f67f8891ede0eb197188740d1b8b040a8adcbcd8b505518aef9290debfa7f97a5a894fd22072fa46dbaae7e9286da2fa41afa56b54c1011f9640db171535b SHA512 0c9367780e34f8a59f74d8edf18e2a503c71cc3af0f17aaca75888243b02393eb2c6188b84e5a04c3ca63b88e80cc0eb5a6db3603e348e10ab09e9b922ac2a64
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98
-EBUILD openhab-bin-4.1.1.ebuild 2229 BLAKE2B 378e56fb29a89c02be2c61eaa6d9e1bd5389d06b82ddb3409419b528c96f33f492485723ce5358d28cf9313862462ced24418f172bd1868a4e0974b877bec665 SHA512 6fecb3a02da8a16c51b8a17e0acb441f8aa21d214e0ac8d52c47d2b9e3550638c4e34515ea54bac666b0612664afd100ebd4cf59363161aa8078b6c0a261a54e
-EBUILD openhab-bin-4.1.2.ebuild 2801 BLAKE2B d6d1f91d0b2838b4d9e4591631cd9b94a38ae21c1638dd61762ff5211ceb2adceee4ed43baf2db0872aa3aa7a77afa999e0c6af254eaf0b07b2c4edfc4bf7e77 SHA512 5a705405daa98005bc7cef3984cca7194231d67a8f8ae298882929cbd5778088faf627331c7866994ab58d35a2c977671ce9b6c81661811de1f8e013c2bdbdbf
 EBUILD openhab-bin-4.2.0-r1.ebuild 3174 BLAKE2B eb4ea8c6d94eced9c31332fd7afc344a772c786bdafa12b144ec3fbb01fe6d0b6785411c487f3606052edd079e069e838c6961e5b72449c8147e055a110015c8 SHA512 20d13d2f21aa55d9f4d03a0c92093fc418ea8dddfde13d47b7932e9c1f9ca68565cb379c7071dfa50d0d35e3f9847e555b7b14c883f6ff731d5f88df8e048828
-EBUILD openhab-bin-4.2.1.ebuild 3176 BLAKE2B 5d59ee97a386952137cf9c391dc99160977efc70e30f5261149c7e9bd625c923198c65532f8d8398cdb2c6fb5fb9d5b80e88ea299675b72b5db498e44ea02193 SHA512 64ca9c1e4e079d026b8dc51cd997010735b690e9666b3d2fb898de01b2c18b3f8cb862dc15d0aeb7b138990f63b9c430ee3082cf5358d8f8bbf9de0984e1b86d
-MISC metadata.xml 355 BLAKE2B 36aabcc2d06a2d16b5ebe20ac5d7a9edbbe1121e5b7ea65206142dc56ef2258141d4618883aa5121acb73b7a275d955dffa44219b2fcc0fc77d3ca5eaf79225e SHA512 09a9f603096ad6b0f806d53b4454a899a8692b98ff2b8721d4095c382ff09c928236f1c7400a2132d33a4b5949d6f18e48325dccb49b51eb662c0447845d2862
+EBUILD openhab-bin-4.2.1.ebuild 3174 BLAKE2B eb4ea8c6d94eced9c31332fd7afc344a772c786bdafa12b144ec3fbb01fe6d0b6785411c487f3606052edd079e069e838c6961e5b72449c8147e055a110015c8 SHA512 20d13d2f21aa55d9f4d03a0c92093fc418ea8dddfde13d47b7932e9c1f9ca68565cb379c7071dfa50d0d35e3f9847e555b7b14c883f6ff731d5f88df8e048828
+EBUILD openhab-bin-4.2.2.ebuild 3204 BLAKE2B 7a0ece2883a709214845bad36f725bb8152fb9a56fa77966b0331d4a1b537f3d8219ccc4a24a6cb503dc3ee0251ec114d2133476ea90bfd26dabc4f6a30d66ea SHA512 39ff168e348b59598aa89284fb0eab01f82383334a0c85b10dddf5a4ae17f401be08991f98a042b1cd54c4b0f2b66e0b39f5e3d361c1b11f4fc7b0d314431cc5
+MISC metadata.xml 356 BLAKE2B c21186f077dc0f799f5d65133e691fd2acc098326a19714e1561a83429bcd09df460e4ad0e7f168c374de12c0bfab51bb8da46877f8f2fb13565327a39d5fa7b SHA512 c9cd771ff2115a885331dd88a950288b540d8ca441f37946c405ead781292f7b4660d8f1ed98d66ae3c7350f7e98fb590b61d5290607dbfb754d554cc621ce6f
diff --git a/app-misc/openhab-bin/metadata.xml b/app-misc/openhab-bin/metadata.xml
index cf8ad5f41cdd..354e8e2baca4 100644
--- a/app-misc/openhab-bin/metadata.xml
+++ b/app-misc/openhab-bin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Florian Schmaus</name>
diff --git a/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild
deleted file mode 100644
index 633b026c41d4..000000000000
--- a/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-MY_PN=${PN%-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An open-source automation software for your home"
-HOMEPAGE="https://www.openhab.org/"
-SRC_URI="
-	https://github.com/openhab/openhab-distro/releases/download/${PV}/${MY_P}.zip
-	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
-		 -> openhab-cli-2024-01-14
-"
-KEYWORDS="amd64 arm64"
-
-LICENSE="EPL-2.0"
-SLOT="0"
-
-MY_JAVA_DEPEND=">=virtual/jre-17"
-
-# app-arch/zip: openhab-cli backup
-RDEPEND="
-	${MY_JAVA_DEPEND}
-	acct-user/openhab
-	app-arch/zip
-	dev-java/java-config
-"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	# We use move here to preserve the executable bit on the files under
-	# openhab/runtime/bin.
-	domove() {
-		local source="${1}"
-		local target="${2}"
-
-		local dest="${ED}/${target}"
-
-		mkdir -p "${dest}" || die "Failed to create ${dest}"
-		mv "${source}"/* "${dest}" || die "Failed to move"
-	}
-
-	domove runtime /usr/share/openhab/runtime
-	domove conf /etc/openhab
-
-	domove userdata /var/lib/openhab
-	fowners -R openhab:openhab /var/lib/openhab
-
-	local dirs=(
-		/usr/share/openhab/addons
-		/var/log/openhab
-	)
-	local d
-	for d in "${dirs[@]}"; do
-		keepdir "${d}"
-		fowners openhab:openhab "${d}"
-	done
-
-	newenvd "${FILESDIR}"/openhab.env 50openhab
-
-	systemd_dounit "${FILESDIR}"/openhab.service
-	newtmpfiles "${FILESDIR}"/openhab.tmpfiles openhab.conf
-
-	newbin - openhab <<EOF
-#!/usr/bin/env bash
-set -eu
-
-if [[ -v JAVA_HOME_OVERRIDE ]]; then
-	JAVA_HOME="\${JAVA_HOME_OVERRIDE}"
-else
-	if ! GENTOO_JAVA_VM="\$(depend-java-query --get-vm '${MY_JAVA_DEPEND}')"; then
-		>&2 echo "Could not find Java VM for ${MY_JAVA_DEPEND}"
-	exit 1
-	fi
-
-	if ! JAVA_HOME_ASSIGNMENT=\$(java-config -P \${GENTOO_JAVA_VM} | grep JAVA_HOME); then
-		>&2 echo "Could not retrieve JAVA_HOME of \${GENTOO_JAVA_VM}"
-		exit 1
-	fi
-
-	eval \${JAVA_HOME_ASSIGNMENT}
-fi
-
-export JAVA_HOME
-exec /usr/share/openhab/runtime/bin/karaf "\$@"
-EOF
-	newbin "${DISTDIR}"/openhab-cli-2024-01-14 openhab-cli
-}
-
-pkg_postinst() {
-	tmpfiles_process openhab.conf
-}
diff --git a/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
index 6625624aba64..683f79d8f3fa 100644
--- a/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 LICENSE="EPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 MY_JAVA_DEPEND=">=virtual/jre-17"
 
diff --git a/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild
index 9b1c384fe722..751af46f93e1 100644
--- a/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild
@@ -7,13 +7,14 @@ inherit edo systemd tmpfiles
 
 MY_PN=${PN%-bin}
 MY_P=${MY_PN}-${PV}
+MY_CLI_VER=2024-01-14
 
 DESCRIPTION="An open-source automation software for your home"
 HOMEPAGE="https://www.openhab.org/"
 SRC_URI="
 	https://github.com/openhab/openhab-distro/releases/download/${PV}/${MY_P}.tar.gz
 	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
-		 -> openhab-cli-2024-01-14
+		 -> openhab-cli-${MY_CLI_VER}
 "
 
 S="${WORKDIR}"
@@ -95,7 +96,9 @@ fi
 export JAVA_HOME
 exec /usr/share/openhab/runtime/bin/karaf "\$@"
 EOF
-	newbin "${DISTDIR}"/openhab-cli-2024-01-14 openhab-cli
+	newbin "${DISTDIR}"/openhab-cli-${MY_CLI_VER} openhab-cli
+
+	newinitd "${FILESDIR}"/openhab.initd openhab
 }
 
 pkg_postinst() {
@@ -120,5 +123,14 @@ pkg_postinst() {
 		if [[ -v openhab_service_active ]]; then
 			edob systemctl start openhab
 		fi
+	elif [[ -d /run/openrc ]]; then
+		einfo "Follow these steps to complete the update of OpenHAB:"
+		einfo
+		einfo "1. Stop the OpenHAB's service"
+		einfo "$ rc-service openhab stop"
+		einfo "2. Clean OpenHAB's cache"
+		einfo "$ openahb-cli clean-cache"
+		einfo "3. Restart OpenHAB's service"
+		einfo "$ rc-service openhab start"
 	fi
 }
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index ffa56e20c34c..da6218d290cb 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,4 +1,6 @@
 DIST pax-utils-1.3.7.tar.xz 113740 BLAKE2B d801df9c426f318c871655f238fe27b53e656c2789ef8508019997c98bbc540987b611642d87e76ae9f76a95f6cce1acd0b10e3491a146d1e3b3f727a6f96bdc SHA512 f1b87a564573da838a02c4cc10e0d5f9754c3b004ecb172a6290b48a8179b30695ae556942457dfac3caf07b91dd56eb1d801475c35e9708e4d671aa507f9576
-EBUILD pax-utils-1.3.7.ebuild 1854 BLAKE2B b7dd190febeb1a3ac34d1f22290a3bcaf15f8d19368ea31204afe42e3a944015d9f54d499d181c344438c58c6911e65585c856b9760185dd0e90aed46360a701 SHA512 f855fd22a43e9d327ff1ff23aa34b04790ae1ec36c9c6f63e9d83531f8d0dd3c371fe574e16f7e44b062e79f4f903799a8a271a19605d80ab65c63c1f9632cc7
-EBUILD pax-utils-9999.ebuild 1863 BLAKE2B b2c55d42040aa2899dc49d716b6c48f3d2e4ec3822d3867044cd3b7f04efff3fcaa60830f4961757a7f9ae4bb9b2224a4f4a4230773094aa3c19ad78d9bc4e20 SHA512 3ffa923b5847121307321ab8ac26ebef5302c56f5602660fcdbe325fabac3714e9e446262df2720d88010abd8d098e6a9df1c8dca2c2ad559b0bdfdb69e7c8e6
+DIST pax-utils-1.3.8.tar.xz 123556 BLAKE2B 9e658334f37bfee90d4d168cdb81bc3b4012c38b569c22c3b01688408e90f4727043636ff8908e6c049fce7be5476ba86773f07cb192e3a34721c1469f69b48d SHA512 0dde95f86802729d80b7b38af84dec636e973f6abc70600633edcb05d3d5f95c1b2861300ce478dd7f798c7a1e5eccb1011c06c53adba38e11a996b69d463656
+EBUILD pax-utils-1.3.7.ebuild 1848 BLAKE2B 5c83c66635adc2c17857cdb8f39c5d612f80b693854af43c1c1e4acfe9c29fecde32e4093915b3dc6931fc187d8e1862cf6bea027fd6ce0d7ce9dd2987d6814a SHA512 0590a5a5bdc40493422368f7478191eebdd66885e2d96473c217dda23218a49c841bd0e40090c72a7fa58f0f1c30394bdeb26fb08d67b2191f7887404a08be59
+EBUILD pax-utils-1.3.8.ebuild 1856 BLAKE2B 3b2271aa1ecd83386bbcf30819750aeca15592dcf30e6348f2352d1b6326d663754c4ef72d48283f3d001ab7740c5d1b8db29cfcd8d18e76a66751ce7c557b93 SHA512 98db1a0373c5538aaab3223b38b57486a0f7635e8797f063d5fd8110015c3d9591dc0cf81e22ac3b6ab6907145632c50103aabe828280e41b2f4b1e4301a48b5
+EBUILD pax-utils-9999.ebuild 1857 BLAKE2B 0dbcf26e81f8571c7d36ec3fe5259a8929d378591ebee84b9ed24bd5596999c53f10ad5e7ceb982543acb04a1a4e5eda62d6b3e2343ab05fa200447ca0d1dab2 SHA512 3528b19b6356ec4b0617abd140d5cdb0a3da88bfaded07ca38403483d0e535c164cc25595301d2da2332122bc483a2385170d3c4ba3be91044770f236abf9284
 MISC metadata.xml 780 BLAKE2B a1bd460e70b7a2a4bc0e5012fb28a31890ebe745e9d1d99ad427b0382d9df9ffb8363dbf8907aef9e35da0ee59e489b80f084dce205250040d437ccc229ce49c SHA512 61246256f126a5533829b7e0af50168e7a7395f98fc21a64abc970955892874bc690901a36f791bd73a36e7b659e3843b63c504a9f360c5e41f1ce3678b08b5e
diff --git a/app-misc/pax-utils/pax-utils-1.3.7.ebuild b/app-misc/pax-utils/pax-utils-1.3.7.ebuild
index 5b93dc47b744..13a621b79366 100644
--- a/app-misc/pax-utils/pax-utils-1.3.7.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.7.ebuild
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-misc/pax-utils/pax-utils-1.3.8.ebuild b/app-misc/pax-utils/pax-utils-1.3.8.ebuild
new file mode 100644
index 000000000000..d17a13c5a200
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.3.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: if bumping pax-utils because of syscall changes in glibc, please
+# revbump glibc and update the dependency in its ebuild for the affected
+# versions.
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
+	"
+	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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps man python seccomp test"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+"
+RESTRICT="!test? ( test )"
+
+MY_PYTHON_DEPS="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	caps? ( >=sys-libs/libcap-2.24 )
+	python? ( ${MY_PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	caps? ( virtual/pkgconfig )
+	man? ( app-text/xmlto )
+	python? ( ${MY_PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	if use test || use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		"-Dlddtree_implementation=$(usex python python sh)"
+		$(meson_feature caps use_libcap)
+		$(meson_feature man build_manpages)
+		$(meson_use seccomp use_seccomp)
+		$(meson_use test tests)
+
+		# fuzzing is currently broken
+		-Duse_fuzzing=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pax-utils/pax-utils-9999.ebuild b/app-misc/pax-utils/pax-utils-9999.ebuild
index 191841deb477..55c38f7049ad 100644
--- a/app-misc/pax-utils/pax-utils-9999.ebuild
+++ b/app-misc/pax-utils/pax-utils-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Note: if bumping pax-utils because of syscall changes in glibc, please
 # revbump glibc and update the dependency in its ebuild for the affected
 # versions.
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit meson python-single-r1
 
@@ -21,7 +21,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-misc/qtxdg-tools/Manifest b/app-misc/qtxdg-tools/Manifest
index d0f47d67ce7f..a0b0c521db7b 100644
--- a/app-misc/qtxdg-tools/Manifest
+++ b/app-misc/qtxdg-tools/Manifest
@@ -3,5 +3,5 @@ DIST qtxdg-tools-3.12.0.tar.xz 16740 BLAKE2B 3e716c85d1715b23001d32a301995d77351
 DIST qtxdg-tools-4.0.0.tar.xz 16760 BLAKE2B 8e85e4de4c3cdf100de294582cfa9f4d3d0b120bee0ff7a907a308a95d45a1db4a9846899373e13a63e1b8049690e34439ce91d34b6b2964f972c3a5a91641ec SHA512 0d3e3a4afa5a4a0a63b4e9c489b4b20688b5c6c79f6460d9d15dc519bdb911b14f4307e50cd236c20ab939c517eed2ba284295d4f05deb764facda4acad8f4d8
 EBUILD qtxdg-tools-3.11.0.ebuild 600 BLAKE2B 8a66a2f000e598909459f5756926bd4d113fb2849c6498607e9576d2af102639d1c45d526090c9612bbc3730d8424f6c32f0cd15cf86c49a4ff23a081a1f17f7 SHA512 de016014c38a326121630d1ac16db6a0a0cc2792cb3d353218a3ccd8caa88bf04ee505f89c0cdc20c0ea73678c3b0d320d1e0d9d7d79c6d9366dd60f9cd74bef
 EBUILD qtxdg-tools-3.12.0.ebuild 600 BLAKE2B d37c3a832ae5016fb5f505771d217c51e715aa674c7c5d9fb5fbad7c9b6134f485bc7940aac47d6e1dcf6881de8ed85ca21f4b05e87275603833d59fa6aaa754 SHA512 af91707372394a4fb1b21fdb600ec13395e5d15d569b71e96dac18a61e536cc326eb52de3cffda05a7688e004697aed4c9c58f68f7da115a4bcf12f0aa2afd61
-EBUILD qtxdg-tools-4.0.0.ebuild 574 BLAKE2B faad8edfaa3fd2806d68b6e49f14453cda5ef4305f6395ff547883958633837b5ff4fda5e406df502e37676de1239b4baeeab6e41e6a6e9e7bad9b79582c832b SHA512 0c72ae2bc6dca9b017cc5c0742f994eb58e9162e8e68b829d4ef0182fb9ebc5ff73db4752046b0ede717c6a5883bf905c133e172dba124c828b42c77bca4a413
+EBUILD qtxdg-tools-4.0.0.ebuild 585 BLAKE2B 8337833785f739cc0fcad89255829d394b198e7eafcafaa06b5dc67cc8e8809f1ef3fb60b3f1097244078f90cff0caf2f995b4582a361d1f6af66a73e082410a SHA512 1c63875aaa287d8c90ba94c3ba9e531b7d3e5a4aef701c72092ee48479b56428c5ceed4bb1069ce8389f43c9036d39bd65a6e1c4f7a2a91234c8569248755f77
 MISC metadata.xml 318 BLAKE2B 0cfa3589deb6a2af8f05101ae300035d66d7bd7d0523f3196e005c82c1e0bea15d09feb3b44a2c1db94efccf15f13552e05cf1d38c6fbd7b359f75bea573adbf SHA512 321b105744b1138f2d444235800fa9680c11a92e4e22efccd994c9d103365e2ae449f39ac64f213dce2e895e9b8bcd94c311d1e90a4c00e1f4071a0cd8a68c54
diff --git a/app-misc/qtxdg-tools/qtxdg-tools-4.0.0.ebuild b/app-misc/qtxdg-tools/qtxdg-tools-4.0.0.ebuild
index d8692fc1b148..ed13dffe584e 100644
--- a/app-misc/qtxdg-tools/qtxdg-tools-4.0.0.ebuild
+++ b/app-misc/qtxdg-tools/qtxdg-tools-4.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest
index bf91642cd58b..27ef9b7a3ac9 100644
--- a/app-misc/rdfind/Manifest
+++ b/app-misc/rdfind/Manifest
@@ -4,5 +4,5 @@ AUX rdfind-1.5.0_include-limits-header.patch 509 BLAKE2B 452f26f332850bcad3dbc6a
 DIST rdfind-1.5.0.tar.gz 55200 BLAKE2B ad031acba85b6dead8ec3cfb2dfeb13bce424ee3b70dabc2b1ecaf0bcab8ae64c33ce1df22a54b430876d95ff59a58a2c3dc86d93f551ca8dc069488d3319e6d SHA512 007e54c90a74a20913ce8af6e6ecc90414c503260d88afa5a98525d43a7b6445762210c6a957beacdc99ff3dab95adb4100a2553454d177c0cfa3cbbc937f495
 DIST rdfind-1.6.0.tar.gz 133937 BLAKE2B 88691864a4822198ca9b14bd61f6eb5371336463f165aad229d753fc925465019fa8c76d799b3889bda5405575cfe8ace404f1e3a4aec2e22edf9db62f89d164 SHA512 21d135551bd2d71a71dfe1e4faece6e980db3df18f34433b7b0a5da9e21ccc9067337892025afa9b4b1fd6069732a144b5b7b8e0441cbc9821a71a8b934cced1
 EBUILD rdfind-1.5.0-r1.ebuild 793 BLAKE2B 52da7875e353b3f5f6a950f1f4ecf4f494bee636c78d07c7f5591ab0e34a794bf9c8ae559211a4385445522daa1893631790421419ed698a9f94c6dd61f07cc5 SHA512 9e06c38666b258722f942c14eb0d73e81fc786d5aab8b27797e8ec26034a971bca12c1c8e28b2b97966f9fb62b2de29a44cfd1a52fae5ccdd263d0e1f6076b98
-EBUILD rdfind-1.6.0.ebuild 638 BLAKE2B f3296bcc4de43aa8fa070671f6249e835c9b842e199519ccfdf05235e27969327b96adef9f9fa614c3ecc6b49708ba90f7ff211998aa51ab7e403bd41a8f7dc4 SHA512 68597d6e0a61cf95ab8e68d309ab6d8f33deba62f0545c2c82733b2e8416b63355b5e4f2ef7eb55ca99958accd8416fa48d2497f30c33c42207b39fec07b1858
-MISC metadata.xml 841 BLAKE2B 32b8bde4c5907e3c1cf8cbecf78f1c10c9fe49efc9ce5748af35815c7d5a5ab958a440c6da5d7680f52d72ab200230813f33a54503edc274cd6d588716ee153b SHA512 bd25cb0e6341ef0202ed7c9b23db2de735818c3eb31b557145a12dca62cbe7298db4e7ad13b7f3c899055b51db13264a77a9eaf378e89e5f62886237e93bd142
+EBUILD rdfind-1.6.0.ebuild 632 BLAKE2B e4317ca0b4171cb53674e20d607cdd7535f1a7a2e1da64ac71f92d301e1467b250e213b4e337a308283aa61677e1b2df58b94da0233a55545baaa9d9dd0dc22a SHA512 a1aff370d65665574eba73278d9e7140a0e4f05a6efd5b028376e0ce15bed07e9738b6ebc29d1edbb6f94925aeee4844e238faa04fa7052c15f79608f7d730f7
+MISC metadata.xml 603 BLAKE2B 6f4db0223a8545d446a563484fab1d1f54a8a5ab7343a41353de82facad90ce5c1b5376829e705f1fd6b68aba2e7fd32e28f37bd5d91dda40f0e6fbd5b207e9d SHA512 c2905e6e36fdc0881747bca472d5cb26332005a475a80feaeeb7f02e6f040fb5bb6974bb5288b20fbd463cec88aa320ff62889552e17881f1e3cb146a8081ca0
diff --git a/app-misc/rdfind/metadata.xml b/app-misc/rdfind/metadata.xml
index 3fed6dc8ee7a..adfa81e45011 100644
--- a/app-misc/rdfind/metadata.xml
+++ b/app-misc/rdfind/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@tastytea.de</email>
-		<name>Ronny (tastytea) Gutbrod</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Rdfind is a command line tool that is useful for compressing backup
 		directories or just finding duplicate files. It compares files based on
diff --git a/app-misc/rdfind/rdfind-1.6.0.ebuild b/app-misc/rdfind/rdfind-1.6.0.ebuild
index fb2795b6bf08..d4c618201655 100644
--- a/app-misc/rdfind/rdfind-1.6.0.ebuild
+++ b/app-misc/rdfind/rdfind-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://rdfind.pauldreik.se/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-libs/nettle:="
 DEPEND="${RDEPEND}"
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 725d5885f455..28703a21c49c 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,3 +1,7 @@
 DIST recoll-1.37.4.tar.gz 3135691 BLAKE2B 1c9113cbccb812e522addbc7fec0aa0b958d8616aa1b753aa866e9bb96f78dc0a40bb79a4a8ad016286f2508f1d8dea172d308917a430fa4c98822feaba0d309 SHA512 9e5af5d00191658f23e6a5916718014827f12f4553d9429fe385c0bd1c72f2f49ae97e7d7b8121cb174b299ffe482aa547e4a3aabf2da92e9773bf9eb0f57814
+DIST recoll-1.40.1.tar.gz 3034050 BLAKE2B f3a863ccb0a0c1b17fd9eb3093de472cec47b6375683e38e1b462584b26570f3d995531314a9c5f2dd193dca62efa150c699705a23e96419787000d3c4694510 SHA512 7590f1d17f9d8fc7930044d43d92be47158cbd2c830d8723a1604b672d3d8df22e507d7208525e1bfdc169b5151f5b6a3f96bbfefb5bededd0e2dae7bdeb2359
+DIST recoll-1.40.3.tar.gz 3217280 BLAKE2B e1e8cd0bae67087b6b34b79b9be2dde1db388740f8c2e8a222b07081ac275859780ba72a03dd319c759eae0209542ebe720f859a8a440e6d54b089858cb07257 SHA512 1f374e2f3ff721cdacd146d96e404d59554587ec30da63ffda8c9075a0b4407f70714e96a2ab3d7963f5d848096e5f295dc80bd7254ad8109e1e93732a8556a2
 EBUILD recoll-1.37.4-r1.ebuild 3331 BLAKE2B c8219b7c354fdf9b182f75cddb280e6519291389b15ac5b034e361683f10d5ddc2370c52c9b98e6d2ba07aca3193669e820297bc6b769119c46e532a478565c3 SHA512 36b2fa430f92531a3927c70665ff8376573327b17ec7a9f6fcd4a1d983f0123867001178edb1fca43163f3002cc41b9ec572f15f3dfbf053a95fd5ed6d2d5982
-MISC metadata.xml 1413 BLAKE2B ffeeae4a0a0d5553e7ee8bffc85262eff920ca0d2ee2c8db767662f6f37c4b9702123fdf1cc1f804e9d646819d8523a360018813233ec6277d9d4d819397a67e SHA512 855cbf30c1d6216d52c1655ed20caf622ce835a6c9c0798b871206c29e946bdde2759e25f2d3003c0c8478d8cda78b28f1c3c0435db26001b0ea323858355a69
+EBUILD recoll-1.40.1.ebuild 3152 BLAKE2B 50f3cee4cabd6417c7698b70c41e7e63d7b907666451399e152e7f80b0d07e7eebccc7ea6f2ad7499ef1a13f5d978fb2757306a3d25942cf21992a4507dd63ce SHA512 5804387aad73464a18fd043dec97bc26fea7184c2c338552c64db1d630d0c1cabb90a94e2a746b9f6296c1abcce117f0d95d4ccf1181713f5635c4eaea72c066
+EBUILD recoll-1.40.3.ebuild 3144 BLAKE2B 54d00950dac06e8d054fd12297c2737502a013e3b247d99b92d515a09f8610b72685db2c8e36ababd8ec6641d1dcc669e11c1e8319fce0d43df1408b0b3b1c02 SHA512 a22a937520afec52611492f7fcf1e9d3d065bd0f2e64290d5bdf294e9940d87f83d76e64d413e74805bc7aa3812fedd943929d1fd10d9612e2d247bfb65273dc
+MISC metadata.xml 1416 BLAKE2B e438510df40387a659dcfd3a36ac2dce2157960ba42dd57ca7d2a2598d5f63a0a6b93851ee6f08ddc50c2eaf62f74131571f43bc58b1dd62190f51920b6f861f SHA512 ad698c9144ad42817fab902edd4b065976932a35aefe5715bdb647ef32f5d6c9fa1244fb2f079d2cbe7e261d0cb240e3d96e666984a99aed42ffa61814ecc80e
diff --git a/app-misc/recoll/metadata.xml b/app-misc/recoll/metadata.xml
index 54f36901f4f7..d6917c0fc057 100644
--- a/app-misc/recoll/metadata.xml
+++ b/app-misc/recoll/metadata.xml
@@ -14,7 +14,7 @@
 			<email>jfd@recoll.org</email>
 			<name>Jean-Francois Dockes</name>
 		</maintainer>
-		<bugs-to>https://bitbucket.org/medoc/recoll/issues</bugs-to>
+		<bugs-to>https://framagit.org/medoc92/recoll/-/issues</bugs-to>
 	</upstream>
 	<use>
 		<flag name="camelcase">Enable indexing for camelCase sentences and words</flag>
diff --git a/app-misc/recoll/recoll-1.40.1.ebuild b/app-misc/recoll/recoll-1.40.1.ebuild
new file mode 100644
index 000000000000..ae27da1acd9b
--- /dev/null
+++ b/app-misc/recoll/recoll-1.40.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit linux-info optfeature python-single-r1 qmake-utils meson systemd
+
+DESCRIPTION="Personal full text search package"
+HOMEPAGE="https://www.recoll.org"
+SRC_URI="https://www.recoll.org/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="camelcase chm +inotify qt6 session +spell systemd webengine"
+REQUIRED_USE="
+	session? ( inotify )
+	webengine? ( qt6 )
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/xapian:=
+	sys-libs/zlib
+	virtual/libiconv
+	chm? (
+		dev-libs/chmlib
+		dev-python/pychm
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		webengine? ( dev-qt/qtwebengine:6[widgets] )
+	)
+	session? (
+		inotify? (
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	systemd? ( sys-apps/systemd )
+	${PYTHON_DEPS}
+"
+
+BDEPEND="
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+"
+
+pkg_setup() {
+	if use inotify; then
+		local CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt6 && export QMAKE="$(qt6_get_bindir)/qmake"
+
+	local emesonargs=(
+		$(meson_use camelcase)
+		$(meson_use chm python-chm)
+		$(meson_use inotify)
+		$(meson_use qt6 qtgui)
+		$(meson_use session x11mon)
+		$(meson_use spell aspell)
+		$(meson_use spell python-aspell)
+		$(meson_use systemd)
+		$(meson_use webengine)
+		-Dfam=false
+		-Drecollq=true
+		-Dwebkit=false
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+	)
+
+	use qt6 && emesonargs+=( $(usex webengine "-Dwebpreview=true" "-Dwebpreview=false") )
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_install --strip
+	rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
+	python_optimize
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	rm -r "${ED}/usr/share/${PN}/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support" app-text/poppler
+	optfeature "PDF files with OCR support" app-text/tesseract
+	optfeature "MS Word files support" app-text/antiword
+	optfeature "Wordperfect files support" "app-text/libwpd[tools]"
+	optfeature "Lyx files support" app-office/lyx
+	optfeature "GNU Info files support" sys-apps/texinfo
+	optfeature "RAR archives support" dev-python/rarfile
+	optfeature "7zip archives support" dev-python/pylzma
+	optfeature "iCalendar files support" dev-python/icalendar
+	optfeature "Postscript files support" app-text/pstotext
+	optfeature "RTF files support" app-text/unrtf
+	optfeature "TeX files support" virtual/tex-base
+	optfeature "DVI files support" virtual/tex-base
+	optfeature "DJVU files support" app-text/djvu
+	optfeature "tags in audio files support" media-libs/mutagen
+	optfeature "tags in image files support" media-libs/exiftool
+	optfeature "Midi karaoke files support" dev-python/chardet
+}
diff --git a/app-misc/recoll/recoll-1.40.3.ebuild b/app-misc/recoll/recoll-1.40.3.ebuild
new file mode 100644
index 000000000000..0fb76ccfb84c
--- /dev/null
+++ b/app-misc/recoll/recoll-1.40.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit linux-info optfeature python-single-r1 qmake-utils meson systemd
+
+DESCRIPTION="Personal full text search package"
+HOMEPAGE="https://www.recoll.org"
+SRC_URI="https://www.recoll.org/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="camelcase chm +inotify qt6 session +spell systemd webengine"
+REQUIRED_USE="
+	session? ( inotify )
+	webengine? ( qt6 )
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/xapian:=
+	sys-libs/zlib
+	virtual/libiconv
+	chm? (
+		dev-libs/chmlib
+		dev-python/pychm
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		webengine? ( dev-qt/qtwebengine:6[widgets] )
+	)
+	session? (
+		inotify? (
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	systemd? ( sys-apps/systemd )
+	${PYTHON_DEPS}
+"
+
+BDEPEND="
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+"
+
+pkg_setup() {
+	if use inotify; then
+		local CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt6 && export QMAKE="$(qt6_get_bindir)/qmake"
+
+	local emesonargs=(
+		$(meson_use camelcase)
+		$(meson_use chm python-chm)
+		$(meson_use inotify)
+		$(meson_use qt6 qtgui)
+		$(meson_use session x11mon)
+		$(meson_use spell aspell)
+		$(meson_use spell python-aspell)
+		$(meson_use systemd)
+		$(meson_use webengine)
+		-Dfam=false
+		-Drecollq=true
+		-Dwebkit=false
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+	)
+
+	use qt6 && emesonargs+=( $(usex webengine "-Dwebpreview=true" "-Dwebpreview=false") )
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_install
+	rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
+	python_optimize
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	rm -r "${ED}/usr/share/${PN}/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support" app-text/poppler
+	optfeature "PDF files with OCR support" app-text/tesseract
+	optfeature "MS Word files support" app-text/antiword
+	optfeature "Wordperfect files support" "app-text/libwpd[tools]"
+	optfeature "Lyx files support" app-office/lyx
+	optfeature "GNU Info files support" sys-apps/texinfo
+	optfeature "RAR archives support" dev-python/rarfile
+	optfeature "7zip archives support" dev-python/pylzma
+	optfeature "iCalendar files support" dev-python/icalendar
+	optfeature "Postscript files support" app-text/pstotext
+	optfeature "RTF files support" app-text/unrtf
+	optfeature "TeX files support" virtual/tex-base
+	optfeature "DVI files support" virtual/tex-base
+	optfeature "DJVU files support" app-text/djvu
+	optfeature "tags in audio files support" media-libs/mutagen
+	optfeature "tags in image files support" media-libs/exiftool
+	optfeature "Midi karaoke files support" dev-python/chardet
+}
diff --git a/app-misc/regex-markup/Manifest b/app-misc/regex-markup/Manifest
index 192bdcce920f..83ce3be1c043 100644
--- a/app-misc/regex-markup/Manifest
+++ b/app-misc/regex-markup/Manifest
@@ -1,5 +1,6 @@
+AUX regex-markup-0.10.0-c99.patch 270 BLAKE2B 490ffd27bcaecc78dd7f9a0ae111bb6536ed72702e5ffd810af0b42eb8617c0d64ca4915d65dbbc2d137ca2643d012a25fe42c47cafb87c6e6a1cbbd896012ec SHA512 696532eb38d9dc00fa2ca50214f6ecb66e0c96aacb2e0197d3eb7c9c042bc255dd4c4487f4c55eb9234954d2e4792036155a0aa44a5753c9b4ad0cb69137279d
 AUX regex-markup-0.10.0-locale.patch 646 BLAKE2B 6e445af3492563105352ca63930e7f52a2389d96181aa86e85d28e5ff89d72c28f5ac368d06e46cf4e6d1e2f8adb65f279f494f9413349b79fa947b165bfe0a0 SHA512 d1d181950c1aef34df631f5a9143163e62bbb5171bbcfac7099998e7e658952ae19181e37e95b1d6f2e65cec34ce23d2aa0894cd93e8b4a84f0410d751c36177
 AUX regex-markup-0.10.0-r2-configure.patch 570 BLAKE2B 0e0a8857c6dc1a18d37a7c32bd230a7d84996d687f43a7d2d9dcbde86e6e07e428618fc2b1cd19857016f4cc95e90f8103ff647319b97b2f8151a4cf941e7909 SHA512 5b9cbd6c37c484eb48df789792ae216bf240bd92ce36b35d17226343578e80730b65aecbb75c3769aee6e72dfd55cacdbf58eb38a80207aa520982fda254dd93
 DIST regex-markup-0.10.0.tar.gz 424480 BLAKE2B 1b1aa0054c754b4ec36e7a06a38617b01fc86699159c98c709fd9b2bd7394644c8eb69eb0b1e4b39fa157c02daa3a55767edce831bcc7f4ceff7f40786b4efbd SHA512 fddb43b41771e5f75a140798304023087931da383cdee0b6fa9c0bd867e9e5280f484bc6182960c08993d91963de22fa9f0052e867a58067dfc39d9b761e0e9f
-EBUILD regex-markup-0.10.0-r2.ebuild 801 BLAKE2B 98f73ef8d03d0ff5ff2248d50a438d278b51a04eb24b1e9d31ea7f2ac002f2f8a109d53df44b6b8cb8c1cd08010239e9d7bd2a204327298d945be2f3c74226ad SHA512 8831f525c2a69360437c29b33fefef1fc75df1422e4d068c56b795a0efde686178635106cbcfaf894e9e53c271f26fcaf23b317d579eec2dc22e41891fe552ba
+EBUILD regex-markup-0.10.0-r3.ebuild 839 BLAKE2B 684976c30b7238894cdae96f317dc5b85992d6e9a8ac5590b0d96a2b9c3950f67c4e25cdd1e6292590e48fbab68ede671152e0bccbe875405576ad065103703a SHA512 3512c381bfd81d374de03b65995c308dad3b71180e95aea6d5498688f1d2df12698cd5f3f22c9a4371aa7a77eede263294c7fcc789cfc5dcfa30e85cbf658851
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/regex-markup/files/regex-markup-0.10.0-c99.patch b/app-misc/regex-markup/files/regex-markup-0.10.0-c99.patch
new file mode 100644
index 000000000000..4988b57e9d75
--- /dev/null
+++ b/app-misc/regex-markup/files/regex-markup-0.10.0-c99.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/923618
+--- a/m4/regex.m4
++++ b/m4/regex.m4
+@@ -34,6 +34,7 @@ AC_DEFUN([gl_INCLUDED_REGEX],
+ 		   jm_cv_func_working_re_compile_pattern,
+       AC_TRY_RUN(
+ [#include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <regex.h>
+ 	  int
diff --git a/app-misc/regex-markup/regex-markup-0.10.0-r2.ebuild b/app-misc/regex-markup/regex-markup-0.10.0-r3.ebuild
index cee94b1f3d2f..e31d3e2708db 100644
--- a/app-misc/regex-markup/regex-markup-0.10.0-r2.ebuild
+++ b/app-misc/regex-markup/regex-markup-0.10.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,7 @@ IUSE="examples nls"
 PATCHES=(
 	"${FILESDIR}"/${P}-locale.patch
 	"${FILESDIR}"/${PN}-0.10.0-r2-configure.patch
+	"${FILESDIR}"/${PN}-0.10.0-c99.patch
 )
 
 src_prepare() {
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index 20dbc344de2e..a6ae49a37059 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,8 +1,8 @@
 AUX remind-include-fix.patch 339 BLAKE2B 5074ecf584dbc1e44d4bc0089b90330a8f02d641e90548d08cd12f210d2471874304971a5bc999b48337716a70839d398dedc081a4ee44ee65afdea1fcd15c9b SHA512 08cf0cefe688869985254cc1530ab41fd45f185e07a2475314749cbbe9e8f9cffb3cce61a3530fea86dc79b0d8e224efa6c45ed8de69599465db40be81352836
-DIST remind-04.00.03.tar.bz2 390884 BLAKE2B 4f619ec902f76c5c4857ffa85428154ef6fe525cc97bbe92272f3abca3e8cdd39dd45d1c45c5f6e87f0d22dde500dd80629882bdbe93a6b97b5da96757b5af9c SHA512 41d61d267d99d787993cd5bf3889f1fe80f76a0cfe5a7e2d360eb7239a1b5a05b50b3b5cde30c50404813e723545eb805148ca2c6e540eb9aacbf5e8ffd64014
 DIST remind-04.02.02.tar.bz2 413760 BLAKE2B d4e91b531c0e88dc4436a0399103af6c9ae8e642a8df729a49ac6be06e215705c7605424030d92761753637a68a89eea2d935347b40c1b39b626b13e4e7297db SHA512 2d10f8d0066c291d52220fc1c39cfc4948e5f1f94223780b7d4770348b5c9e06e2b8f34e1e193c06f8e74b26d3e4126fcaeea88dbf8900f064610df22e9c8739
-DIST remind-05.00.05.tar.bz2 468131 BLAKE2B dc02e21fa1da4eca47fe59bda3555f0fb7cee8d0eef5cca27be73f1d1053ad7b7c3a23cb7e2648bb88d9d5fbf8b39fbd7bb3df245b0eaf1f76ec6b124928bc2e SHA512 5e9657b3946d69ff1d615e5dead2013381cd12660dc0cdda39f7465227888aeb2cb2bc9c9dc4ab27474df82062520c44605d95339812325257e363b075c3e829
-EBUILD remind-04.00.03.ebuild 1171 BLAKE2B f17c231631c299c65e10eec483ac854ef1b4a108403d0117aa0d98fd4bc639eacfa5e5f2ebbaa48980c4b162a48da4df91b94452c157b31d42f8b11a70a366d5 SHA512 e8e05c885c5b5e8d25ce6628a394a5e78669bcaee4147ad9b42a6604265a86d5a75379529e3ddc6e387c40f421ad949edf8d04a220ab2c83afddd9c82832f356
-EBUILD remind-04.02.02.ebuild 1043 BLAKE2B daaf04632b86e62b4da7be2e23fbe00e435773db3c435b284cff763db6dbc011ecbd36a989bab81e442909a27a01eac8d1149b7149673a6a70701de47f3861e6 SHA512 621b724812620cc790c29af59b80fd39e3e4db0bc87eef5950b1f656791b5494586d9828f364ec772403ca36ded5e1f3f34ced8e01eb265a6194fbfb38cea5ac
-EBUILD remind-05.00.05.ebuild 991 BLAKE2B 0f9d8745803a32e074b5fa240192ed45996d3e2ace16a222ac15d316c5dd0e9f4ab211f0c667d296167846ff83680c280a98649e3d890ef71a62fa43c9be2a9e SHA512 aa0288b5d2b4c4b88376751dfae6f9314c08084e7efd92f3374138296f85591c54c49354cb7983f40a7e3ab33af4e879506156664c8cbb5ed04df180d51760da
+DIST remind-05.00.06.tar.bz2 473106 BLAKE2B 0ae7d45076fe04469151aa780a833c40f259b841b693abc71c2b8e32e13ee1a3a6ddaec3a8bdb74330216b4a0b2c68788c66f6ebb3447a12c84dc3e4273c026a SHA512 a6e3d8a281acb9341f980d173c13a2f5e925581abd57fd47cedfeeaf0c05a51309069ba45dc305759a50ce82470a40568077dc5d3bc7bb9d3a36eb0a79b57006
+DIST remind-05.00.07.tar.bz2 475235 BLAKE2B 1414aa6a68e94c68b8ac17effaa3531b14596424d9b7fe1ac9764754dea136d0d7b4883b112c6e687173dfa09efe59c989fe9f389612406da877471ed9b01bd2 SHA512 ec29a3c9720490effb7a6b93e8be618de84ea8833d4d0b3d84614741a5d4d2efc60ecfc17b929154f229a102ed25e9389d5f505a03c9ee22c9e8c500f7c96ab5
+EBUILD remind-04.02.02.ebuild 1041 BLAKE2B 5a788617e9a79f6a35a9f13cc7ef235ad1c0c4c37a5afa8a4b38269ff80a13c66a0b5ae1b39e5a63dea31dc6fd4a51ecd9933b9e70d1e1185ce297967439d6ac SHA512 9c171e8f50d09d273d938b9721ec42dcdca4f0882d64ffcd4489fe60257a7e109fe6a8776f670e26ee13b7a2f9e48d005ec9eac784519a6a7edf7d86843ac313
+EBUILD remind-05.00.06.ebuild 989 BLAKE2B 6b3026d0dd89359f41f71c7b628c7aa3112f13d7bd42d07a05cbafb0477865bcd84364960bf7ae2762fa10ef3d7c11fadcb130c5fe2e0556262242c3d320e0fd SHA512 cc4478106661ec14d0a5f38ad2bb82f801207f34b96ce1a10057029dad80a19a6c65d508c56b4da001e9817c757cce891e6bdfbe782db1032d85dcf13764f3d4
+EBUILD remind-05.00.07.ebuild 991 BLAKE2B 0f9d8745803a32e074b5fa240192ed45996d3e2ace16a222ac15d316c5dd0e9f4ab211f0c667d296167846ff83680c280a98649e3d890ef71a62fa43c9be2a9e SHA512 aa0288b5d2b4c4b88376751dfae6f9314c08084e7efd92f3374138296f85591c54c49354cb7983f40a7e3ab33af4e879506156664c8cbb5ed04df180d51760da
 MISC metadata.xml 398 BLAKE2B 037f58ef9b9d372a1137066db288badda6f884013296b4ea879816f539a91b5f484148ecd3c874561d24a9a3b4e336f6a73b332b30fc666f19f213b6bb37245d SHA512 c4d6086c77a47321b33e8ecfc827b51dad5f79558f1cb8845d495326d1f002e7fc5289165735fb26d1a1020e55d85f22358d313be11f5ddfb05b6580db027833
diff --git a/app-misc/remind/remind-04.02.02.ebuild b/app-misc/remind/remind-04.02.02.ebuild
index a8b7d91aa369..bfe3ea068177 100644
--- a/app-misc/remind/remind-04.02.02.ebuild
+++ b/app-misc/remind/remind-04.02.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://salsa.debian.org/dskoll/remind/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/app-misc/remind/remind-04.00.03.ebuild b/app-misc/remind/remind-05.00.06.ebuild
index 3c5ba29f3f58..c42618d24622 100644
--- a/app-misc/remind/remind-04.00.03.ebuild
+++ b/app-misc/remind/remind-05.00.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://salsa.debian.org/dskoll/remind/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="tk"
 
 RDEPEND="
@@ -21,13 +21,7 @@ DEPEND="${RDEPEND}
 	dev-perl/Pango
 	virtual/perl-Getopt-Long
 "
-DOCS="docs/* examples/defs.rem "
-
-src_prepare() {
-	default
-	sed -i 's:@CC@ @LDFLAGS@:@CC@ @CFLAGS@ @LDFLAGS@:' "${S}"/src/Makefile.in || die
-	sed -i 's:$(MAKE) -C src install:&-nostripped:' "${S}"/Makefile || die
-}
+DOCS="docs/* examples/defs.rem"
 
 src_test() {
 	if [[ ${EUID} -eq 0 ]] ; then
diff --git a/app-misc/remind/remind-05.00.05.ebuild b/app-misc/remind/remind-05.00.07.ebuild
index 0e6403f27109..0e6403f27109 100644
--- a/app-misc/remind/remind-05.00.05.ebuild
+++ b/app-misc/remind/remind-05.00.07.ebuild
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index 4b2f0ddcb882..8a3c447bac1f 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -1,14 +1,11 @@
 DIST resolve-march-native-2.2.0.tar.gz 15110 BLAKE2B bd0fc09f35bcc46727a9d105d09625c1e1e38528febd315f1e79427ec516326773c3832be15146fcb9bea99ba3435a1a9ee28684b963919c1c7eb185ed5716ca SHA512 85ddba5646168cb1644c99504b4be673c52cec0cae7deb028d9cb923fa0b09817a3f5c08f6e0e546bba89f78cc574193b0bb26d1c3bae86f31ed8808cb17bdda
 DIST resolve-march-native-3.0.0.tar.gz 15866 BLAKE2B fcfcac3cb1219d332c8db6a5b448462fc452fed892783b66637658cd80fd952764ec6d103d83ca5800997b9b50021e7d8aee1470c6adcf73c3eebf0e35389bd2 SHA512 8bebb5aaa28961bb059fa207631d004a13922b932675e68f74d315e100c98d670628a6ab8e87fab3da043d69ecf993ad60049f85951144f073787bf348183019
-DIST resolve-march-native-4.0.0.tar.gz 18648 BLAKE2B 1d6757aed66da2f41b622d74b594c54c34fc5ebe3f47518ed959313e60cbe5f2fc04aa87f9781f82322b27642ce4a4315acd6f27b9b1f727e6533bd5c9130cd8 SHA512 375f3eeaea76cf53d29fb338cc73b647db7bf2456adb6e09c25bd1f92b8bc521844cfcae117fd0b02d280896f542d1209c118a33a0cbd8dce3ceec3873c8c85f
 DIST resolve-march-native-4.1.0.tar.gz 20309 BLAKE2B e702d974db69d3e1e06d66d3f7a8aacd2d68077c105bf0b5147f5e3ab647d95009e96de5551f1ba9740872a2bbb08cffd65b6e3da495fbafafb2fa6312bf8551 SHA512 11ca0d982aad183687ce8a52f407cef73a2e843c1b227ba4fed72bae7927b8bc342d6a8adcc7da20a5ebc9c85a79f598cd2e0b603206b0b5c7f070e4b71c09a7
-DIST resolve-march-native-5.0.1.tar.gz 42875 BLAKE2B 0e4795eb9caa02af95ff74406760c01cbab827e7d6928779d59bcf9dc9f230049f932f9236e10024fd4df3b191728e72d86f464f8dc956e579a10cd7eb012425 SHA512 0613f0ea7fed19e9497aa7e237cbe527febb11faafc12d372a0b059c6a57e285e6b109175385547267596a9ee5b97b6368fca676f4c6023768bc87a7351cd0ba
 DIST resolve-march-native-5.0.2.tar.gz 44486 BLAKE2B 2b6554cefabb17d9d931d2e1316d52203630971958091ba721ebeef77411c1c19385a7e4bc8c31bd9c781459f041aeb9a301b796be634f2a77a1418cf2a76d8a SHA512 272841289ab3695e9407beb289e42b56b67ddde594ee6b794ebb9cf2915a97f595f056985f62febcfeea3137e62400b389c586e849c4871b65d559130021633e
+DIST resolve-march-native-5.1.0.tar.gz 45734 BLAKE2B 88409980f64e92ad090104756ace2d05716eb5b6eb2f72c7e88e7c9d30aa4b8912aee2501b732857ac22fd16958d99ccafa7dd8d43d250da2849dcc8a7a0877f SHA512 b532011d2b524cc280c79c1e8d1f2d9036a3fd000ff92a22c363d416a7e86379c397a7404a329b950d2ea08c69ca1b78542fdd969f4fe8631eba1ad619af54d9
 EBUILD resolve-march-native-2.2.0.ebuild 524 BLAKE2B 9283955da0b65409f536734684002f62d7a54189f240078e077b45a72abaca71384f48be28e0bf8b7e79848793f47565e23e2ebf1ee63c927dede11c613b8476 SHA512 a37daecfa5026a2d0718cbb24b3e26247895e0ad41fd23a5b821a12b8a1cda49b0085db67b55f83403c31e5aa4140abb1b83981d682dee1e655dfce49bf49f43
 EBUILD resolve-march-native-3.0.0-r1.ebuild 508 BLAKE2B 209fedf22ed22176b8c581826598f252dd080883d5dc73c3f2ae2b0d62616b9fe8d67937e2ce1f3ec5e79e69a4340f1bbdb665d379ec9531c93451bf8b714af1 SHA512 e4fcc606aba0d1ab1b9a23e9f323c852faadf52b3935ab0f6eb2d98d681b1120ec2e544032690fbe66ea6a95ccb89a91590d42591ea7b190f07eab2b95051c71
-EBUILD resolve-march-native-3.0.0.ebuild 508 BLAKE2B 0c0dfc3330006513905da57ff0453d68cf1dd69aff0e165347ea8923c44fc619b49cb1a11e863fd05acb3e84d735955c8a3971186d31a9ff4cd39001ddd0456d SHA512 6716ccff68fb9a3cb10ae177d75ac4ef04805370056a9c6ff34c7bd0f31c4da5321ef902ad0f58be43d2ef27f77fbea7b448e89dd598f5929e13ff7719007d9c
-EBUILD resolve-march-native-4.0.0.ebuild 508 BLAKE2B 209fedf22ed22176b8c581826598f252dd080883d5dc73c3f2ae2b0d62616b9fe8d67937e2ce1f3ec5e79e69a4340f1bbdb665d379ec9531c93451bf8b714af1 SHA512 e4fcc606aba0d1ab1b9a23e9f323c852faadf52b3935ab0f6eb2d98d681b1120ec2e544032690fbe66ea6a95ccb89a91590d42591ea7b190f07eab2b95051c71
 EBUILD resolve-march-native-4.1.0.ebuild 508 BLAKE2B 209fedf22ed22176b8c581826598f252dd080883d5dc73c3f2ae2b0d62616b9fe8d67937e2ce1f3ec5e79e69a4340f1bbdb665d379ec9531c93451bf8b714af1 SHA512 e4fcc606aba0d1ab1b9a23e9f323c852faadf52b3935ab0f6eb2d98d681b1120ec2e544032690fbe66ea6a95ccb89a91590d42591ea7b190f07eab2b95051c71
-EBUILD resolve-march-native-5.0.1.ebuild 508 BLAKE2B 209fedf22ed22176b8c581826598f252dd080883d5dc73c3f2ae2b0d62616b9fe8d67937e2ce1f3ec5e79e69a4340f1bbdb665d379ec9531c93451bf8b714af1 SHA512 e4fcc606aba0d1ab1b9a23e9f323c852faadf52b3935ab0f6eb2d98d681b1120ec2e544032690fbe66ea6a95ccb89a91590d42591ea7b190f07eab2b95051c71
-EBUILD resolve-march-native-5.0.2.ebuild 505 BLAKE2B 7dabd99d115c61509ec36e2fa0736cbd6a5832f5509e810f0896a0d873692a29d258ace8775cc0c379c74e91e8cdb1aa3643f69f7cbbb6d0d5f9ab42a80b5691 SHA512 599d58c821d8d1e56c00f68151f7a6eb1ee81bc7ad6e07097b9e19b91883de0ba3905b77cbe1d3917685f2e4e91322122e78dc57e19aea99bccde27749673dda
+EBUILD resolve-march-native-5.0.2.ebuild 512 BLAKE2B 36a7a12192bc9148f3fd44e46b50c4ef76b4bd5be57864eda924d53f627fd680e7797c4a775992b21ee84ec9e6850b419ace6386fbe3b3ac2a757df191376404 SHA512 f78800485d748f9029fdc2aaac6f4f49e2e0230c33d1bbdef596d11f7f65eeea9c45593f31e3eaf0a1aa1ca4f105338e9da5e93d5e051c35960f12e995dc791b
+EBUILD resolve-march-native-5.1.0.ebuild 515 BLAKE2B 8b4e99cd3c22865abc67139d0d233915781705fad1423f6044dd90ecb4aebede531b68d8c7cca844df284575ea65a4f1a7bfc501f4a9236058fc9cc91dc3c682 SHA512 050bce325f7a706f7a63e49a9368ab0d573985cab676ace423ef52cbc438796edef6ddf0f5a59f2f26e38bc91e688c2b9f54b5d66cad562fd91717d4ad3e7703
 MISC metadata.xml 344 BLAKE2B 90b1eab14f1ff2330a87a33bea4de6d1179aa4fdef0460d3ce08054afe2abd23d09a6798539c2ac17b4b512db6777ff4274c883c5bba59baddac8cb873563fab SHA512 67a6747446ff67ecaddcce213508c6e01b3734239716bd051416e96a73d03b00340bffb74cd47cd4e1569ff2342c21d794f361d2b68b49ed4910eaad8421470f
diff --git a/app-misc/resolve-march-native/resolve-march-native-3.0.0.ebuild b/app-misc/resolve-march-native/resolve-march-native-3.0.0.ebuild
deleted file mode 100644
index bb3b5181e12d..000000000000
--- a/app-misc/resolve-march-native/resolve-march-native-3.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Resolve GCC flag -march=native"
-HOMEPAGE="https://github.com/hartwork/resolve-march-native"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.2"
-
-distutils_enable_tests pytest
diff --git a/app-misc/resolve-march-native/resolve-march-native-5.0.1.ebuild b/app-misc/resolve-march-native/resolve-march-native-5.0.1.ebuild
deleted file mode 100644
index aafd9d6b010f..000000000000
--- a/app-misc/resolve-march-native/resolve-march-native-5.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Resolve GCC flag -march=native"
-HOMEPAGE="https://github.com/hartwork/resolve-march-native"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.2"
-
-distutils_enable_tests pytest
diff --git a/app-misc/resolve-march-native/resolve-march-native-5.0.2.ebuild b/app-misc/resolve-march-native/resolve-march-native-5.0.2.ebuild
index b7ca7a116543..ea5d022e1a67 100644
--- a/app-misc/resolve-march-native/resolve-march-native-5.0.2.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-5.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~alpha amd64 arm64 x86"
 
 RDEPEND=">=sys-devel/gcc-4.2"
 
diff --git a/app-misc/resolve-march-native/resolve-march-native-4.0.0.ebuild b/app-misc/resolve-march-native/resolve-march-native-5.1.0.ebuild
index aafd9d6b010f..81e9415e221e 100644
--- a/app-misc/resolve-march-native/resolve-march-native-4.0.0.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
 
 RDEPEND=">=sys-devel/gcc-4.2"
 
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
index aa395d19c5de..3a72ec7f248d 100644
--- a/app-misc/rl/Manifest
+++ b/app-misc/rl/Manifest
@@ -1,3 +1,3 @@
 DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
-EBUILD rl-0.2.7-r2.ebuild 332 BLAKE2B 6e937ac6f7782763ade8102099daeb2f1e6825bb6f522609c1ea857688c5431adea11952920f3644f745b15c2fcc2636cfacf5f78b2d03c282c5ca39ea6cefa6 SHA512 df3203cc025940f87ebf922f7d5194fce7dfc3141789b1fcda0c482d9d3702ed194f914450913abae5b9cc1db60cd8a712090e50049463a4e04ec5a01641e72a
+EBUILD rl-0.2.7-r2.ebuild 326 BLAKE2B dbe4184ce160ec5e37bda7e210f1a955fb9b104beece08344f9270754d9f6056df0cb23178766c6f2c3e99e33aba5914e9e36a7cc80fa7e20b1652c72f7e0e8c SHA512 0cc2fca2474cfa356d3f122812aca7a0f32af6b693be91cda6488d35c2c2537f3bc7586c986f63fac2eaa0dbbc753110a74603a65ad21e3b8e43001b2e61808b
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/rl/rl-0.2.7-r2.ebuild b/app-misc/rl/rl-0.2.7-r2.ebuild
index b30a56e03f5f..e976c5b81676 100644
--- a/app-misc/rl/rl-0.2.7-r2.ebuild
+++ b/app-misc/rl/rl-0.2.7-r2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://arthurdejong.org/rl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips ppc ~s390 sparc x86"
+KEYWORDS="amd64 ~mips ppc ~s390 sparc x86"
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 12efd01f6ef7..111312e174e5 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -8,8 +8,8 @@ AUX screen-9999-no-utempter.patch 465 BLAKE2B be4d690d2f478a2660cb3c0b0f83d9a623
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
 DIST screen-4.9.1.tar.gz 1040785 BLAKE2B 27d9c100bc1f747e39e109a4957702388d943c7d3b75b4c59dfc3894456d5249257742106fb24cf6f07a36764db0a1c5f7e0a44123edda1c570d771d7f46c638 SHA512 1f278313528815f4246bb162ced611c5d77321d11055e8d853168dc804c75d5f78568056a23e46db0640e1605e5cad4a5ce05e95e50cf02bb322cb6f57e5a126
-EBUILD screen-4.9.0-r3.ebuild 3900 BLAKE2B 9beb03ca53bfcf3e1c9a1dae44dd1a4cdcc7fa1e9857f43dfa1a8c70c13460714a362132433b1c39a816bb5c52b7b4bba57453e4d68d9781d6745a94e379898a SHA512 44a0d22fab59608e63713ec2cb4bbc2f951fdec1e35cbe6982d5a67f3a95ccb3278962482d2adbc45032975084f8858d9ed5df2db903420f7661dad828c8cc86
-EBUILD screen-4.9.1-r1.ebuild 3763 BLAKE2B ffed1887e9ee2c02a275790c0702e85c22b3aa625b8ab729081d6fb6c7f18ad434fd949997df6d4c9bbbdc7d99c68108ea85906e030bbcaae822de69b58777ae SHA512 dc7727bf61a658a8665c042d476e0bec3e509b45545707b9f279e0c6883dc79efa3b838976064d8979bdd6cb487f5867332c53283460caf80b1326ba53196371
-EBUILD screen-4.9.1.ebuild 3745 BLAKE2B e942b43e0a257eaf26ac0b302f5c891130fb5fba492d04ec36523043aab64aec7f72be4eaf079d19f6d63e8c5ef4fbb605587126de14ecb9509ca9afcaeedf0e SHA512 1e0996cf7f213fe7378031f50be77f46024f0e32259ad1731a6d2edaef95859a1dd20c4b8704b85a7c4022908156f79515e9b7fc15b44fe65f58e38a763bbf9a
-EBUILD screen-9999.ebuild 3755 BLAKE2B 093bac9a26584d105b678293f1db60ad1932fa1fbd53d97078cf76cf9399d353c28b7a033783bf6224449174e839c460c4d21a6970b51531492914ea7f9fa896 SHA512 a9c0d8082496f37372eb6cc78429f8d4bc6c6739ab8fb2cfd83cb76cd8a0c9c5f2f5abcba25dc7877a4e91c7d3254e77138b951f83f9234c3d1344dec89d12b5
+EBUILD screen-4.9.0-r3.ebuild 3894 BLAKE2B 9d9b1add596c0db9317ca7426d0ff7bf82f5cc349c619f8ce5b1621ec2e7b101e1bd3d800275cc856584038adaec0f30715344a7cb89717b5a49ed4d1644b120 SHA512 b2eafde2be5f9e127735e910099ce63bd57f438ccab056e80f2796a72f5c81cbbe6abfb102c6430f0c7ebebb4d55ee77fa903d0232ba26843cb59cb259736ba2
+EBUILD screen-4.9.1-r1.ebuild 3757 BLAKE2B 16b3663c5d6f40e2c8c0ec1a9f4f53679e5b9ec4e868f668df09746a08fd99207aa1f3c35865a7af57651f07bc2430bc9af64f9af302a29ef53ce7b32be9cbd9 SHA512 2b981825fd2571e31ead4b119d9b5c3b04a2cbe5c66b9b4c458bb9644526663f4192b58d1df2b5309a9892121bb51e4054289fa69222ee7f4e115c172d43129f
+EBUILD screen-4.9.1.ebuild 3739 BLAKE2B d3b6229084759f7c25e2eeb73c043ddcd23a6e290afeb2f2d29127e04ad3a9cdab1def0d084d4cd8ee69da085a38b599125260889d1a570be1a77e2c99fe9ba5 SHA512 fdffbb0e7b91fe598f9d12b253fa6e07ed1c4c1b8e99dd92992b26840ee9474f49e2ce1c1a82d886ce70a484020419ba2006052acdceffd3cca4bf912c66b13d
+EBUILD screen-9999.ebuild 3749 BLAKE2B c03cec61a95f67fb30c7ed870cfacb9552e84aedc49cfab991d8173213472a03d97b4ed7468cb0f6e7619bd860bc4c0947140738eb696d0648d94a414e4782a4 SHA512 adf32c97a2fd06ca9d433e8001b70d69e63102385de76f54b1de992d6f25189d0e41923b83b6ac0ae3676b74dd45c69aeb5651134700418a85536b0327442d7f
 MISC metadata.xml 1950 BLAKE2B e774b14285910f8641e9f3d2908378af5143497eea9153705452674d3e2c20d685fb5df351ab8d0be3afb9c7c7a626b4c5435b18599b07e1d24d4afe7e19af42 SHA512 48af1b145bbfcff379ff77336cff40ca32de5b5e00dbf275cfafd94d8d2d774a7d3ca741a1ecf79fb5d979f0729fcbf929213dad7f695b16be1bf53bf3771e75
diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild
index 4bb3440413fa..b8f91b3d4eb1 100644
--- a/app-misc/screen/screen-4.9.0-r3.ebuild
+++ b/app-misc/screen/screen-4.9.0-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild
index b5bc0362fbf7..c7bbb48e8051 100644
--- a/app-misc/screen/screen-4.9.1-r1.ebuild
+++ b/app-misc/screen/screen-4.9.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-4.9.1.ebuild b/app-misc/screen/screen-4.9.1.ebuild
index 51788a01b0d4..d8989279a739 100644
--- a/app-misc/screen/screen-4.9.1.ebuild
+++ b/app-misc/screen/screen-4.9.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	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"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index f7b2fb9bb6fc..ad26413a3cbb 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index cbe50a19ff2f..ed8df895b11e 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,3 +1,3 @@
 DIST screenie-20120406.tar.gz 3437 BLAKE2B 354410d41e1aa9c6bcef3951f26aafcabf8e5af5ba4abd69627e62575127c1190abc78db4ee72552b02ad5cbcde0b6c910dfbb9191f2fd8444e57dff36d16701 SHA512 73e9c9cf53792c51785d45319f65559f5d8f1c97f8637d3c3262384eb1a3835f3ba380e4c9284858e163e8d2021938c2ef3ab50f2854d5f932e96847b9a4c153
-EBUILD screenie-20120406.ebuild 471 BLAKE2B 5f6a4274fc87aa6da519024e6d5c2b982ce7a629d42a936f4ecb5ada1da49c9d7b287b87aabf161f4d7b709352a0d320ee2f30acb427d99e6e69386e375d6836 SHA512 44ed5cf2a69b3505fcb2df0b8d16734604af455d7e651c90885ebc230668d1fcbf6eaacacb913e8c2c354d1f35cdbc3f27defabc3755ba8accd8664e25ddbd06
+EBUILD screenie-20120406.ebuild 465 BLAKE2B 5746dc09e10ebcfccf52d2ad659299d2e37c1bd2d04ec239f78730a99be7d97ebab9873386d00ae55bc223298c678fff3e304d588f9e116839a3085406cf503b SHA512 5f9bc18596970d3bac9f6940e84f8d2fdfd4e3092a80ffa556d873cd54533609e5bb8c8a2bfb94624dd99aadfdde62f780c699ac771b174d8045258abc5c64ac
 MISC metadata.xml 745 BLAKE2B 6987755c25ebb57a21c2e9f40921c45f4194e6dbe56c4f1bd29aa161592ade4ebeb11d0d14986851595366da612fd4c85d02b0526e189ef584f2055b4fc2e228 SHA512 e8ee22a8f7b9bccc4c11eb598fbab14017ebf5655b4cdc5870a8772630913b5377e7aab9697753a2f3a7d8c67da301a71795beab1db1cb9581567c650d0d4364
diff --git a/app-misc/screenie/screenie-20120406.ebuild b/app-misc/screenie/screenie-20120406.ebuild
index 98f7088a8bfa..9870a150e279 100644
--- a/app-misc/screenie/screenie-20120406.ebuild
+++ b/app-misc/screenie/screenie-20120406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 sparc x86"
+KEYWORDS="amd64 ~arm ~hppa sparc x86"
 
 RDEPEND="app-misc/screen"
 
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 004bcaed4bdc..193a6fa70637 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,7 +1,7 @@
 DIST solaar-1.1.13.tar.gz 1779788 BLAKE2B fd138c3c9faa467e356240e8cfc73f420776228f407092cc2f8bca3a9443e4820dad923c8d997d41934fbf7fd728b17a9674c7f9affaf4cd8616c779f6141ff1 SHA512 4557c82bddf88a604e9316806b8d37296acc4b4486a64605199f85949f6b5d5fd5dd94b25742e5b41d01fba4da40dd5ab2e354d536856ecf3310557b4a7d23a0
 DIST solaar-1.1.8.tar.gz 1550947 BLAKE2B a33879e3c1b161d86c4c8a2c8edcc79eff285cb8937bf1e6621f3595ba5cf420e75fe700902b9f375698085bb929401154fa2bd25ae9663265e38c8406205bf6 SHA512 543c6257b36181813c9ed36747e53a15403da251fdd431c32525cada3ac88611da2c5f2a8212767ba3c7bb0071a3c2024f114805d9a33c761701bf958df29d85
 DIST solaar-1.1.9.tar.gz 1564119 BLAKE2B 67161bdd2a59ff17cafcdc5399f9f0c072985df85b2d0408e54c8f4e4966c3602a2b62f93b90e56e80fb3c4cbd285de2bbcc87a7709bea06ee4394f42a16f52e SHA512 42ea592aa8c4020be5e2ffd096de0bf6a7e6fdfac7eb2acd069c80084f88979398f779db6507b8b2cc4fd44c8a2ffce89024a42c161f130b4e1bd2c53e4e73a9
-EBUILD solaar-1.1.13.ebuild 1966 BLAKE2B 192e192ce685cf5906b007c41246a39963ac9f31ba2f1cfa814070d94cf1666542b484fa3e94437890f8d475a7543c293827a7d245cd0d770129ddc04ff97d50 SHA512 35e0ae411da757ae125e27aece35f03ef7ab149c35d7bbb1e3fc78f82832e69f44a298a3adcc1c797cc4c42eed4fcc2fc705631ff93ba1fb94a7425d105f5a00
+EBUILD solaar-1.1.13.ebuild 1964 BLAKE2B abbfacb6e1e5dad42949a42d70d7c771678718c63a9666eed0886de4707f8d3170e42fbad042df9f7fcca19da8905166d4e26bde5b797d32d2b32ec38d888ae2 SHA512 2716aa4db3c0404dcc6654e909ee680f973adb4f150a4e1f8a04f9870a29124d400a575b6d6cb3b81ad0a293dbb42b2e74725871138455017b225335f135c28e
 EBUILD solaar-1.1.8-r1.ebuild 1957 BLAKE2B a18583976d1ffc399f3a2f50d153c5aab82c534561c660a66b35d02af74fe000edc6246abdf0439e9152fceb0529d3aae3d298fb965494652eea202ad8509828 SHA512 a411509d13aa3abfdc5c304bd846ed7528a3f8d66e48e4e8621c081984eedf61bcf365b6008c5e1db464e5ab80230c07ed18dcb2c846de182665f0517cc9f536
 EBUILD solaar-1.1.9.ebuild 1964 BLAKE2B 5c2d2a350100bf50cb96451021f22fd9cef19b452080cb1a6419bed17d1c91f6507d79f41dbb4568b1e70a67c81a4927dc36dbc90492b5b0097b34c46a18a894 SHA512 acc20a18f70e918233e9a0df3aee968c05baeef19d7607e4884195c1b875e85239d16863456d9058694e43dd74c5b7d38ece1023bf62d0ba45179d415271975b
 EBUILD solaar-9999.ebuild 1966 BLAKE2B 192e192ce685cf5906b007c41246a39963ac9f31ba2f1cfa814070d94cf1666542b484fa3e94437890f8d475a7543c293827a7d245cd0d770129ddc04ff97d50 SHA512 35e0ae411da757ae125e27aece35f03ef7ab149c35d7bbb1e3fc78f82832e69f44a298a3adcc1c797cc4c42eed4fcc2fc705631ff93ba1fb94a7425d105f5a00
diff --git a/app-misc/solaar/solaar-1.1.13.ebuild b/app-misc/solaar/solaar-1.1.13.ebuild
index dbd439b70312..ba9050f33998 100644
--- a/app-misc/solaar/solaar-1.1.13.ebuild
+++ b/app-misc/solaar/solaar-1.1.13.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} =~ 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
 else
 	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
 fi
 
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index f2280a44b3d8..b038c5aa1d7e 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -1,11 +1,10 @@
 AUX 99-space-navigator.rules-r2 461 BLAKE2B b97685a2c3c628bd5a52e66d044d2ef8123c96128ae02ff46c33dffbe9ca5cba63f26ccbbf072872217b8a3a881e65a040b0c51fe91a042867f8a2cda6b6c680 SHA512 6871c629999c5f6c6988709bf15ae2821d8375fe80e3f8271cf285734163b523541dc04e70571a3578eba567e1b04ecb3cc2a57f1fd9f138c62226c07a09e18f
-AUX spacenavd-0.8-version.patch 595 BLAKE2B 205ef138f85d1b9bbbd3c4f6d46a4d38d59a85bda6f60a154f4e9f63abc0fb4af44b7766321299967c31dbf3e4ca068e624dab576137fb6beed91d30e4412e7c SHA512 8af8e3e7bf02d3d028926bc751c4c4c7ba3de33fbe777da14c7b2324c0fc7542fa7a75f6129aa3771180322bf7c9dae9e2956ea8bd1cc64a7cd2cbfa92f8c1e4
+AUX spacenavd-1.3-musl.patch 654 BLAKE2B c3a8f3346195ee627e2ae742f5c713de187e82cbcfdd7bde18beab769fafbe3b3932c173c4ae7c510b56f6883a052468d832074d581765ac02e2e64d64ef148e SHA512 df9a78901897ccb3a84ac5d853cb8987bdd6f6daf7fe57cc5e2c0f211e8b8e8dbcf61f723af9011750902794d8281b60175cb4a14ac4bcd2b2483f152dd15266
 AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4765d8b4cba3a347e260c15d21792d4e0ee3d31cd7817a641cb2f8c42989bdc2a1f20d0fd4521fa2e20 SHA512 1f2fd8bf2bdffe3e52f5e2e53e0643e0d5ad5134bfd636ebc2c98f397da5c87bca3582fd76f9e987fb6ed3d17130196f4eee193998f97e388dc04877277c04d5
 AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
-DIST spacenavd-0.8.tar.gz 47515 BLAKE2B 5ab3432220ae44222b72b3fe18df096322031e0e2643798f494a87287e89607370cd15da919eececc714aacee1b75708a365feac5a182c901d63bdf4fa9f52c1 SHA512 8bb0dd2a95c602d23c84750e55ee649e7999bce43607cd09559f36a782780ceb15769bc0ed8e35b56f7c4b0724574830c2c06d4d8853b6f997ed8bba04441a05
-DIST spacenavd-1.1.tar.gz 63642 BLAKE2B 09758883de240e291ffa5784622e79b6ecde46af0f5abcfff8e3692b3428b1aa7e64735a6bc24b84264a4682cc4db623cc38e2f874e346d76d661823b302da37 SHA512 954f6c8d429a2381cbc4ff4387e0e58be444959f1920601e07053e9068b7bdb0c70daefd03fff270560954f4b8c28e6a1b1164106867de969057909372f84168
 DIST spacenavd-1.2.tar.gz 62837 BLAKE2B 3532a2f481c6f5997e30d18939bc22c1287af6aa4ac2dacc8a6c683c497aacf648a8ddde4ca84b1e3340cf5deb922667e92eb3613ac9eaae1baed42281488508 SHA512 26c24afdfda4d8767fc3f94b3ab1da825622249b55666f516aa52251cd756c23f4104f1e22f951dae49d4779dd5b85383d8c0b50b09318eee923f2c707136834
-EBUILD spacenavd-0.8.ebuild 2398 BLAKE2B be19eddf8928580405974cc26443cd98408ca65c0fb7b0dd783e134d17a02bc26a06dde3762972452e8177929d639fb5a4746d6cbc7606cb90fdc564c06d2722 SHA512 7426d997379d500f8afd832303a05b32d41b30696fdda37a12049ab155b689f34b710a5d613b16660eec5a1ea99a040ace3fcdfb36e8112dda95fae55a12e17d
-EBUILD spacenavd-1.1.ebuild 2494 BLAKE2B 5ec5ce9e59df15286a33926c2efc0791f68efb2f5c4a7d42e65c6d2c6dec627e88f40a698701684dbb049fa582408f58569939e0b72d9d6671a6484aa23389dd SHA512 f5e5f168f2c679eb4044ef071ec0ea4582891a88d721aa2b5fdaa99e6c5d852912cdc9ff3260a120170987ae88fae93f45ae395626a7ab1411f37bcd9a0b4502
-EBUILD spacenavd-1.2.ebuild 2494 BLAKE2B 5ec5ce9e59df15286a33926c2efc0791f68efb2f5c4a7d42e65c6d2c6dec627e88f40a698701684dbb049fa582408f58569939e0b72d9d6671a6484aa23389dd SHA512 f5e5f168f2c679eb4044ef071ec0ea4582891a88d721aa2b5fdaa99e6c5d852912cdc9ff3260a120170987ae88fae93f45ae395626a7ab1411f37bcd9a0b4502
+DIST spacenavd-1.3.tar.gz 63619 BLAKE2B c85c423a574d467e52abf1200a042de889bd03176e01721143d44d18bcffc3ae51e0142db99bc172acc6c38cac6f559b56f950ee21c718127335b73e1edd2d6e SHA512 d3294116d05da4eb2c244c577d1828c28af8827b001a0c323079326d7fab3802f8428224f289b457de9c5e2e18c4222bd1b2bf06045cbc94de159f6983084366
+EBUILD spacenavd-1.2.ebuild 2491 BLAKE2B 48945f8dc03a1a24176c590ca34fbd21efdfa53ba86c27e8846f662e9c5dcc6b0fa980875bd0346e7c2294c7564fee881e1b4cff3c86246110d1f72547fd083a SHA512 233eb12d5548a73cb3e4c7c40bcd2cfef121d314f165d5065cf5afd0618d4568cb3dbffd8860a424d9ed5469c3909e042950cb69d02ff9863fde4679bee6a11d
+EBUILD spacenavd-1.3-r1.ebuild 2538 BLAKE2B e4413b7cf5cc13162ae8092bd606201bb30bb52c3db0c5895c74b30ec17026b59c01a8b163cf49c3c152533078df65acbf33357071c86d6391b92fa5af717b6d SHA512 e083cec58995edd71f50447cfefd808a0e3a0caac322b6e86d1eaef0a0bc886ea1f9b30a765e93b8a6d15d10df957535d368aaeb84bea1c5ecad89bff0c55332
+EBUILD spacenavd-1.3.ebuild 2494 BLAKE2B 0f73b74000c98bfdccea8a0c10071ad7be14965d929a50984e7667733689e1791503177f5c5eca2427782ec153fa1c2a9571e8abd07d5d42458da3f5930c9a76 SHA512 b2c4638cf1000612e47621b0b3c44dbb303a4f0c69fda97548275e9d096085cb6c2135ac1639fa5dc66397f7bbee4f553581dc928f097cd3f6710ba645f73e5b
 MISC metadata.xml 867 BLAKE2B 53bb8fd29b7c9e9b6caf2902e10dc2af46d48060f98915c74840bbc5f00f278c46606f1682160ae40c5760e64281419ac0f983d41a5cab639b16c76ad2958e69 SHA512 3786f4b9d3062edf37cd2b49cf0e56d33bce512bc675d43378f42c3ecef015c4b6176b5a5d7e48e28b559c2bb4121ddb4841ef31ea3b35c6b51c78bf877fc122
diff --git a/app-misc/spacenavd/files/spacenavd-0.8-version.patch b/app-misc/spacenavd/files/spacenavd-0.8-version.patch
deleted file mode 100644
index d4113d38399e..000000000000
--- a/app-misc/spacenavd/files/spacenavd-0.8-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 22056e975ebc0ff9e02c8ba2ffc61f65f272a567 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 1 Dec 2020 15:49:19 +0100
-Subject: [PATCH] Fix version to be 0.8
-
----
- configure | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/configure b/configure
-index 98040a1..e39be6b 100755
---- a/configure
-+++ b/configure
-@@ -40,11 +40,7 @@ DBG=yes
- X11=yes
- HOTPLUG=yes
- XINPUT=yes
--VER=`git describe --tags 2>/dev/null`
--
--if [ -z "$VER" ]; then
--	VER=`git rev-parse --short HEAD`
--fi
-+VER=0.8
- 
- echo "configuring spacenavd - $VER"
- 
--- 
-2.27.0
-
diff --git a/app-misc/spacenavd/files/spacenavd-1.3-musl.patch b/app-misc/spacenavd/files/spacenavd-1.3-musl.patch
new file mode 100644
index 000000000000..0b6a521cf68e
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-1.3-musl.patch
@@ -0,0 +1,27 @@
+From c6f8a6bf4aa5024c0317f4bb215f828e4219d61f Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sun, 16 Jun 2024 20:10:26 +0300
+Subject: [PATCH] fix typo in conditional include stopping stdint.h from being
+ included
+
+fixes gitub issue #105
+---
+ src/proto.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/proto.h b/src/proto.h
+index a852f7f..8c983ab 100644
+--- a/src/proto.h
++++ b/src/proto.h
+@@ -3,9 +3,9 @@
+ 
+ #include "config.h"
+ 
+-#ifdef HAVE_STDINT_H_
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+-#elif defined(HAVE_INTTYPES_H_)
++#elif defined(HAVE_INTTYPES_H)
+ #include <inttypes.h>
+ #endif
+ 
diff --git a/app-misc/spacenavd/spacenavd-1.2.ebuild b/app-misc/spacenavd/spacenavd-1.2.ebuild
index c228ea72bd82..57fa059c0422 100644
--- a/app-misc/spacenavd/spacenavd-1.2.ebuild
+++ b/app-misc/spacenavd/spacenavd-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
 IUSE="X"
 
 RDEPEND="X? (
diff --git a/app-misc/spacenavd/spacenavd-0.8.ebuild b/app-misc/spacenavd/spacenavd-1.3-r1.ebuild
index acd942fe9884..b9aac3ac6fa1 100644
--- a/app-misc/spacenavd/spacenavd-0.8.ebuild
+++ b/app-misc/spacenavd/spacenavd-1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic linux-info systemd toolchain-funcs udev
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 RDEPEND="X? (
@@ -19,12 +19,12 @@ RDEPEND="X? (
 		x11-base/xorg-proto
 		x11-libs/libX11
 		x11-libs/libXi
+		x11-libs/libXtst
 	)"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	# https://github.com/FreeSpacenav/spacenavd/issues/29
-	"${FILESDIR}"/${P}-version.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 pkg_setup() {
@@ -50,6 +50,8 @@ src_install() {
 	# Config file
 	insinto /etc
 	newins "${S}/doc/example-spnavrc" spnavrc.sample
+	newins "${S}/doc/spnavrc_smouse_ent" spnavrc-space-mouse-enterprise.sample
+	newins "${S}/doc/spnavrc_spilot" spnavrc-space-pilot.sample
 
 	# Init script
 	newinitd "${FILESDIR}/spnavd" spacenavd
@@ -65,6 +67,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	elog "To start the Spacenav daemon system-wide by default"
 	elog "you should add it to the default runlevel :"
 	elog "\`rc-update add spacenavd default\` (for openRC)"
@@ -77,7 +81,6 @@ pkg_postinst() {
 		elog "\`spnavd_ctl x11 start\`"
 		elog
 	fi
-	elog
 	elog "If you want to auto-start the daemon when you plug in"
 	elog "a SpaceNavigator device, activate the related udev rule :"
 	elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
@@ -85,3 +88,7 @@ pkg_postinst() {
 	ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
 	ewarn "if using systemd."
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/spacenavd/spacenavd-1.1.ebuild b/app-misc/spacenavd/spacenavd-1.3.ebuild
index c228ea72bd82..2199bf12fff8 100644
--- a/app-misc/spacenavd/spacenavd-1.1.ebuild
+++ b/app-misc/spacenavd/spacenavd-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index c64381b9025f..8ced29df8dd9 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -2,5 +2,5 @@ AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3b
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
 AUX sphinx-2.2.11-automake-1.16.patch 402 BLAKE2B 0e0ea346acb11b4f0a469b76e0491eb0942d0a29b9c566f2ae247401e357062c9366d070bdbb89983884d68576848c58e474c3015651fee92c4ed7e2b6694b2b SHA512 8babc7470036c762cb1d930ffa446aa0280637f6bbbe6854346bd94a46cfa36e466e38a402c3ef141c7a76d58188fb33000e66633a81680a7fab26ca5cee2b62
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.2.11-r5.ebuild 2887 BLAKE2B 97b4cdf8976040d3fea9c3be928f11231a282632fb1431b90d9dfa157858e7d3b0ba06a39d0ed2c6f7fe1df0043f1418df21f410d880c31da4e14a9c8dbd2f49 SHA512 8c3b8f75eacd0900a1be93a0a2694c5bd0c553042d38e76874836b7d7be762429d01f06f3590cdec3c384d4243885abbcf9c943149c8e8c9bfba0266f013f911
+EBUILD sphinx-2.2.11-r5.ebuild 2881 BLAKE2B f69ec90eeaac34cae32a771bb3273b1e2554329b3213e848e1fb84daaaf76570b32abd66f67a7f5434f2277909b82cf69cae06517befbf7694ef2571e1832175 SHA512 ae7a77ec8a1e71e21ed6ae70be16307733944967a535da126bde94d1d643dd01ef2442dac8a87887f1d5f30a7c602e0a6d85747c3c322e446a284d2a1649a07a
 MISC metadata.xml 493 BLAKE2B bfc13e8fda1557dc11fa8ead49949b1128365f046871e861eb74eb84d22f60501c1a167d48ee8cd0f689c565a7a847b3804cdc098838b7cc83e35d4c43f8c0d3 SHA512 8e6d2ba22737adac63555a840a6d614c474eb6804b4f07e2970ca1d21ce033e0f1307f7f0266bf5077aa7b03eedaad9c1894eb52a2332bb2e738c3516138ba5c
diff --git a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index cd7ae1b4fc4a..83940e3836da 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
 
 REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
diff --git a/app-misc/splitvt/Manifest b/app-misc/splitvt/Manifest
index 949edddce9e0..a08f5c65921a 100644
--- a/app-misc/splitvt/Manifest
+++ b/app-misc/splitvt/Manifest
@@ -2,5 +2,5 @@ AUX 1.6.6-ldflags.patch 1048 BLAKE2B 0e67a86bf33ffb3513263f58ec8ad9d7764af054eef
 DIST splitvt-1.6.6.tar.gz 64797 BLAKE2B cc867fe7cf57b541f5d124bb3bbac111e0cd4a4ef835df7c8abfc7e73c1d172f0a75512e54245b395d815308b6bf94d79c8b896099a4af51e8947ddf177e88bc SHA512 a0a0ea2251489f14e2ba7af9bb1b9d309d6fa310f434090d97af2a0805c398731dec45a5cc15c2074af4d3f33b02c5bab019743530619755382af80ff86fa670
 DIST splitvt-1.6.6_p7-fix-build-for-clang16.patch.xz 10816 BLAKE2B 3223e9368361b380b756c2fc86e8454695f052dcfc4ab8a1459031ff4b6972e9ab42d4ab2bff64be0bfa6074b4301c80d23c0118269d41821b9c54ab4b27eacb SHA512 95325c1c16f3ab71efa531804b0a48676b22eb6b66af93c1b21d0109a1059fcc72b2bcf6ac5d1ce39c2d0473a6fa6a51cddb45d463337eb56a907528547c98f7
 DIST splitvt_1.6.6-7.diff.gz 11073 BLAKE2B 595381265ecd1d7a654fbce4afde5f872e7ce35d3cd44936f78a3c714b7964586d7ec0ec17d986a0f2e6ff9c3e01cf3563b54185f2fa10bebc9ababd174d4879 SHA512 620f3f6e7f22284ef8054e371a87421beeb2ef355b7084748cbd1f7a3a128c9da11f291fdaf1d393010c0f7affce8d6e56a7ae0977d9831b9d3b98963c55c71f
-EBUILD splitvt-1.6.6_p7.ebuild 1310 BLAKE2B c968cd18277ab37cd128f028547fb1df5105cc4426040ac80f18c5351ce669623a81c03bd2d4f6f61cefc2703811a397be9c29e6b31822dccaddcc333cf9b0ff SHA512 caad81da32a3a176b81ca548c6af220ef18de2df0ca4e378a49199f4958ba7072b51e60e8332d01535ce46b0a91f46a8f4b35bf52b5f919fb0a06a93ac0ee267
+EBUILD splitvt-1.6.6_p7.ebuild 1304 BLAKE2B 83112cb0448dda1def3ad0e1f9525659e389fe831c67b6cd418f5a3692919f04de9e7c08f3ae489bc539a9b9e15c6598320f86c13fe68b59eb84023f3d2ba079 SHA512 8adffd5bad69f15e493cecf7bb67aaaedbc3f03ddb3cd92a9652d89ecd9c42b72c8b9944cc98231f6bf3efd412e77bec5970b0b015b6123e114a5e6fc5b04643
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/splitvt/splitvt-1.6.6_p7.ebuild b/app-misc/splitvt/splitvt-1.6.6_p7.ebuild
index c4cd6abef175..f17bd794e3e3 100644
--- a/app-misc/splitvt/splitvt-1.6.6_p7.ebuild
+++ b/app-misc/splitvt/splitvt-1.6.6_p7.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
index c2444e66bc21..451ecd8d7bda 100644
--- a/app-misc/symlinks/Manifest
+++ b/app-misc/symlinks/Manifest
@@ -1,3 +1,3 @@
 DIST symlinks-1.4.tar.gz 4942 BLAKE2B 983c16bd5dedbca3f3544756a1e5de4939eb31e871c72110224f7e63821cec69289d9a1e152081d9895230670b96ed813ef0692ea0922d9a52d5050ade723893 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f
-EBUILD symlinks-1.4-r4.ebuild 827 BLAKE2B f6b81c23c069bdfd769f498b6280adab06852329098868e6ae41afa26894ce7b088de754c5f698e8f4761a42327c0f1ffa646a6834d9530198be5be263067d77 SHA512 9c655f8cb7b2702c6a92326ef5a892dbede9198748067b642075ddc6e5231ee4e54ed5457cb85d92fe471e62cd4aa69630857483d126f987161a72aa806a130d
+EBUILD symlinks-1.4-r4.ebuild 821 BLAKE2B 0613aa067d18c7b1c4991b7e33cdd9359be488b0b68ed9e4384b199f12d9984879b17ded3e83e5b96b41815c3cfe7cb260d5a4f413ee0f595b533e24e684ce17 SHA512 75b319ff2e741b16884b9ccb4d21f6be6e814ced453a63411e1c4143437ca069c1a07d8403e82af965f2505dbbc0569037c0d0eb01ba1f9eb27bcbdd2fb874df
 MISC metadata.xml 632 BLAKE2B 00c8c40a4c58bed46974eb8f668e16b3de336417912a34d7b80a18e214a83caff63edd7807d7dfc6e7b2903e04f53e401104694e7aeff1f030d9b3b39523b39e SHA512 b3bbd19f92ac4d433b3f6704186060f3a4bcb30bf71f12988a921f888fb0faf8fbef2e376d39da3144f577ced6984069d16c3f7cdd6d6f2daeafba468c02197f
diff --git a/app-misc/symlinks/symlinks-1.4-r4.ebuild b/app-misc/symlinks/symlinks-1.4-r4.ebuild
index 07711ab93526..71baa89b30c9 100644
--- a/app-misc/symlinks/symlinks-1.4-r4.ebuild
+++ b/app-misc/symlinks/symlinks-1.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
 
 LICENSE="symlinks"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
 IUSE="static"
 
 DOCS=( symlinks.lsm )
diff --git a/app-misc/timew/Manifest b/app-misc/timew/Manifest
index e1d4c3cfe213..72bbe83b3a19 100644
--- a/app-misc/timew/Manifest
+++ b/app-misc/timew/Manifest
@@ -1,3 +1,5 @@
 DIST timew-1.4.3.tar.gz 3188726 BLAKE2B ded92b2ba801023e7f6bc59c0fc17ce069c8279ee92f39280c50dabec0a2425b8612f73edf7842abdbb0b21772244eda325512070c091f32d17ff69cfcd844fa SHA512 89c98ad19d3a5ab5d4e02819d79e553cca4e93da99ec02bbf845b96b421cd084f6786de160e90c97854b50da49448472e9a4c7d23e75c8a93ecd67dda768b24a
+DIST timew-1.7.1.tar.gz 3102854 BLAKE2B e3ae527a5405bf27e92619f9cc02046646a8ef60ae721c1ad66e30560c9a8535e6e71388c7ea2eeb84b6b5bb8d7ce4845b77e6a36a54869e5f80021232a924ed SHA512 f28f6c47cc05d8055cc3fae9e96d1936554c685090a40f8af1995e5357947cb9bdfab0ec091f68693a566a876e06eda502de074900f7368a913e85d7e4cf87f1
 EBUILD timew-1.4.3-r1.ebuild 1014 BLAKE2B 3659c14dbb3831a1fea1e7676974568ad4ddeb47ec5dc7fc1152909072fb4f4fcff9febaa47e558487980c3541f48e8ba91a7b30f9a4e28e5d388f416508cba4 SHA512 b5dd8d62efd3e65ab7649f007cecdd506cb8c15b1be9d142968bb4801c0cfa441a0407bea1cdc771c797396ca815a8e11ba874821897580e4a61538e0dc37237
+EBUILD timew-1.7.1.ebuild 1113 BLAKE2B 1014cc0fc0011c7aba6bec0848789842f101e8607516ed871f9b719a8e48d79ec8a806ecacb35988f585f454394ed30c857ec69bd38d3815c9067fd4cac9ab6e SHA512 c96e08593804790d81828cc0c3f18d1284209dd1053b9c4195270eb48ed97f40dd84e3cb94ebb39a43ec09775e66bce2f9807132bab3d12a56434be51641b62b
 MISC metadata.xml 708 BLAKE2B 3b8781f0aad86446298f0bff09bc9be053865a114227341cbde00586dc678401ceb8ee7a20e6b03dd23c14dda678c882b18174f9d38fc0fa0d2a7260898ae0e6 SHA512 294c6b699e084282feaf9b1409dd12c8cd7aff0757dba80efcb261d68d4e29449a1f708628a6c80ceac819640144fa6a019f869bbe6fef7390d1353f97c8b86f
diff --git a/app-misc/timew/timew-1.7.1.ebuild b/app-misc/timew/timew-1.7.1.ebuild
new file mode 100644
index 000000000000..c8e55e30359c
--- /dev/null
+++ b/app-misc/timew/timew-1.7.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake shell-completion
+
+DESCRIPTION="Tracks your time from the command line, and generates reports"
+HOMEPAGE="https://timewarrior.net"
+SRC_URI="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIMEW_DOCDIR=share/doc/${PF}
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${WORKDIR}"/"${P}"_build || die
+
+	eninja test
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc -r ext
+	docompress -x /usr/share/doc/${PF}/ext/{on-modify.timewarrior,README}
+
+	doman doc/man1/*.1
+	doman doc/man7/*.7
+	newbashcomp completion/timew-completion.bash timew
+	dofishcomp completion/timew.fish
+}
+
+pkg_postinst() {
+	elog "To integrate timewarrior with taskwarrior, issue the following commands:"
+	elog "cp /usr/share/doc/${PF}/ext/on-modify.timewarrior ~/.task/hooks/"
+	elog "chmod +x ~/.task/hooks/on-modify.timewarrior"
+	elog "see https://timewarrior.net/docs/taskwarrior/"
+}
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index 942bec7c6e14..c7285e0148d0 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,3 +1,5 @@
 DIST tmux-xpanes-4.1.3.tar.gz 64101 BLAKE2B ec7e025adcfb2436b416a37de87cbf335bdc92d7653a65be9299c10993d273746a0678ee3e418df483697f1f2dd556063e98d984006e2137e2cdeb6f8634f75c SHA512 6545ec75a522b05eb8079c93830c81ac3c6a9ac338a3cc51c491f69a4602bef5b9f19c9f18b2975d0470c4af0a83ebf2357a4461024508ff0f6ac61d1099b22e
+DIST tmux-xpanes-4.2.0.tar.gz 66733 BLAKE2B b1e1465f9f5f59e5899585242ddebd18f09bd4d1d771cb737bed1e4ca8b7a8881761b077b9b4395bb0102535c0ecae9b23982f40e729110709bf470626042aae SHA512 a5baba411e6ea638af575eb450894477ed0b14fc97419a9de88638a619739d02e764b610d2f849cb4919da4b087aef05f43234eab420c36b710a452eb20a7c33
 EBUILD tmux-xpanes-4.1.3-r1.ebuild 577 BLAKE2B dbf2634b99daed9cbad1b8114d7217f13978861264c0ee3c7075595918145bc607508ee7718070783bfd099f96347d8af5c720d2a4a1bd10737a756a7417001c SHA512 5a7b71dae2a67e6c9d145f92a7dba31e77d5b74de6dd0719503ef98f7a9cbb1b02f65286549b360703b02031a01b01c9210e9c346a3f432b76148727042dfa82
+EBUILD tmux-xpanes-4.2.0.ebuild 569 BLAKE2B f6ecbc38fc11e15ac52fc93992fefbe97b67d62d21134e37efdc5ec09c9177d1475eaa898c9e2403f5aa0b9b0ee82be535b96c6275f0f0bb0a38e2327c2f5b00 SHA512 090e126534e99ce1540ef5c3a412ac4a8db73eba2451b1ea383590506efd0696c546e185773770f36ddae4e7a4a4ef346a4c75607f0d28fcbb956ca16ce43f04
 MISC metadata.xml 349 BLAKE2B 5ddbf08dd1b35bca4ba74ba0c5c0ff98b2bc88a86b6679ffeafa18c06fd18bf8e0ae4938cffa69a46b56944be9eb0deeb63be8b5a8d6a27ecf8e249cbe0c4c4e SHA512 5c650e5b381d4b4e7630ef785869a701965b53d9e2cc5ff695bc43f72cb5cb775ea000cce325a98841b8f5cc32c9a2e01a2480c88b06fcb2243a1cbd6a21d43a
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.2.0.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.2.0.ebuild
new file mode 100644
index 000000000000..5871de053404
--- /dev/null
+++ b/app-misc/tmux-xpanes/tmux-xpanes-4.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit shell-completion
+
+DESCRIPTION="tmux-based terminal divider"
+HOMEPAGE="https://github.com/greymd/tmux-xpanes"
+SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	app-misc/tmux
+	dev-lang/perl
+	dev-libs/openssl:0
+"
+
+DOCS=( CONTRIBUTING.md LICENSE README.md )
+
+src_install() {
+	dobin bin/*
+	doman man/*.1
+	einstalldocs
+
+	dozshcomp completion/zsh/*
+}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 5887339d8fc0..36d745d86f30 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,11 +1,16 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 AUX tmux-3.3a-clang.patch 2480 BLAKE2B 33733a38035930f42e041ad43f36fa157d5411c7778f2fac67f4a37a645fe3bc508ff68ebda0a41f5d3ef0180a95dde79597db72db4fa318c55777cd573a1dd4 SHA512 a7dcaa2a07712bf4e820b0d252b8ab1efe9f7f9429e85b2fa75cb2e0c081f023b2aa9abc27529c30499f2ffe957f7195c5aa76cd4d224070bf135639d08bafa3
+AUX tmux-3.5-fix-xterm-sym.patch 1263 BLAKE2B ec47a799cd7301cb53eb24d3435a3772017af05b92c414874c3cb413cb913d18a3dabe773ca28474488ef1921011de2010df483e833fec52d411d2f88e9ae07b SHA512 50bea66e52fa86021e2d56c7bcb702d8361f34832dbcb20efda99de037d438ca6a3d114b5c19f8bcf1b8aaf66289871bb4cf7d4d44da6985c7c907fa322f4471
 AUX tmux.service 124 BLAKE2B a4eecfeb4baa24433408c9dfb4848d420da4d54a2c62f6a4e05b0538e7b4c75bcec113d6ca86fea5085264903122e92e9adf7572e94ffafa3fe7f2038148b717 SHA512 73d3daf5362222da3e91641cc776c66fdaea50048000827a5eaa8693c769da73a320c19488aec6fd7660095eb6c44ef02f3473b2443909d55451442dfea70d28
 AUX tmux.socket 132 BLAKE2B 9aa90b43f2eaedfce327287cc8eee4808c7870364668c54d0ffd4b5064d45a4c986702fdf64dde5fe24496635e700e1385a92a02060cb07819b48ab9d381b65b SHA512 fd2a8feb7474702515e9186a801fa5601feca5aedd39138d0f0623911b93255bc7cf4aa0ee066ba2c059601a21f2eb29794fe041d5a8cff91c63584e579aaff9
 DIST tmux-3.3a.tar.gz 677448 BLAKE2B e835ce0f136175521035a684419f221864edb0a9506d7d68cbc0239b1349e78949ebd96573a9d8651a2df6d99acb433075d6e0c20d7394a53fe6b44bd9e56069 SHA512 29a846df7d93601c42a22f84f606931dc65da1f70b67d351d0425f77ea3affe3e8218b2940d42cd3dadf3cd1aa95032daad3ecb14fbff0f69939d1beae0498c7
 DIST tmux-3.4.tar.gz 707213 BLAKE2B 2b1990b95d7439702e9287402d9828d4ecab573202c099aa482969c047b540d4b899f79d87587fc712e727d9cebf5fa7393512087e469fc355b4a30b1894e229 SHA512 bd3880211d99d8ee15947000abf8a1832fdfa48b29b2df81b66d5969cf3f4e64e746f984f6139bfc57e3ebee7fe8dc7cbb6bccb779307607de6c376969fecbff
+DIST tmux-3.5.tar.gz 715322 BLAKE2B 6c257e7c3b2f49ae2a54dd28c8d89d4832ad1eb3a49e800ff83a03fd4e620bdee695845b1c272cff25f0805502c1309e9d14faae6ca3fb4d4f050d9abf4aeae9 SHA512 bb3ca1ae8b330c3efc8fcbe8a65a40f78beadaf08c79265f6377c4187d26028e485e5404b832bbea16b170fd9bbdf2f1554d67dd3b1289e183fca19df460b695
+DIST tmux-3.5a.tar.gz 715619 BLAKE2B 2314bc127f805071c9f2fe28be549b0948042a153aa68d997efc1dc0d6eba198b04aa16932d0a84b03250567100fb81c464919fcc8ba98660d3d0750ff5fe879 SHA512 2383e99aec2dcdb1d899793d5ecab40a68b921194f84770d3f4d19712bfc85590657a99d2a9a7bec36d4ba5ab39fa713f13937b0acad3b61cd9b2302dba61d43
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-3.3a-r1.ebuild 1923 BLAKE2B fc69a9a9900bf1fa62c90a7b05621512cea072765ee4d572a5bb1cba6ca0d916c10a6690aee03816edfe02eeeab0b2e7bfc67e17a9531ad9f6ccff652ed033d4 SHA512 253f0c66b91a532e1c21875a6024ae009e20f083e0ee45733300c349853c59ca2937faae15085fdf98d5b7a3afb026aa32e72edea0bd871308ed18683df8acdd
-EBUILD tmux-3.4-r1.ebuild 2193 BLAKE2B a6e4b8afa4297083988acb77084a5eceaafed310d089a532dbccbcb8ce87310ba68195e61f415efa4f2a8c17f4b73fe6e9051e8863ddc8bcf6f7e8bab0681da5 SHA512 545793790a9724c0f7434d49cb1e1a302615e9278ff030489db0cd0549101cb97090de071088be929da96cdb04de0566a1aae61c5d7575702de1a7417c7cb18a
-EBUILD tmux-9999.ebuild 2132 BLAKE2B 99502d5fd3d781c405d3adcc3c738545e54bea5072622956d2add6c81f51f14307a3d767954f32ab53c51c0e2fcae79159c99915f08267b8e5992a9b2658833f SHA512 8696c366d8b74eb2b44d58fbeb04595f9cf167ec4ca2143bdd894d7b30269acc0bb5b138cae7a659a65abe8ed35d92565daa26a4eebc0a472307c9dfc5b56faa
+EBUILD tmux-3.3a-r1.ebuild 1917 BLAKE2B 51b8c604f2a8c26bb4998a670318202e20657ca9b5b3ba34782898cce02b1548849316d0dbd2790808a01a104af181d9ab2b318fa1419a69e7f6305f1a1cffeb SHA512 866005d11cc808d62c729d2824187d3ff9fd4c9edb24ec57caa0444ad8b13c93fbd1635798e53794ae3f8ceb6294963381adaab2f562dbcb66691be63759b3d9
+EBUILD tmux-3.4-r1.ebuild 2187 BLAKE2B 7d074d53fd00e3ebaa7562d6aa2962619866cdcbd04035a4aa7c70626a203e07c10e51eae252e68005a36fcdc736f1d4443019c6623ab1d3437c400e4a655bd4 SHA512 e579de3274d68d879987593febea41af273ccd18a89584f00f44a7f5d581708f8535f7fbd9bd29c28301416e03b41d091a1ff3bee9858cb1e7ff002ad1da1e69
+EBUILD tmux-3.5-r1.ebuild 2322 BLAKE2B b6aaa88e2123e8687a22efb7ac04ee3bd254eac6054ea2667f278d3d607ed6480c13ad94a8bc4276bc19de82cb10e3dd98285e9677c75d783ce092fc6a8e99ed SHA512 ef417fad17da1201ada053541776f04208afb7258bbeeaf1357c0704e1a791c41c3d0f3bc2eeb96181f0977bd01444e4b9f201ace1f250309ee24a921fa90760
+EBUILD tmux-3.5a.ebuild 2327 BLAKE2B 16cd998277e585d835292e448aeb3a995a31b9ab7283534bccf0fddf37813dc0289e6937f5070307d418de6efbea711a749905ffdba90d188451d96151b56876 SHA512 a926d3f1cf53e5eff38bfdc9acd037cb341a143f4830838ba94a7cfc81cfee6ac555529e42d9ec826b9a0032e11e0a9e1874ed10b9ebd90bdb6edd06cf020f4e
+EBUILD tmux-9999.ebuild 2126 BLAKE2B 221fa9f3bc7408377934bb3215decea6016cfbea6b33e51295d6305d4692eaa75ac40b0a4ddbc59640d9db99d995b04c85f46847cbd4539664237f77b406b7be SHA512 6da0e7a92a49f042ce1d691f171bd0ff150ab42ed1059fdbd86379e521183ebded47e1140dace81aea347b9aa3b84fa0bfc2027f0a73d9164ddead4f5b96aab3
 MISC metadata.xml 709 BLAKE2B 69d79a4cd812421b661ee2562d4c4afb18ad6818c4dd2c1a0e402594523579019b5d36ce75032b45e96a397c4b9b28a8850d2d767b0faf12af04abe2fb6db813 SHA512 7fadd4eda7e47bf4880f170a17fcd60a3ac5d1f98058197eac2fd354c1aa4a868fcc73d044114f4d46f6efd192dd6c9345e6690e6e4c98faa7fd97b06cb1f93d
diff --git a/app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch b/app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch
new file mode 100644
index 000000000000..17d56664bcad
--- /dev/null
+++ b/app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch
@@ -0,0 +1,38 @@
+https://github.com/tmux/tmux/commit/934035db7197d4510b330df8d8963f78e9c8756d
+
+From: nicm <nicm>
+Date: Mon, 14 Oct 2024 20:26:45 +0000
+Subject: [PATCH] Set ACS flag for REP. Reported by Romain Francoise, GitHub
+ issue 4182.
+
+--- a/input.c
++++ b/input.c
+@@ -1145,7 +1145,6 @@ input_print(struct input_ctx *ictx)
+ 		ictx->cell.cell.attr |= GRID_ATTR_CHARSET;
+ 	else
+ 		ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
+-
+ 	utf8_set(&ictx->cell.cell.data, ictx->ch);
+ 	screen_write_collect_add(sctx, &ictx->cell.cell);
+
+@@ -1349,7 +1348,7 @@ input_csi_dispatch(struct input_ctx *ictx)
+ 	struct screen_write_ctx	       *sctx = &ictx->ctx;
+ 	struct screen		       *s = sctx->s;
+ 	struct input_table_entry       *entry;
+-	int				i, n, m, ek;
++	int				i, n, m, ek, set;
+ 	u_int				cx, bg = ictx->cell.cell.bg;
+
+ 	if (ictx->flags & INPUT_DISCARD)
+@@ -1592,6 +1591,11 @@ input_csi_dispatch(struct input_ctx *ictx)
+ 		if (~ictx->flags & INPUT_LAST)
+ 			break;
+
++		set = ictx->cell.set == 0 ? ictx->cell.g0set : ictx->cell.g1set;
++		if (set == 1)
++			ictx->cell.cell.attr |= GRID_ATTR_CHARSET;
++		else
++			ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
+ 		utf8_copy(&ictx->cell.cell.data, &ictx->last);
+ 		for (i = 0; i < n; i++)
+ 			screen_write_collect_add(sctx, &ictx->cell.cell);
diff --git a/app-misc/tmux/tmux-3.3a-r1.ebuild b/app-misc/tmux/tmux-3.3a-r1.ebuild
index 875e3486c3c6..3c45540fcfa4 100644
--- a/app-misc/tmux/tmux-3.3a-r1.ebuild
+++ b/app-misc/tmux/tmux-3.3a-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	fi
 	S="${WORKDIR}/${P/_/-}"
 fi
diff --git a/app-misc/tmux/tmux-3.4-r1.ebuild b/app-misc/tmux/tmux-3.4-r1.ebuild
index 0a8b3a86b438..624ce908c089 100644
--- a/app-misc/tmux/tmux-3.4-r1.ebuild
+++ b/app-misc/tmux/tmux-3.4-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	fi
 	S="${WORKDIR}/${P/_/-}"
 fi
diff --git a/app-misc/tmux/tmux-3.5-r1.ebuild b/app-misc/tmux/tmux-3.5-r1.ebuild
new file mode 100644
index 000000000000..1be48e6b4f30
--- /dev/null
+++ b/app-misc/tmux/tmux-3.5-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	fi
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug jemalloc selinux systemd utempter vim-syntax"
+
+DEPEND="
+	dev-libs/libevent:=
+	sys-libs/ncurses:=
+	jemalloc? ( dev-libs/jemalloc:= )
+	systemd? ( sys-apps/systemd:= )
+	utempter? ( sys-libs/libutempter )
+	kernel_Darwin? ( dev-libs/libutf8proc:= )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	app-alternatives/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# BSD only functions
+	strtonum recallocarray
+	# missing on musl, tmux has fallback impl which it uses
+	b64_ntop
+)
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-flags.patch
+	"${FILESDIR}"/${P}-fix-xterm-sym.patch # merged upstream
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable jemalloc)
+		$(use_enable systemd)
+		$(use_enable utempter)
+
+		# For now, we only expose this for macOS, because
+		# upstream strongly encourage it. I'm not sure it's
+		# needed on Linux right now.
+		$(use_enable kernel_Darwin utf8proc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+
+	if use systemd; then
+		systemd_newuserunit "${FILESDIR}"/tmux.service tmux@.service
+		systemd_newuserunit "${FILESDIR}"/tmux.socket tmux@.socket
+	fi
+}
diff --git a/app-misc/tmux/tmux-3.5a.ebuild b/app-misc/tmux/tmux-3.5a.ebuild
new file mode 100644
index 000000000000..037e0d2ba17e
--- /dev/null
+++ b/app-misc/tmux/tmux-3.5a.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	fi
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug jemalloc selinux systemd utempter vim-syntax"
+
+DEPEND="
+	dev-libs/libevent:=
+	sys-libs/ncurses:=
+	jemalloc? ( dev-libs/jemalloc:= )
+	systemd? ( sys-apps/systemd:= )
+	utempter? ( sys-libs/libutempter )
+	kernel_Darwin? ( dev-libs/libutf8proc:= )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	app-alternatives/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# BSD only functions
+	strtonum recallocarray
+	# missing on musl, tmux has fallback impl which it uses
+	b64_ntop
+)
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-flags.patch
+	"${FILESDIR}"/${PN}-3.5-fix-xterm-sym.patch # merged upstream
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable jemalloc)
+		$(use_enable systemd)
+		$(use_enable utempter)
+
+		# For now, we only expose this for macOS, because
+		# upstream strongly encourage it. I'm not sure it's
+		# needed on Linux right now.
+		$(use_enable kernel_Darwin utf8proc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+
+	if use systemd; then
+		systemd_newuserunit "${FILESDIR}"/tmux.service tmux@.service
+		systemd_newuserunit "${FILESDIR}"/tmux.socket tmux@.socket
+	fi
+}
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 3f3b9e9bf1a6..04c6a5150e8d 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	fi
 	S="${WORKDIR}/${P/_/-}"
 fi
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 1a7472fd24cc..063d4d007ae1 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,3 +1,3 @@
 DIST tracker-miners-3.6.2.tar.xz 7506528 BLAKE2B d0da1caaa72467ec03c7e3c35cbee48aca08dca59d45d11e5f5f887d75954dbac0671d5698226c9cb89e97b3a76b318013ca17f8508ec3f867758662f53b25b7 SHA512 032c96d41e02ed15b56937ea543428aef7b45ce4c206b749e6a99506dd48dd760e45b12563846a3208f0da42387d0547de9eef1fcb54d93cdbca4aad52050af4
-EBUILD tracker-miners-3.6.2.ebuild 4762 BLAKE2B cac97e694e0d6682e71c79f663a4c1ee7eb3b478f40bf220e6bf57813f84e55f84b1b3fcba94543991e14ae051608a1ed940bb0177d0aab995486d853a9040a3 SHA512 e87e5e62515fd8d47c2f2d8ebc3b41641b278811f268fe5c6bfd28954d5c2c7087e30258cb51c9163bd47b676ce07d24dffce98848e891fc2a5fef0f9456aae7
+EBUILD tracker-miners-3.6.2.ebuild 4756 BLAKE2B e1c8897fca67302a6d85046ed194865dd606beb260f9d5dabd7fb959cd04292054499f742be8806d8bdf6d7d23bd9398775d17c1b977ae3adfbfa8c927f8fa7e SHA512 bfa9972c2c10e9e3f52a9e0546d7a0606716b782299ae1ef94b28ae5d1f0c8d64b2d4279cb1dc79fd735b6b2412f98f7b83a0762dbb76622b16e4e360c6e1358
 MISC metadata.xml 835 BLAKE2B a7f0c667be6eaaebcd62fd782c72831f8f95f778d2ff1ee36c278fc3a902761ca10d73fd7e6b15afa83d36a960d5f20dc765b62dc6f85022db01d9d0d356bcbd SHA512 9d348dbec07ab8e344dab0d6f3acdc48e91d80171e411353b233f8b49989f4152817c8ed522c234d5dd9a3849cdab3d46f41256702a5d50bbf1e591f112cddd5
diff --git a/app-misc/tracker-miners/tracker-miners-3.6.2.ebuild b/app-misc/tracker-miners/tracker-miners-3.6.2.ebuild
index db87bfa6ae9b..5c1d7ea4ed5a 100644
--- a/app-misc/tracker-miners/tracker-miners-3.6.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.6.2.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead);
 # so choose ICU over enca always here for the time being (ICU is preferred)
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 31c80f926bae..8a016f5467f6 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,5 @@
 AUX 3.6.0-configure-c99.patch 1822 BLAKE2B 09ead950a359b0240e8ff1908483ec7583dedf7ae6627b824ed84e3bdb3e65b91675eac1da1f7ea3ee74730d5fda1ae18bbd3eed542c33e4b78f989a78bbbae7 SHA512 eb58f02b730aee91d4cbf69c93e104ccf106db3fff7f5c78ae21a963de56ca28198b701926734928a8bc5d9d505037e471122f3ec9c8cb0d6d8f598a80940e5e
 AUX 3.6.0-sqlite-3.45.3-compat.patch 1954 BLAKE2B 567a455663f46252a7616d1d81053c43ff6f7a936b0cc76da9b8c0de1ac29b5203cd286deb59a0095da933faf78f70d0f19bd06f09ddb7c7034b8dbc210b3e75 SHA512 8ec042a012a9ba5d818214672266fe548c2287f850ac9791806c796f4cfdfd9d1f878701b2e8d621848457c1807b2b67bba9de4f356b4a836a1c3614e15e8370
 DIST tracker-3.6.0.tar.xz 2560980 BLAKE2B f10720b624b2b00eb510961f7346bb6c1fdc278237126d1b5f4b9af2d0f67cc74896b65bce89de14a085e55441fe64985cb13da06242838fe43dd0739e8d5bce SHA512 d3b7d4c1fd1cdcccc0d78c05f43b85f5cdab584e378cb56a2b568293ff95c887650d41c3c7f65de8864a0b6f80ae26410f4a443f045a80e30bacdf7ef9499697
-EBUILD tracker-3.6.0-r1.ebuild 2559 BLAKE2B 56f5155a5ad786d0cde630c0234c1dd36ec0da7b2ead58458c90e01e0d3e70207976559583003d230345a48b205c7afa4b5191d60645f5530f72906c6b8c96b9 SHA512 ca261d5d7e39f533c3e0d7905d0d13e2f8ad8e2786a02df5a0a478f49bf6a6dc080ccf9b2fbf506e7b84032d878d1d981afa7c3bf85107375cd9c0f410c9051e
+EBUILD tracker-3.6.0-r1.ebuild 2553 BLAKE2B f1e14f2256337f0d38e8dd4245105f49e5c948142fe8f84ac66f4771813ef60731b70872c78eaab41625a94bb238f74479fe8ca71b35f42cac587db15f6cfc66 SHA512 8c3c89e4f7aa736e8b573ac1a4a85d0a2a4192cde4da63a5fae76ac189e7636c442be75675f21be82a668d6da9e3d70b7066237095f2d84f457d3bec82a7ddc2
 MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef
diff --git a/app-misc/tracker/tracker-3.6.0-r1.ebuild b/app-misc/tracker/tracker-3.6.0-r1.ebuild
index d45a9117cedf..25930c7d3c01 100644
--- a/app-misc/tracker/tracker-3.6.0-r1.ebuild
+++ b/app-misc/tracker/tracker-3.6.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +miners stemmer test vala"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 0e551412ac32..55443094e79e 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,6 +1,5 @@
 AUX vifm-0.13-musl.patch 4230 BLAKE2B 5f4877935a9a1e376d21c2f09561813d941b1a8a1289a53fcce18134d270021a2e9e47be487556f09c8273c1b42b9bb06dec2b591545a018cc14fb1d012d522b SHA512 6b5dbba6287ff749cd89a3b5ee39635a6f0a45cc752a5b22941c53e60fe27aec959bfbf3a0a02fe0dc58cf88c4e8f34fc7c1d28213587bd59e8fff1a139e1706
 DIST vifm-0.13.tar.gz 2218099 BLAKE2B 99661dd0defcb434abdc397855feac5c6da55a783cf8ad6afe333e208c431b9d10f05928fcf5a9f8e28ed4d602f66414162b14a872ce8881526f679e6e66259a SHA512 bd5e9f84cfb176e220e798dcdfc62e2ae3e89dbebd08cf4cce73eb843b85060c2df05f04f4db994d406baf2e0f90a04f5cb871beaf00fb04174464c81dd85938
-EBUILD vifm-0.13-r1.ebuild 2261 BLAKE2B 6a99263285de840ac19b20edb6d3d5267470a63f09412d6ef5bf3609a40f64b1606abc196ba7d215388392e5e497e6c9266ba5906abe6452d0e7f923ee0ada74 SHA512 4f6592efae8d3129bce7fa0f0b2f912344c1aef2c0163b6b53201f09c9108d6c7c1d90874ff63ca49372e9d1e8f44effba71fae2ff0bdef016e1165c3b175c99
-EBUILD vifm-0.13.ebuild 2130 BLAKE2B 22e9aedefd0852b2813b124242dc8b92e8961bc41f2cddaeac76573bffc8205051a4beaf8b50039a46a6ed503de2f723cae76825986081f342b12781ba953b75 SHA512 8db4c850ad3842ec327be00c6f176d8bc629445bae7f1622f505a240d149a6fe166e785c17ff742faa1df1775894323d8c44d38bcaf07fee3103a38f8eead45a
+EBUILD vifm-0.13-r1.ebuild 2258 BLAKE2B b08117732e152f2a276bc6cc1dcac0f3d0f4828515faac16a26841f561bb9bad82d078e635e8fa82fab483f11837b4bac74b99d2bf236fefb5d92e664edec173 SHA512 74a57a9d0eb11944114bad7c24d204c8884a74aa4db2b9e6aad9b535822cd824354e4f909d8344b58d9dea4785c5ca4ec263fa6557cd8f4ea7f0d19285707cdb
 EBUILD vifm-9999.ebuild 2133 BLAKE2B fddade233455e3cb7b05a3a7ecd698b652756bb4ed2e5d7fb43458c1d3ce901bacd99e39149ee671b703f006a654eb8f789f2a429e659739ced72e8193d42518 SHA512 77e89bdd10b395495aeb670a81cb5814fcb0ea5389e3207052bd98ee04c184628b1adef72834a8511db33279e38e5dfa1aa9114a2f5dc11626bcb52d14f499a4
 MISC metadata.xml 1036 BLAKE2B dc3584dfe5e9475cf857c46561f96ad5a608850ead292a74ed577497e6b6a54571d7464ac39b2a44c210e77d189e023c136458bf5aaa1259e8fd7aa9583f820d SHA512 52b096005e5499df726d0f450e605f19e1d474880b509e00f8d557e6491baa355fc722bbb5f8eb3bc235037672ba1a5e645ab3f4d6ae1b5789ac2b80e7194780
diff --git a/app-misc/vifm/vifm-0.13-r1.ebuild b/app-misc/vifm/vifm-0.13-r1.ebuild
index 524072b9c243..1a7971e162cd 100644
--- a/app-misc/vifm/vifm-0.13-r1.ebuild
+++ b/app-misc/vifm/vifm-0.13-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm64 ppc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-misc/vifm/vifm-0.13.ebuild b/app-misc/vifm/vifm-0.13.ebuild
deleted file mode 100644
index ae80765cc747..000000000000
--- a/app-misc/vifm/vifm-0.13.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools vim-doc xdg
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="https://vifm.info/"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vifm/vifm"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ppc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+extended-keys gtk +magic +vim +vim-syntax X"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r3:=
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="
-	${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-# "Either perl or Vim is necessary to generate tags for documentation in Vim's format." from configure
-BDEPEND="|| ( dev-lang/perl app-editors/vim )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# developer just turns off optimisations and adds -Werror again
-	# bug #855386
-	econf \
-		--disable-developer \
-		--disable-werror \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_install() {
-	default
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins -r data/vim/doc/${t}/${PN}*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins -r data/vim/${t}/${PN}*
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use vim && update_vim_helptags
-}
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index 8f45d7593a2f..2732d1201ffc 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -2,5 +2,5 @@ AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 AUX vlock-2.2.3-echo-printf.patch 375 BLAKE2B ae93fbf307dfd0a911a38b2426d89d0a7a864c47db4c533af01bf2b12f89227e4af38e1eba00dac677b1c467bf688166647681265b3ff7006a323cc91e971306 SHA512 30d1f3d20e7e7881b0fa759f0cba1fed3249cd27c91a784624de23df07db821b2c0ec73b5ae54ce90bb8f58d9d68c4cc3bf10f738d99fda6d7bd1f16a429de7d
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r2.ebuild 1489 BLAKE2B c8686824ed2e6334f93bbecd6c841e3f2b87802841606a402e839766a3c6ad486097ded1e526ba138e8ca84cda69fe193a01f6622ec99a788cc6a0e5b8af7214 SHA512 1bd62de3f36a067d891636b443795d6f10e056293f4e73f06692b9cbca279e5858683345d0caa60e6de008d010025240f78b54cd30e4df3faa009bfdc16e435a
+EBUILD vlock-2.2.3-r2.ebuild 1483 BLAKE2B aad0a259b5e25cb4c485a15e2ef5a895db00d3e4e36518bc0a0d9784aec25a05b76a9d001b74e82653d5233dbaa1b645165591c434f63456e8fb96f8dca17164 SHA512 573c3e4d17e74975dd503028ff55517a80c3d5fe27f2dd556420f87cb659eef7a89fc73336e4b431f8bc4b8aeb685b440a69f4063943bf87b33d50efe3072c9f
 MISC metadata.xml 343 BLAKE2B 9ce863a10db1a90966b8e3abc70f993ac3db60ebc99fa37d4ddedaa3f70d6f835cd26b9de7943a6e68d8b8bf5ab643f71be61d0f414e4021b6877ac2d709280a SHA512 80d3022b68aa7089564ea7d57808844f95d9b556cc5d4c4a981fc781561e04473b982bea6efe4d025327fd643982e10b43d43c87f418e433e59ac42f6e5feb95
diff --git a/app-misc/vlock/vlock-2.2.3-r2.ebuild b/app-misc/vlock/vlock-2.2.3-r2.ebuild
index d89685425bce..beb4dbb2d0ba 100644
--- a/app-misc/vlock/vlock-2.2.3-r2.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/WorMzy/vlock/archive/${EGIT_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="pam selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/worker/Manifest b/app-misc/worker/Manifest
index b72a563ecbce..16dfbaaef4d5 100644
--- a/app-misc/worker/Manifest
+++ b/app-misc/worker/Manifest
@@ -1,3 +1,3 @@
 DIST worker-4.6.1.tar.bz2 1615384 BLAKE2B a0d665f82d585d4e8a7e515e44b23541da24f6712c86bff422d4612ea67292c31cd204367965f8dd0ed91e69fa11453f7fc5a0228b2508d8397bde39460ff6f1 SHA512 f5977bc2c84c1eebb0058d63c7d10a0b39fa3c3bace09b6adac82f6a17bd9df8b1e2ba8138d764899895b69493493245cb6f7aff15014471a109a023fe203e57
-EBUILD worker-4.6.1-r100.ebuild 1461 BLAKE2B ce272601e1963df20e1f1951daec4c98faa43081e3e4f262d6f18f174bc2dcb88c9cdfa845bec4f0e21e1ec85fc4f43e599286908b83c26f9a35bae22b86c50a SHA512 3a2d5b007fb7d5e02da607e274c7d3a9658242369f743d0dff4abb4c0ac4a54f14bad26463f0fbcc1b5e9270475bb9e5d45b6a2dd991b7216cfc1c72bc051448
+EBUILD worker-4.6.1-r100.ebuild 1511 BLAKE2B 0946c927b1d27a301840953de80c445bebba8cdec92a8c86f991b86144e72194a1ffecb8687cac01e1159eb81ce9029e2ae680ed890e0a9872c01baa52ebfbb8 SHA512 5594a6c490c7fefc0cf43cb6e808bc8a986e6f8e3547d0e947fbea0206b92a18ddef09c5fbc6d650346979f0c6ca8ec29be48377764ee15d97b21d12399412a3
 MISC metadata.xml 626 BLAKE2B 65156e7f3d2dfb7b361e6d21561b976f4fe1177c81e1161778697549ad6e0ca34fd42e0226673aa43825513eb0c525f98fac4a72373df3cf5298019dd444c601 SHA512 cd87b3c18a9f85c47fdce934fe855063983d8dad70ffc65ad8fa803c0f64b5e9310fd6bc09095083dfaf4d05b69fcec2cce9f28555626a74633907c60e4d0733
diff --git a/app-misc/worker/worker-4.6.1-r100.ebuild b/app-misc/worker/worker-4.6.1-r100.ebuild
index bd319146baa0..8ce55a35225c 100644
--- a/app-misc/worker/worker-4.6.1-r100.ebuild
+++ b/app-misc/worker/worker-4.6.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,10 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS )
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	default
 
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index eb211015daf3..1a79bb36f546 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -2,5 +2,5 @@ AUX yq-3.1.2-test.patch 606 BLAKE2B 51d0578f5241400908efed53233a52fb0980e4733ad9
 DIST yq-3.4.1.tar.gz 32876 BLAKE2B 628fbb62de0c2f138133444c2f371819f920ac3d7c89787b96cb2de59eaa49f1324227d53f6d33e29dd9a9a804283339b34d87851c6f32a16a1cc94a7451a726 SHA512 d11290d44eefeae23a8e5fe3f536f714ee532a5aa1636c949a9db3e89bdf5ad5480ba5f8d6e809fa06a245de5e671844233ed64eb609e49fa3de8813ab9556cc
 DIST yq-3.4.3.tar.gz 33214 BLAKE2B a1b3d813d9761ac8a8429db3fe8efac64ade69e0d2fa9b137a1ca8c9e367a0f16b636482b6d9381e2de43392007f37388b6ab37def04739723488f271fd56d16 SHA512 db4ec57aafa1d08786ba11897040506c9f13d800cf06f76cea052d2bba88553db53627cdfcfdbbfbdec81324800114d397890759383fb4db31609727a10474eb
 EBUILD yq-3.4.1.ebuild 1187 BLAKE2B 1384067b77b23d69f16be86e5572f090b62d2f78956a60549b7a0c7d94edf97cfd90898a9b7617a2ff5d0d656694a05d6d20a7b29309cedbc7a9637e1fadd720 SHA512 4f1a25f673827fa8a7cae4951c89ce889188828ff595bcc946c826231268674ad607dcdde8d1f3a1ba6395beea83acf1b72f0430a3bbca9fca1f9e506bb87b91
-EBUILD yq-3.4.3.ebuild 1646 BLAKE2B 46dd046776de7a46e68bb9cb2002639510843e6a1494a865c837be22c1b8317a7cd1a20131d7753597d6554bf56f9528d2ab5e4f7325d98e0e14544100f9b7d2 SHA512 bc127217c57955d65cca1bbd36783f938f458aeab189f647ce5fbdb081cd2cc891782f33fa8f3a4c09f01e05caf8d9f9088df401382d2445c1a539419e3e13de
+EBUILD yq-3.4.3.ebuild 1643 BLAKE2B a5793a06fde0da6d9769ad3d4e59f6316ef2d0466da7921192b769411a9e500ef14541487ec35b3614be0246a3e8d4c873131ed6ed3492469cf8a2c81b34a20f SHA512 b7acfff1b6b9028ec57897354200501cce85b7efd0fefa39e56d486fd4d52f6214c01120e177338e1e5a07e0e5efd271934538908bf4d2ea80490a748785b8b4
 MISC metadata.xml 533 BLAKE2B 1a6a5d05f8c3e0edc24567c4f3f7218a7a4a00d10044dbeb34d8fe8e75345300841c3da061f6110c156162cec1b01ecf2c82bad142d8b2754518a8a6c7191c99 SHA512 3c4b73caa09d72d0edc99964380572c015d9baaaf6e86775fd1648b9256183f6bc2bff10cec3a1e63554734de145b21275d4df5156ec2cad0adace955b0d830a
diff --git a/app-misc/yq/yq-3.4.3.ebuild b/app-misc/yq/yq-3.4.3.ebuild
index aad1f2cc82e1..98ccb3b1e776 100644
--- a/app-misc/yq/yq-3.4.3.ebuild
+++ b/app-misc/yq/yq-3.4.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+KEYWORDS="amd64 arm64 ~loong x86"
 IUSE="test +yq-symlink"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index 073c9a513eb1..c8cc261cfe75 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
-EBUILD zisofs-tools-1.0.8-r1.ebuild 760 BLAKE2B b7c14d3cb8e2d67de96078facdf66f56d2e2cbf6866f30ece4f4b2b0f99c525ebde9e684136786c21a722c6356b00389c60c2f2c13bd5f8d5fd9d62ffc2e6f5d SHA512 396d779eb6f0fcfd6b68b9876f3db1438ec3b6a0051a2bc324f56f33545f622363d49ba77b4130da4695d49b1cc69fa244245d0906861fcce97923fd7f4d4537
+EBUILD zisofs-tools-1.0.8-r1.ebuild 754 BLAKE2B 08d7e28c55d6c2e23876bf0e0ceda22665f44b1643268c7468f7f0fa97eb157eeacd4cf51801b20a6b7c3e7e7701492c4fb229bd93b22de477997436ad9b12be SHA512 d22f4e6810464f0bab91f44803d3da9422ec66b3cbdebfeb66e2a3eabd919e1be83d3933d5a64111bb584d71c5b2dcc4375df753786f24e346eaba40f96dfbb4
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild
index 6e7e459dbbec..91ef7bff250f 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 RDEPEND=">=sys-libs/zlib-1.1.4:="