gentoo auto-resync : 24:02:2023 - 21:49:24

46 files changed, 336 insertions, 685 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 83afa8864617..6f4e2ce5f34a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/arch-chroot/Manifest b/sys-apps/arch-chroot/Manifest
new file mode 100644
index 000000000000..3d1f197d432e
--- /dev/null
+++ b/sys-apps/arch-chroot/Manifest
@@ -0,0 +1,3 @@
+DIST arch-install-scripts-v28.tar.gz 19730 BLAKE2B 0ff5ba79b200ad642e049ec19217cc5c0794d627a28f42e03c0df2444fef4d8488a6ee011d26fb8fe958c1a1a2fa0a13920567e394b2389c772f516b1fe8f388 SHA512 09a027b04b70e01ccd1fd82e3a443c876bdf978b94a922de9dea4dbc187360460ea35720816724b72fc31b02338b11bf39b47ec9156518a8a3ade000530bf1df
+EBUILD arch-chroot-28.ebuild 806 BLAKE2B ab67004cad22d53edfa9c9c4cb49217bdb0dd8a5e67eac7c118de222914c645c4e0bf2001a08765a1a721f619723ff7a5d7a8e7d2c83226bd47ed48b652efee0 SHA512 36d12e66e823f95856ef3b1f86b47890460578a731ed851a6013f9f8b13423e0639b740d10d1f48a0664fb7e3d5daa63571f55061bad17b024a95ce9254baf0f
+MISC metadata.xml 660 BLAKE2B 563818fc11864a0cc992d1ae36b2da1d7419dbed8fc5c63428b64c073af630139c1154a4e818b4dacb2e9d56923338483d4c290ef943745401d5ee905276d518 SHA512 885e4cc9b4f1795445a394dc401270263da33c030a8233c6a8efb2d1ec034cf915fe40d94e93122dfe4db91205593eaef2e69439197d77208194bdeea0ba75c6
diff --git a/sys-apps/arch-chroot/arch-chroot-28.ebuild b/sys-apps/arch-chroot/arch-chroot-28.ebuild
new file mode 100644
index 000000000000..78f61c92ae6f
--- /dev/null
+++ b/sys-apps/arch-chroot/arch-chroot-28.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Wraps the chroot command while ensuring that important filesystems are mounted"
+HOMEPAGE="https://github.com/archlinux/arch-install-scripts"
+SRC_URI="https://github.com/archlinux/arch-install-scripts/archive/refs/tags/v${PV}.tar.gz -> arch-install-scripts-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+
+BDEPEND="app-text/asciidoc"
+
+S="${WORKDIR}/arch-install-scripts-${PV}"
+
+src_compile() {
+	emake MANS="doc/arch-chroot.8" BINPROGS="arch-chroot"
+}
+
+src_test() {
+	emake MANS="doc/arch-chroot.8" BINPROGS="arch-chroot" check
+}
+
+src_install() {
+	dobin arch-chroot
+	doman doc/arch-chroot.8
+	newbashcomp "completion/arch-chroot.bash" "arch-chroot"
+}
diff --git a/sys-apps/arch-chroot/metadata.xml b/sys-apps/arch-chroot/metadata.xml
new file mode 100644
index 000000000000..7350009d97ca
--- /dev/null
+++ b/sys-apps/arch-chroot/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+    <maintainer type="person" proxied="yes">
+      <email>cat@catcream.org</email>
+      <name>Alfred Persson</name>
+    </maintainer>
+    <maintainer type="person" proxied="yes">
+      <email>peeweep@0x0.ee</email>
+      <name>jinqiang zhang</name>
+    </maintainer>
+    <maintainer type="project" proxied="proxy">
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+      <remote-id type="github">archlinux/arch-install-scripts</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index fb2a3cc92dd9..528d981a1e63 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -6,7 +6,7 @@ DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
 DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
 DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed
-EBUILD diffutils-3.8.ebuild 1673 BLAKE2B e1af83d87e166a3d60f87ed13870240f9216ff72ffb99508780c7020fa466da05b2e3b8eeaaf8dbf244ee873059a004273bfb2e2ab6ddb4cf4f0e16542497f3b SHA512 17925dde918dc25fde6a42891b45c7a8f242aa5a81bf67974b01d03785f16251496912fb5ccfe0927cde4908432cf36532341d7b11f16b2ae5033169f466018f
-EBUILD diffutils-3.9-r1.ebuild 1900 BLAKE2B 9aea7e183d78d8f625d19f31c316c0876424cbf282f6e08fe92cfe1c57ea64b367d54775238978b9a264e1b4ce1d83295ff511b17d310f4d07ce0da046e63d37 SHA512 03c127915b962d68edf618d36eb868716763d47824f669588b066b8216e5c70d83a1afa980cf9806f46986e0bed3bacaa160696edd70a681c4aba4970a52376e
-EBUILD diffutils-3.9.ebuild 1738 BLAKE2B e77e1914a52c8ea0ba462abd13483525008028f8db677d0fa054c563e115900f7fcd6b4736927aa9d8192b15ed65e43bcd183651e373cbc469afa327d8bccaa9 SHA512 62ed34d6e9c18ba2e0831ad05cc48df9f0c787cf7e111a61b6ef5b781faa776645f53356d0b8c89a10df7a6c91e0fb95b467b8a5fc09d890080e8f7dc7ada194
+EBUILD diffutils-3.8.ebuild 1686 BLAKE2B bdbf22e16f3791a7a844ac98dc3a64ac56c53e2ba36fee9af0a58314055c324c1a2ecd0cebf005f711483453446b03a9e8313df4050b7819f497d6302b4904f6 SHA512 b3e3b0aa801fc6312416e735111bf73a5aca065f50d054d45eac224bfdd861c26147c540f7e6cfa9755846188805495ca2c10f815c7c80440b13bdc346af072f
+EBUILD diffutils-3.9-r1.ebuild 1913 BLAKE2B 22849028bb2818042bd2f2a2594fd504d0c1b271b24cad4c7f1bb9e31bbd9b5caa3d6e62beac577fbb4a8cfb990db07de929acb3c9dea2459b8bd3ff6c411a8d SHA512 708d65ddcc7fcfbd9995453acf479e9e463357e59ac12279dfdb1f43cccdaa0ff10e151a6c1c81ce3ecd8bc1ec886e84e1b6d3af4d2bf143934f3370e44cce06
+EBUILD diffutils-3.9.ebuild 1751 BLAKE2B 920df2d12ba5858fbb8c027dffe2882b8c0e1160a607d3bbeae755d7157f01f8f86b164066d39ce9c99b4b48e0b913cf28e2e56e2ebfb0c80998b8df33bdde79 SHA512 01f7f178edec54db25e661c33a5fe3dcc7b961184c98922653013e944fb002c31d5b38b3d034444d1a328d6f58109a389de1059362610c31298025e73e042a28
 MISC metadata.xml 403 BLAKE2B 009b73d59702ec89a6dc4e9ff8886ee77f0390961ea51aa5248d6f2fa3c9de0dd7fc8ba6844b0e38b7bae348dbb3b38cc8447f27371127976a5e5ae37aebbb34 SHA512 c0450fc2991ef0b1b56076a82fe88a8c860ac2a11aa78ac86cbaa29b049fdc6c69e11f9da3e9f90501f0a9567884e0bc47cf2b3b0a486cd173d1060b19f04a25
diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
index 1591a6a87921..5d894b8165fa 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 7aebfc8cbfa7..f5712e1bb8c7 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild b/sys-apps/diffutils/diffutils-3.9.ebuild
index acce50bad293..5b4d12ed0b7f 100644
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 03cb29e91ca0..b9f5bfb18b8e 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,6 +5,6 @@ AUX file-5.44-limits-solaris.patch 443 BLAKE2B d7481f0669b48d6c1a94e50706b652363
 AUX file-5.44-seccomp-utimes.patch 587 BLAKE2B c1d2a8861034e9de0d4b1d0440935bd1ce25b789de0ac7f573378a1ef5d409f4c879deb0fd8dc89c48674d5af795cf8b99f7da870c9e5d54cec7a2d400b803f5 SHA512 e41b80f2e858ecc3e100b128d41c2d2e948a334f87523ae5d0c3b50916c678f37d6f26948d0b51a1bbdea9b0ab2683a3955004df2736d1240dcf80ee14390d9f
 DIST file-5.44.tar.gz 1186437 BLAKE2B a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42 SHA512 26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
 DIST file-5.44.tar.gz.asc 195 BLAKE2B a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1 SHA512 1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
-EBUILD file-5.44-r3.ebuild 4109 BLAKE2B af6e9cf8077c5130ac8042da18f35ec376dc9f62dfab8dbe0569b49c879da7407c5e1862710fef8a499d21b5a635afb8ed64bdbd8eba2242d3653f4b889f2e6a SHA512 1d3de6105733c054ee18cc293d578ef9c9e9aac71cd5c092643095f633d8643718e0cf481f0692bad77063e0efd6ee3148ddb09d3120fe8178ac67ed0bfde9f1
-EBUILD file-9999.ebuild 3929 BLAKE2B 730c7603fb1fa540e120bb667079f31e9434a48458c6b95d6a79f5aded8826d6a4e96c0db0faeefe9a5a2ff2025504c819f5ed4689b2803c866f6f66d65eac37 SHA512 e95ed16bd46ccf86f8f0677f9f459ed5dc2be82bd1253125e1844d263a674c7f94edf47d81aa5c6e46c765b89a0304878e5d3b1917ee00e0272e74be00f27282
+EBUILD file-5.44-r3.ebuild 4122 BLAKE2B 46af34947f0a4bff884a4d1701cca75c3a35d50aaf3bb96330dcadf49f01654333fd0279d7db7481da9d50354ed6f88ce6113a2be39a924bd4a43c677b3de3e2 SHA512 d3bf7ebb9f3c327721b279cb2b0b44201f1ad17e5358c26a444a18a4c208bb7a04a48bd38857edf4321b91c94b976743bad1341056e8ddb00083603540babf79
+EBUILD file-9999.ebuild 3942 BLAKE2B cafb3a6bfbf5010a7718103e3f29131db46c77b76781598658c3c74335128849341e5f0ba2fa8d387556db9b821e334139b88510c7e59b8a9d2e3dda91ca7e60 SHA512 37e605cb70b1ff6179a15a2d295dbe6bd452999f746db15f6c24402c6d36d7ec59b05a46f0e6f9619a9ed24118bfbb4633f052b54187251d78bb45b4be7675e1
 MISC metadata.xml 565 BLAKE2B 737512e354fedb4483608b04c594a486c0d8a0f70d23d306c59c78dedb0c8116f80ff558926444b9d9b9ef15805b3826163523b5644c88f01a330be1b8c9a76f SHA512 f240bf9e064c6e6f5b63e3265dfe3adf5b1d2c2b5b2456b79ea7451580150271ccb4097d33967de57ba767fecbdbea51fb62ccb683fcc5e1cca101be660ffd19
diff --git a/sys-apps/file/file-5.44-r3.ebuild b/sys-apps/file/file-5.44-r3.ebuild
index a8a4f92d1f59..d62a1b406c2a 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 82884ca365e2..26babd17aba5 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index af5b1cb0552e..83a81886ddb4 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,4 +1,4 @@
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
-EBUILD findutils-4.9.0-r2.ebuild 2399 BLAKE2B af7bab88f922de21922270100102374f2382eb70d972b797e1a385fdb714e71ebb1c5b0d8f794e90a26586d86a44c9cbd0b0a24ce13ca9c189de2979cc62e554 SHA512 f3e52aefe3031dfee65fba3229d10df07e62cc6323e4f08cfaebf7e88d2f01b0fc4fe26db451d456863e26d862cd40b0fa1404466f52f7f8a47ab76e50c04498
+EBUILD findutils-4.9.0-r2.ebuild 2412 BLAKE2B 2f991a07202af514eb2eded55c61d0e453f1fa51b6476ec5eda7427c46d9d73d0d2044617c840c76cc1bacd4f246b9016dc2818b96fad5c5c22c3522e4c5ffa7 SHA512 ad31a2afd466883d787e2273f4ceaed845d414c4eaf3a4593600a0f0c4f2813a53f8e697f9d53f890f99740f071e0f70d0e1a1ce8ecdf87134216fdeb6d91d2f
 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.9.0-r2.ebuild b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
index 29285eb548ce..c8fef6739a9b 100644
--- a/sys-apps/findutils/findutils-4.9.0-r2.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 44cb562653af..d875b79deb63 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,13 +1,8 @@
 AUX fwupd-1.8.10-installed_tests.patch 10892 BLAKE2B 27f52fd33ddcf9d64aecf40105413047668e538ace3efe25a87abfc3100c264515b238252b303aed43dde6ca6ddd788ada826f52ec0a0e7bc7b1e2fe47142025 SHA512 f581dfac2e2a94659751958b8c05a54eb2cfc0c23fd89dc1cf3e2a460e3079e15ee60898b5bdb6d399bdc997a82b5bb8a581f5db21cbf6830a94b6f01c443a5a
-AUX fwupd-1.8.4-installed_tests.patch 5999 BLAKE2B c59749549f7bf057129802ee534780967c09155ab247f5bc0293112908cd833f2700d92c5839efc1d09250bc2ac966d468c83f7a9e61622d2aa35d60d3b0115b SHA512 6158b56816bf7e5173f23fa29314f33effe5eb49a06201cdfa17743d22b3f0e3260f9aa2661687cc369f252e958ba193088fc96aa4de4d3c93d69658d145ab56
-AUX fwupd-1.8.6-installed_tests.patch 10375 BLAKE2B 2baf10a3a681dcd15ce1c99a3f4b3d59fea07864e57ca09526cd69c4922145779cbc50668a0264f65cf567d521d3e9d79ffc3c1fdd824a2c84b3d30bcb326951 SHA512 2338c2f23385b001edb6ce5ea8c4d54f31ba286eefde2df816eae719ed94046bb26905278ccb3d2c88d9c86f962b659854e67f767782c21c3a033decb48d4e6d
+AUX fwupd-1.8.11-installed_tests.patch 11562 BLAKE2B ae49094cf8b8312fa529424c5235cd12c68d368ab9a6b5f7520351683c31f71a824d50987869858454c27f6f6868df311042785618eb9bf18e424d5ea00ff987 SHA512 a4ddfd3c36dcb2ad47c4640180c301f0244f056d6812c2c722a84e33232694fd051305fb13600bea100e2ab5f692a039091238cf24d6aa29ca9044825b7dba35
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97
-DIST fwupd-1.8.5.tar.xz 3289548 BLAKE2B d82845ad4a6faaee966d43b8d9d5be0d4522ac6f2455ac8ef9d9c90dd0141a4feb7dd28f5c79526a49fd2ac4b785f92328a913a0fd13073fa2357aa996dd0700 SHA512 96856a56cb10b789bbbb82a33b702473cf1bdc32a9fddca6e48313ba3fefbe2f63a12a7290e3b4bd11939844f6989a0e15e96a4c2911cb900cd9e8d9c6c13f15
-DIST fwupd-1.8.7.tar.xz 3335636 BLAKE2B 1c4e8f369581f826a710274e0789fbcfe735ce58407d1c0f7472721895bf426e0ddf0fd3d014a35efe39726f8891faa7960aaa455482b435138ea116bddbc142 SHA512 374339178a1fbf85bc25b47077d0db351b3664a02ec9478c4a5381228125f3bd65ef0be9eb526574bd09ab665aadd6cd9e39f01ebbfebbd338ec191ba24c5a36
-DIST fwupd-1.8.8.tar.xz 3341320 BLAKE2B 12804e59dbc1a2091e81109d0d4cd58b75240835249be546b423858419841cecdb93b4f50406924ccaa609fafb0c96349561b46345d79a66d97133956e4dfa29 SHA512 05c9527d5b9013937b106e5a79e0337b66e3d79578bb61ccb27763d95b7d2e93cd816c969a4712e1ca6e5d4b6bc166ea264520e6673ab105a7f6eb2122e69c17
+DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de
 EBUILD fwupd-1.8.10.ebuild 4877 BLAKE2B 374ad7b6b8f3332a00716dcd46d9904833ef7c52e95d9e269fde77fe810ef17cfb3a76c0bff112b2831b2d80b985b1257386c092363e9e542bcb53afaac8ffc4 SHA512 b1435e3079eae1f76433511b13473fc72665c09b095d21ddba889178ea636ffa53f30f5e8055db3f8c33149af7041e9741aa89d4a2c87aaf60a124253837afdd
-EBUILD fwupd-1.8.5.ebuild 4975 BLAKE2B 269da725271292aeca1accab387c65dfda239c193aecb0c47c62e78c5e8620ee3309619646da694cbde3718479b5b15044c6a41a59f686a62cd1412bcc0afd3e SHA512 6c766d1044d2250b5fd4d045aa6e284788d6ee943803df8fae04c1fb06d2ead38c904df3bfb278b4a12260271da54c14ce09f229153a8f343176205ca12fd829
-EBUILD fwupd-1.8.7.ebuild 4868 BLAKE2B 934db3177be02165f5d3f7c25d51aa6581268fa21e6b0b78ef08c303657d151db7f3785a6f646733494c9fe3eaac47047a4728c9c09e90968d2e3d9d10cf88a5 SHA512 855fa0e6c2d87ecfca9185be4f057f398d75ac7f73796b385b29b7517d2552fe64fa652971f60f068963b151964e0622349e0537b72a52260fc304bea445a047
-EBUILD fwupd-1.8.8-r1.ebuild 4870 BLAKE2B de8da6728e210cd5f6eeef10c4ffbe942eb17f936892c454999577a10d66b24bf74b7e4525cae54216ed2c2004bff519b9b7df2d594acfef5647c573a88cf301 SHA512 2c19be779e65b5c4df50095086765bcf99febc16c1217a68461b8430fb509fc74f24555bed24820a193704e769013fb6f815713b0465d5180718448230d83752
+EBUILD fwupd-1.8.11.ebuild 4879 BLAKE2B bcb4bc55a2db90ef65d1dfcf217ca677cd8f87790395828a7be8fc24c24557bf97b757bfe8ba21391a270cff7cf3993c6457f9bfee338eb95d86899254e0f00c SHA512 129634825e136cf9d4a243d3386f5f3d9e6d2b9a81ed1a55e92fbf1419b30f3f6a7bb3f123c915e5f059e81f1f048c799872ce270765b18323b03d78647d163d
 MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de
diff --git a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
index d82a326e0d08..819b6799ebdf 100644
--- a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch
+++ b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
@@ -21,6 +21,33 @@
  if build_standalone
    install_data(['daemon.conf'],
      install_dir: join_paths(sysconfdir, 'fwupd')
+--- a/libfwupdplugin/meson.build
++++ b/libfwupdplugin/meson.build
+@@ -370,6 +370,7 @@
+   )
+   test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env)
+ 
++  if false
+   install_data([
+       'tests/chassis_type',
+       'tests/sys_vendor',
+@@ -388,6 +389,7 @@
+     ],
+     install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'),
+   )
++  endif
+ endif
+ 
+ fwupdplugin_incdir = include_directories('.')
+--- a/libfwupdplugin/tests/meson.build
++++ b/libfwupdplugin/tests/meson.build
+@@ -10,6 +10,5 @@
+   command: [
+     python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@',
+   ],
+-  install: true,
+   install_dir: installed_test_datadir,
+ )
 --- a/plugins/acpi-dmar/meson.build
 +++ b/plugins/acpi-dmar/meson.build
 @@ -28,7 +28,6 @@
@@ -92,7 +119,7 @@
    )
 --- a/plugins/ccgx/meson.build
 +++ b/plugins/ccgx/meson.build
-@@ -28,8 +28,6 @@
+@@ -29,8 +29,6 @@
  plugin_builtins += plugin_builtin_ccgx
  
  if get_option('tests')
@@ -101,7 +128,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -44,7 +42,6 @@
+@@ -45,7 +43,6 @@
        plugin_libs,
        plugin_builtin_ccgx,
      ],
@@ -121,7 +148,7 @@
    )
 --- a/plugins/elantp/meson.build
 +++ b/plugins/elantp/meson.build
-@@ -20,8 +20,6 @@
+@@ -22,8 +22,6 @@
  plugin_builtins += plugin_builtin_elantp
  
  if get_option('tests')
@@ -130,7 +157,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -36,7 +34,6 @@
+@@ -38,7 +36,6 @@
        plugin_libs,
        plugin_builtin_elantp,
      ],
@@ -140,7 +167,7 @@
    )
 --- a/plugins/linux-swap/meson.build
 +++ b/plugins/linux-swap/meson.build
-@@ -25,7 +25,6 @@
+@@ -28,7 +28,6 @@
        plugin_libs,
        plugin_builtin_linux_swap,
      ],
@@ -150,7 +177,7 @@
    )
 --- a/plugins/mtd/meson.build
 +++ b/plugins/mtd/meson.build
-@@ -27,7 +27,6 @@
+@@ -30,7 +30,6 @@
        plugin_libs,
        plugin_builtin_mtd,
      ],
@@ -160,7 +187,7 @@
    )
 --- a/plugins/nitrokey/meson.build
 +++ b/plugins/nitrokey/meson.build
-@@ -30,7 +30,6 @@
+@@ -33,7 +33,6 @@
        plugin_libs,
        plugin_builtin_nitrokey,
      ],
@@ -168,6 +195,16 @@
      install_rpath: libdir_pkg,
      install_dir: installed_test_bindir,
    )
+--- a/plugins/nvme/meson.build
++++ b/plugins/nvme/meson.build
+@@ -38,7 +38,6 @@
+       plugin_libs,
+       plugin_builtin_nvme,
+     ],
+-    install: true,
+     install_rpath: libdir_pkg,
+     install_dir: installed_test_bindir,
+   )
 --- a/plugins/pixart-rf/meson.build
 +++ b/plugins/pixart-rf/meson.build
 @@ -19,8 +19,6 @@
@@ -189,14 +226,16 @@
    )
 --- a/plugins/redfish/meson.build
 +++ b/plugins/redfish/meson.build
-@@ -40,14 +40,6 @@
+@@ -40,16 +40,6 @@
  )
  
  if get_option('tests')
 -  install_data(['tests/redfish-smbios.bin'],
 -    install_dir: join_paths(installed_test_datadir, 'tests'))
 -  install_data(['tests/redfish.conf'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
+-    install_dir: join_paths(installed_test_datadir, 'tests'),
+-    install_mode: 'rw-r-----',
+-  )
 -  install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
 -    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
 -  install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
@@ -204,7 +243,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -68,7 +60,6 @@
+@@ -70,7 +60,6 @@
        fwupdplugin,
        plugin_builtin_redfish,
      ],
@@ -271,7 +310,7 @@
    )
 --- a/plugins/uefi-capsule/meson.build
 +++ b/plugins/uefi-capsule/meson.build
-@@ -144,25 +144,6 @@
+@@ -146,25 +146,6 @@
      c_args: cargs
    )
    test('uefi-self-test', e, env: env)
@@ -297,6 +336,16 @@
  endif
  
  endif
+--- a/plugins/uefi-dbx/meson.build
++++ b/plugins/uefi-dbx/meson.build
+@@ -32,7 +32,6 @@
+       plugin_builtin_uefi_dbx,
+     ],
+     c_args: cargs,
+-    install: true,
+     install_rpath: libdir_pkg,
+     install_dir: installed_test_bindir,
+   )
 --- a/plugins/uf2/meson.build
 +++ b/plugins/uf2/meson.build
 @@ -18,8 +18,6 @@
@@ -318,7 +367,7 @@
    )
 --- a/plugins/vli/meson.build
 +++ b/plugins/vli/meson.build
-@@ -46,7 +46,6 @@
+@@ -49,7 +49,6 @@
        plugin_builtin_vli,
      ],
      c_args: cargs,
@@ -328,7 +377,7 @@
    )
 --- a/plugins/wacom-usb/meson.build
 +++ b/plugins/wacom-usb/meson.build
-@@ -22,8 +22,6 @@
+@@ -23,8 +23,6 @@
  plugin_builtins += plugin_builtin_wac
  
  if get_option('tests')
@@ -337,7 +386,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -39,7 +37,6 @@
+@@ -40,7 +38,6 @@
        plugin_builtin_wac,
      ],
      c_args: cargs,
diff --git a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
deleted file mode 100644
index 1cb3b41cb728..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
+++ /dev/null
@@ -1,215 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -10,20 +10,10 @@
-   subdir('fish-completion')
- endif
- 
--if get_option('tests')
--subdir('device-tests')
--endif
--
- if build_daemon
- subdir('motd')
- endif
- 
--if get_option('tests')
--  if build_daemon
--    subdir('installed-tests')
--  endif
--endif
--
- if build_standalone
-   install_data(['daemon.conf'],
-     install_dir: join_paths(sysconfdir, 'fwupd')
---- a/plugins/acpi-dmar/meson.build
-+++ b/plugins/acpi-dmar/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-dmar-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-facp/meson.build
-+++ b/plugins/acpi-facp/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-facp-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-ivrs/meson.build
-+++ b/plugins/acpi-ivrs/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-ivrs-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-phat/meson.build
-+++ b/plugins/acpi-phat/meson.build
-@@ -53,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-phat-self-test', e, env: env)  # added to installed-tests
---- a/plugins/ata/meson.build
-+++ b/plugins/ata/meson.build
-@@ -53,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('ata-self-test', e, env: env)  # added to installed-tests
---- a/plugins/bcm57xx/meson.build
-+++ b/plugins/bcm57xx/meson.build
-@@ -35,8 +35,6 @@
- )
- 
- if get_option('tests')
--  install_data(['tests/bcm57xx.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -63,7 +61,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('bcm57xx-self-test', e, env: env)
---- a/plugins/ccgx/meson.build
-+++ b/plugins/ccgx/meson.build
-@@ -37,8 +37,6 @@
- endif
- 
- if get_option('tests')
--  install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -64,7 +62,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('ccgx-self-test', e, env: env)
---- a/plugins/elantp/meson.build
-+++ b/plugins/elantp/meson.build
-@@ -33,8 +33,6 @@
- endif
- 
- if get_option('tests')
--  install_data(['tests/elantp.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -57,7 +55,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('elantp-self-test', e, env: env)
---- a/plugins/linux-swap/meson.build
-+++ b/plugins/linux-swap/meson.build
-@@ -44,7 +44,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('linux-swap-self-test', e)  # added to installed-tests
---- a/plugins/mtd/meson.build
-+++ b/plugins/mtd/meson.build
-@@ -46,7 +46,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('mtd-self-test', e)  # added to installed-tests
---- a/plugins/nitrokey/meson.build
-+++ b/plugins/nitrokey/meson.build
-@@ -47,7 +47,6 @@
-     link_with: [
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('nitrokey-self-test', e)  # added to installed-tests
---- a/plugins/pixart-rf/meson.build
-+++ b/plugins/pixart-rf/meson.build
-@@ -31,8 +31,6 @@
- )
- 
- if get_option('tests')
--  install_data(['tests/pixart.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -55,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('pxi-self-test', e, env: env)
---- a/plugins/redfish/meson.build
-+++ b/plugins/redfish/meson.build
-@@ -47,14 +47,6 @@
- )
- 
- if get_option('tests')
--  install_data(['tests/redfish-smbios.bin'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
--  install_data(['tests/redfish.conf'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
--  install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
--    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
--  install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
--    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -89,7 +81,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('redfish-self-test', e, env: env)  # added to installed-tests
---- a/src/tests/host-emulate/meson.build
-+++ b/src/tests/host-emulate/meson.build
-@@ -8,7 +8,7 @@
-       output: '@0@.gz'.format(input_file),
-       capture: true,
-       command: [gzip, '-k', '--stdout', '@INPUT@'],
--      install: true,
-+      install: false,
-       install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
-     )
-   endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.8-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.11.ebuild
index dfcb3a16a2f7..ae2c0c6958c2 100644
--- a/sys-apps/fwupd/fwupd-1.8.8-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.11.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	modemmanager? ( gusb )
 	spi? ( lzma )
 	synaptics? ( gnutls )
-	test? ( gusb )
+	test? ( archive gusb )
 	uefi? ( gnutls )
 "
 RESTRICT="!test? ( test )"
@@ -96,7 +96,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.6-installed_tests.patch
+	"${FILESDIR}"/${PN}-1.8.11-installed_tests.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/fwupd/fwupd-1.8.5.ebuild b/sys-apps/fwupd/fwupd-1.8.5.ebuild
deleted file mode 100644
index e2c5b1bc22bf..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.5.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1 vala udev xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	fastboot? ( gusb )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	modemmanager? ( gusb )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	test? ( gusb )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	>=dev-util/meson-0.60.0
-	virtual/pkgconfig
-	gtk-doc? (
-		$(python_gen_cond_dep '
-			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-		')
-		>=dev-util/gi-docgen-2021.1
-	)
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		dev-util/umockdev
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/xz-utils
-	>=dev-libs/glib-2.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	archive? ( app-arch/libarchive:= )
-	cbor? ( dev-libs/libcbor:= )
-	dell? (
-		>=app-crypt/tpm2-tss-2.0
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.114 )
-	sqlite? ( dev-db/sqlite )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss:= )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.4-installed_tests.patch
-)
-
-src_prepare() {
-	default
-
-	vala_setup
-
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-
-	sed -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
-		-i docs/meson.build || die
-
-	python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
-	local plugins=(
-		-Dplugin_gpio="enabled"
-		$(meson_feature amt plugin_amt)
-		$(meson_feature dell plugin_dell)
-		$(meson_feature fastboot plugin_fastboot)
-		$(meson_feature flashrom plugin_flashrom)
-		$(meson_feature gusb plugin_uf2)
-		$(meson_feature logitech plugin_logitech_bulkcontroller)
-		$(meson_feature modemmanager plugin_modem_manager)
-		$(meson_feature nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_feature synaptics plugin_synaptics_mst)
-		$(meson_feature synaptics plugin_synaptics_rmi)
-		$(meson_feature tpm plugin_tpm)
-		$(meson_feature uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_feature uefi plugin_uefi_pk)
-	)
-	if use ppc64 || use riscv ; then
-		plugins+=( -Dplugin_msr="disabled" )
-	fi
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="disabled"
-		-Dcurl="enabled"
-		-Defi_binary="false"
-		-Dgresource_quirks="disabled"
-		-Dsupported_build="enabled"
-		-Dudevdir="${EPREFIX}$(get_udevdir)"
-		$(meson_feature archive libarchive)
-		$(meson_use bash-completion bash_completion)
-		$(meson_feature bluetooth bluez)
-		$(meson_feature cbor)
-		$(meson_feature elogind)
-		$(meson_feature gnutls)
-		$(meson_feature gtk-doc docs)
-		$(meson_feature gusb)
-		$(meson_feature lzma)
-		$(meson_use man)
-		$(meson_feature introspection)
-		$(meson_feature policykit polkit)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use minimal || udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use minimal || udev_reload
-}
diff --git a/sys-apps/fwupd/fwupd-1.8.7.ebuild b/sys-apps/fwupd/fwupd-1.8.7.ebuild
deleted file mode 100644
index 202260d525cc..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.7.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1 vala udev xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	fastboot? ( gusb )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	modemmanager? ( gusb )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	test? ( gusb )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	>=dev-util/meson-0.60.0
-	virtual/pkgconfig
-	gtk-doc? (
-		$(python_gen_cond_dep '
-			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-		')
-		>=dev-util/gi-docgen-2021.1
-	)
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		dev-util/umockdev
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/xz-utils
-	>=dev-libs/glib-2.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	net-misc/curl
-	archive? ( app-arch/libarchive:= )
-	cbor? ( dev-libs/libcbor:= )
-	dell? (
-		>=app-crypt/tpm2-tss-2.0
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.114 )
-	sqlite? ( dev-db/sqlite )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss:= )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.6-installed_tests.patch
-)
-
-src_prepare() {
-	default
-
-	vala_setup
-
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-
-	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
-		-i docs/meson.build || die
-
-	python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
-	local plugins=(
-		-Dplugin_gpio="enabled"
-		$(meson_feature amt plugin_intel_me)
-		$(meson_feature dell plugin_dell)
-		$(meson_feature fastboot plugin_fastboot)
-		$(meson_feature flashrom plugin_flashrom)
-		$(meson_feature gusb plugin_uf2)
-		$(meson_feature logitech plugin_logitech_bulkcontroller)
-		$(meson_feature modemmanager plugin_modem_manager)
-		$(meson_feature nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_feature synaptics plugin_synaptics_mst)
-		$(meson_feature synaptics plugin_synaptics_rmi)
-		$(meson_feature tpm plugin_tpm)
-		$(meson_feature uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_feature uefi plugin_uefi_pk)
-	)
-	if use ppc64 || use riscv ; then
-		plugins+=( -Dplugin_msr="disabled" )
-	fi
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="disabled"
-		-Dcurl="enabled"
-		-Defi_binary="false"
-		-Dsupported_build="enabled"
-		-Dudevdir="${EPREFIX}$(get_udevdir)"
-		$(meson_feature archive libarchive)
-		$(meson_use bash-completion bash_completion)
-		$(meson_feature bluetooth bluez)
-		$(meson_feature cbor)
-		$(meson_feature elogind)
-		$(meson_feature gnutls)
-		$(meson_feature gtk-doc docs)
-		$(meson_feature gusb)
-		$(meson_feature lzma)
-		$(meson_use man)
-		$(meson_feature introspection)
-		$(meson_feature policykit polkit)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_test() {
-	LC_ALL="C" meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use minimal || udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use minimal || udev_reload
-}
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index c33598c0c4a1..30661bf257ef 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,4 +1,4 @@
 DIST gawk-5.2.1.tar.xz 3411420 BLAKE2B 5dbbfe92ed4c11a38b2f995e9267dd2e392a9f393af1c63aaf3c5dd6d1681c01db900e05a118831125f914fcffe2218de7f30891ccc6f64abc5f572aef5feeff SHA512 f81da3e61987d1460326dc79fdbabacfd4660219bf66ec8ba18877500fd24e160761e401a5b868067f82bec46a6a808098f3f6a1f4c8b710e439cd3f99ffa56c
 DIST gawk-5.2.1.tar.xz.sig 488 BLAKE2B 5dcdc9ae90d4744a968cc750526a9c1c38915f85c56c2eca80b219ba8519c927ab55b7f569d55054b0499f7bf37d3413b97e9d3cf36f5573f9ecd4855663064e SHA512 97a9cfb069f235bef31892ec6e5c56ee6a8733129ae3d02e871d5407de4d7a6140fc0a87001b2b21e3cffd714d1b4d164876de47144dfdce6dea92c670ed0217
-EBUILD gawk-5.2.1.ebuild 3550 BLAKE2B 42af28d6b9328472ab2eeb9ca5c97b05a953c49f7c75315ab173a675c8400720d9cd2505ca70ea56e15d111d57ff492e10350d0341f3d5b4cc129af7bcb668e6 SHA512 8587410b52c39d994e724e478d5bfc75fb8fe50e3fdbdd9767cc6b3cb525fe2b63b086bbc8fc6df8ffd6da4707b6824baa99c8d6df39404b2dbb279eafd0db2c
+EBUILD gawk-5.2.1.ebuild 3563 BLAKE2B a991de67ab955d2d9f161d0fe98b89851781c77acea867e1cefa2f32b20f76ceea455193473a304851648fddf9cbe3149178f9c07653d5cf6a8a4f5d339eaa6a SHA512 6946e93fdd8dfa6c7313eaa5e98d8c7848c1227ae4cd4a3f91523d3b3478bd1e3fec7976e9070e4cb149f505692b7476b1368879ef1a8ffaf467f07df2d7f867
 MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2
diff --git a/sys-apps/gawk/gawk-5.2.1.ebuild b/sys-apps/gawk/gawk-5.2.1.ebuild
index 20e0b2120e33..cea5fa83b978 100644
--- a/sys-apps/gawk/gawk-5.2.1.ebuild
+++ b/sys-apps/gawk/gawk-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,7 @@ else
 	SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index d15a6f59a042..8e3fd1342965 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -6,7 +6,7 @@ DIST grep-3.8.11-908f.tar.xz 1658032 BLAKE2B d217a3b15f2597e2ffd54b941aae179c038
 DIST grep-3.8.11-908f.tar.xz.sig 833 BLAKE2B 460e7eb98f803995de43e919cae2d01e261380fde100c4570c50304035585573c358d0154e98102aafbfdd23ce726c15a59adbdfa3922408a4dada4095be13e4 SHA512 b4d9d517746633ee1fbbd8277fb22499634163b77e320be0721d1e48c4d8f1fbc4ec63177698cdac3f7d411403f51afbf7b7e302b78ccd7cf581361eb3963277
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
-EBUILD grep-3.7.ebuild 2274 BLAKE2B b847a17bfe835e573a6406c728e99c1af5687bc2e83bdb4c1b6103790f587210c5bd3f4121c7fb83d8c96805a6a7fc636f06050df1f8f591d95e931f2cfecbc9 SHA512 dace79b242b68187cf8d756b4c91a7873eb8c1b1a3f631b67bb07192a95c4c4af521db19e6a943ae03f1d885317c0d6f497e129c7644e36d5dc97963415396ee
-EBUILD grep-3.8-r1.ebuild 2863 BLAKE2B bd8defb445ed2291840d1511648c1fc9c0d3a76c43d4a9a433baa063ec4b841f5f901293e7a48556728750fb99d74f118e9dce858f1c1d71da13555e853a5301 SHA512 0ab0ccf314cbb3b2fd7b2e877e8ce9afdd4e7ff4dd50d45df42ea79823c17a1bab83b59a055d4e477ab1b64a69f1686eebf312f814677e347378b638b1484851
-EBUILD grep-3.8_p20221230.ebuild 2870 BLAKE2B 95027ad8262acaf8a2771f3ea0644cbc65380d511e3a00015b1f026747a3926812cf55000c30e6ab7f3a55d5ba6ae4cb88da66456cd88575fe8f58e8b35625cd SHA512 5bd00afd540781a082c77bf8758a3a5ec6a98fc6dead8bc062257955e3df4b2dd8ec85d5a8e6d6b1530b0dc821e331463079245411b97e06f06b1579bbec54a5
+EBUILD grep-3.7.ebuild 2287 BLAKE2B f8d7f163f327da9d4b933db81d759660b23b5c774acb690e2552ff28214a9d0b1c7aea0bf7bc571d0d5de807aa7f56721a311e8c2a71a906f39f30798fa97b9a SHA512 91a4e5d3aed32ed19bf8ad5996349073ff743bc31e73c2ee8b2e3714bac150da26202a840a4acad823d977071ac5d65e101e61327a2776725ce1db021a9f49a5
+EBUILD grep-3.8-r1.ebuild 2876 BLAKE2B 56615ffb9e6d0091bf29d4d419d13a15e73f51a9295cabc4996a314404b5fbad9e04a6a57e66728cf5cecb1cc14a17b18a67ed4c5980ad8110130520ab1ff972 SHA512 d765489a66eb7e3b54c8f993f133794120b469838c56a9e9409a6f9f5587466e14e97c285bcb9ad4bf38b001695c7ad1c543d4feceb5b930bdf3e92e1a633791
+EBUILD grep-3.8_p20221230.ebuild 2883 BLAKE2B bb797866333a82dbcd2dfeadc07d378db8285f90feea131b6962275977c81b3f63a92e7d1b1fa315f2f39259172499c159ad25ac1fa649cba80b9b24906ee6c9 SHA512 07975975af07741f4679012540d89aa93cd085a1c3597ef15b1e9a8a6709c9c9b0e234f52baa85d98787eea873d3940e0a3192804428c18699746a41ecae15a5
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.7.ebuild b/sys-apps/grep/grep-3.7.ebuild
index 799ae9355ad6..5ea929a88bc6 100644
--- a/sys-apps/grep/grep-3.7.ebuild
+++ b/sys-apps/grep/grep-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 # We lack dev-libs/libsigsegv[static-libs] for now
diff --git a/sys-apps/grep/grep-3.8-r1.ebuild b/sys-apps/grep/grep-3.8-r1.ebuild
index 6544ccdddfb0..657b75021b1a 100644
--- a/sys-apps/grep/grep-3.8-r1.ebuild
+++ b/sys-apps/grep/grep-3.8-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/grep/grep-3.8_p20221230.ebuild b/sys-apps/grep/grep-3.8_p20221230.ebuild
index 2b397f18b09b..8324903211cd 100644
--- a/sys-apps/grep/grep-3.8_p20221230.ebuild
+++ b/sys-apps/grep/grep-3.8_p20221230.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index d9f43ff8059b..d0d97ee17a5b 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -2,6 +2,6 @@ AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b38
 AUX groff-1.22.4-skip-broken-diffutils-test.patch 1657 BLAKE2B 62a8b41cd02abf27368d818e63ff64eea737258f913d95fbf7e6b9a204809e03540efe3fb6f4e52c2f9134daa156696bdc091d21636b58b13a9e4875981275f4 SHA512 464047c451d60966295fed49e27f58efa481bd30edc038d3f954264f647de33d40a480b8efa8165ab84dd8a9d07dc80d0f2d3b0c0adcce297f23cbd9c117154e
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 DIST groff-1.23.0.rc3.tar.gz 7347387 BLAKE2B d61ccf18450816abb2436799c3ffac0ce0bc827ad4f262c94e172b0dbaae18593b7562576067e0380ff96cbc40b4fe63382082867659fbc6971cadc81e8dc36d SHA512 bfdc6761e02b698b7d7dac059c14c1f3de94057cda4952aca2fa41da3bd9657daef86bdddc46a392397ccb761f627d1652ce5f4a38890c480fbdb89f9926b662
-EBUILD groff-1.22.4.ebuild 2945 BLAKE2B b601a6584ed60f2983f31760a31281d013aa375ab9709fecf27cb596bdf2c63d8c1a06f78e047e1979c7fb031db0a0d64121b44bb9cead82a872040fd042463a SHA512 5b4a3f4c4430ed5ea0007bb4ce090b0b82c0a497bd95fa03f2be8dfda5eb6fba30d7f07fb732ad996d105b7321965d8d8e692b88062735680a6db9489a0d1f95
-EBUILD groff-1.23.0_rc3.ebuild 2652 BLAKE2B bc99534cb7172340773fda17ba7c71c402b2da7c153591e856bc998bd22a01ec81a68305e9fbcd199dd3e7f62c3b2dbfa60c44ac04e4475c88dfe884ec610ef0 SHA512 ffa6d7cc41c14f5d25a4d741fcd6374af414a59649052434e0098a17edb482501300c906c4a584d4279e70db5fd89107612fc96f3f4b57b4ba6d27872598a0f8
+EBUILD groff-1.22.4.ebuild 2958 BLAKE2B f99219190f92f1d4e02e5b6fba877d56a3617983de1ddc43b43cea6a9468f8610636963b69015423e8fac25e80962e8b94748510e27c540361bf52f86c56c249 SHA512 0719ddfa2ef41a7ab3733846a634d92e67b9a024ab5f0d8d354b50545c4f7b1ee6a4fb1eacf9a6250dda1b3af831202be67074c8e92c493071cdebbb2e0729df
+EBUILD groff-1.23.0_rc3.ebuild 2665 BLAKE2B 15f9648c394ee7e1979e858fbd7a1fc153ca6ab5ccd5e2bb7439b84c06377d46aab8582353f995346df1030c0ae1cc35b7944b4cd15e0e9a89e54c7be9ee9496 SHA512 fe626376ae37b01472a5c099ff766807a123f64e7c19c3791ddb09109cc039b65f75aa1dd7bf004e974cc7fca1c4921dfc69658ceea198b3822c2a442a9e10ff
 MISC metadata.xml 514 BLAKE2B 56bd1f6ff4a0082fd0148d0ba9c9fffb13e665f7550661b6625bc7b8589a9ebf1f37957d55ecb379f3e38b820574d068789ec5e8f2e1743e02acfe2f91abea2f SHA512 90796d8d5e32de1c47de855a1cfaad250c47a686f79586af0d79f9a3d2a4c2c64b589ea8f7ffe7f7473a10d9d11ecb43245e54714fcb18bebb73abd1db767d37
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index b07b4e2c08e6..6b5109bf0719 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples uchardet X"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.23.0_rc3.ebuild b/sys-apps/groff/groff-1.23.0_rc3.ebuild
index 0d90fdb18750..795366532403 100644
--- a/sys-apps/groff/groff-1.23.0_rc3.ebuild
+++ b/sys-apps/groff/groff-1.23.0_rc3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *_rc* ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 0cdda1d2bdf9..7ad93ec8190b 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -5,8 +5,8 @@ AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b884
 DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
 DIST less-618-beta.tar.gz 365786 BLAKE2B b1957ab49059a2df14d8ba5daf1d8543adc4546c44b537d86959e2e1fe2df93f99ceb8ef47097b6f84f75f7740e161269b4e1d5dd263b8171212c87e650a02fe SHA512 6197aa20c77a846e53b376aa63c2863242c40663e72213f66c3597bd8c38a9458163d0c9ba0ca7690574c07348bb7d3e108c3b50dbbedbc9e5707a14d946b280
 DIST less-623-beta.tar.gz 373094 BLAKE2B 661fdb129678a57ef2188b4cd89809b14eaae62b98bb8ec2394cb7b48faf10a3ccdb690f371178e9ed43548ebce1af840cb5042e9019fa747bcec2dca4158dc7 SHA512 60843c668f90ae47cdf4d10849a63481ab67af679b831cbe8955861ae9f238006322734ec3ae49d9aced7927018bf3e0d9fdab98077289b4ffc78f6075041667
-EBUILD less-608-r1.ebuild 1631 BLAKE2B 3c0bcfb98082e497b3ff75bf44c5bc39882d34f9852aacf410e0802aa8eb65bde5242bf70055a7a1726678ba6971dc01508e9c86ff74597cf2160fbafd2844bd SHA512 c82f4ea7446b40acc3aeb9b33796dc4a55db2e90b3b83e18f7dadc0c4c8a9a88f473ef6cfad524ac0921cd5dce7c4f202bafc06a0f8a269762e0ae046cca7b35
-EBUILD less-608-r2.ebuild 1678 BLAKE2B fa73cdbe4032bab1e5467e51e57eb73d673157cdbab42c8e121809e66838c1f3f8cc10455e77cc0074af706737a6db08066047ba14a95195d3a1edf3835cc53e SHA512 5ddd3699f3cc19bce35595984281b58d6a1c916d72f9eb4ae4d4241afc49a066b62f2233a461a44fc9c8fa1e32010d3d8fdb84118aecf893db4ccb6a7cd208d3
+EBUILD less-608-r1.ebuild 1644 BLAKE2B a985faac14059e82275b36c1122bd91da98c9959e816b9f1e8c97e484ce10b3013c915eeff3ea3ce695983eabb0fa71c1a49d5ec59daaec0f982d5ebec8d17ad SHA512 d8022242942862ef1229138d6dc21a3f54e95395510d23f694fec442fe336f2cea583a3ce3d7b5303d1bede89502c260fed51d7f6ea7c2ec401d5af85ade897a
+EBUILD less-608-r2.ebuild 1691 BLAKE2B 593af00b711b73345589db31b3765ca2de723db667de297a61356c09b919919355f9661a58738e47c92aa94933ee498d55240cbe87997fa912a8d443982639e8 SHA512 e5b372119ee823b4af84f9f747d7cb72ba990a83b5f41d95da6ca512c54cc27585e3fa3c8c2d934c3cd5814c041667487804bde52c568cca002284786ac39782
 EBUILD less-618_beta.ebuild 2026 BLAKE2B 132ce781ae09efae4fe177b311cd4dd57cb1ddc37a21b167f02262d490d981f94918e3a9ff81670f8febea14395d56e6316c32a6236cdf84756553800e17bff6 SHA512 633e22513a82228e2b8770d20bc25c7cf4604bcae161a7c4030fa97605d2ac92d9cc7165c6d03f728f7dc7e6d6f10e61c183bda40e1761dab7ff39f6e3d673e2
 EBUILD less-623_beta.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5
 EBUILD less-9999.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5
diff --git a/sys-apps/less/less-608-r1.ebuild b/sys-apps/less/less-608-r1.ebuild
index 0ad903424e2c..027deaf9c7cf 100644
--- a/sys-apps/less/less-608-r1.ebuild
+++ b/sys-apps/less/less-608-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-608-r2.ebuild b/sys-apps/less/less-608-r2.ebuild
index 8777d5546ac5..511bf7d52e63 100644
--- a/sys-apps/less/less-608-r2.ebuild
+++ b/sys-apps/less/less-608-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 8ab1ba393efd..f344151a010a 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -4,10 +4,10 @@ DIST man-pages-6.01.tar.xz 1789204 BLAKE2B 37005b45af798315992fe4836457982d42032
 DIST man-pages-6.02.tar.xz 1800876 BLAKE2B 005bc57d2abca18516502faa7ea31798e6fb992d4a2fa1ce83dbba2992d9cc29e3b48fef97f1faa55bc40eafcb4eedbafb113dc2561f4a438f0a7fa711e259f0 SHA512 124e5157c25b5a3c62d225be1da2879f436d7fd8fe2f116c11982178e34085d1e50ef47e13fde413a7bf16d1177cbe744d00b2a178be3dfe4c4828371812ea5a
 DIST man-pages-6.03.tar.xz 2184824 BLAKE2B 16eba629c5fcbac7b52fa0ecf32d30d0e07308653d3617d1edf7503b6f983aa3f5145b1af7c5fcc96cb5a64ad425af7fe9be9a0da74c92c52d2d9b8fc60c9661 SHA512 df9de826c8289869fb27928f14eb28040b0f5bdae18247dc2ea847e660dd8bff9eee5656f6b2b38330abc64b69cad7cd44681bdf49173dd49a53877eaf725dba
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.12-r3.ebuild 2227 BLAKE2B 3b3bd8ef026cdd916dd380a88a79e0bf79752309440629bfaed6791c18e09e86c7703b042f241e86c69d4bbd92b9cd37f9b450c05628555f2eb4d79a85026cb0 SHA512 7c054aeb1a8dee95e8f94ddc7226e83fb21fb8d8080111b0f20173c911fa37c6d63976af8db7cfaadfb6223ca205cc29fe33ec3c84aa7a78a71bf0b1a2034ed9
-EBUILD man-pages-5.13-r2.ebuild 2235 BLAKE2B 69ccf3e43c912486f4a10dd6a96a084eb51e2373d6eaf5fb2d1bdb1168d6b7c6a2157f97ebd3a30c9b3e562b1d047156f6ad92b1cf7aa593c84b3a2bcccc14f6 SHA512 9b48404aed7680bfecda777399c24c9e93d4415ec4585832e9a6eb2f621a9ed471e3773be86d798e96b45784b03b42df28528af7cea228f024fb1ca4586df26b
-EBUILD man-pages-6.01.ebuild 3392 BLAKE2B 0f8398df0b7672947b45c8828722855ab33363b7bdf46fc6f9c9d4ffa95e90fc2d4ab200fa5d5707231b410619d3448ee7b1a855862d9e5085d3aec700a3dc14 SHA512 7082fa2ad2e45ed0948354bc9e4360f82ef182a17adc0e8525fbc661386c60c54c7bb4a7d1298d09ccef4105799b49520a9edd259b2acde1d83008c85a07fe44
-EBUILD man-pages-6.02-r1.ebuild 3371 BLAKE2B 9ecbd1a5707cb9587529024730ecbf8307d44e9db384a127ca0be500630abb4fa2bd7fa10dafab1745d1e1967f3cf71d3bb96ca266a3748718cbfb0c36e9b7fd SHA512 d6fa94f7b8c96c68c12b464700d111f651ed351977145efa52d8294472faf9e560eda024f43bde10e1416a570025c9685de6fa9486b53edb4de84a67a313f40d
-EBUILD man-pages-6.03.ebuild 3379 BLAKE2B b0df0eed6006fa9db18088b6105a702f95ba231b339367675baa4ff927becd72bff8bb1bbdf410b1d1fbd4ac2466d49258aaaae55e1a3ea708e3f212248aec0e SHA512 2c46990ca15fa6081262331e1debe6b728556ff2ff38d65ee629a42c44b06e91c0bdde427f9f4c3a17a10ec867056cea6a46d5b91cf6cc73ae21990886e579be
-EBUILD man-pages-9999.ebuild 3331 BLAKE2B f2c4dc45fc55921d9469d70e22c0f8338a87323b034c85da25c2a5b75308a313c19ffa79b42900fb2d659daa45c54896f7913348e8f9b4f97f78653d73712abc SHA512 cc64c8a1208cbda742acb6edd48400ece591ac5b57b742c1a25edc3e4c1abc3b15e061654659cc931b4aa41ecce42a36dcc8d0e0f90ce27399e9572374229e1a
+EBUILD man-pages-5.12-r3.ebuild 2240 BLAKE2B 4a1280b41226eb5b98c8572e37ec4458db2fdc86b1b6e9cf71b38b467505553c5365314ae9825a80c19cce0488e7f0404d5837b185dc0262109a1dad6449cd8b SHA512 b883eb20e28aa3d398cfa65c08d40c570302bc7646151313df5b1f2c82829285cb479e19509fb16bb7cbe666f2f3c22a26261b5ff3c62c0f3b7fa5e801ac8fff
+EBUILD man-pages-5.13-r2.ebuild 2248 BLAKE2B 500770a4a21b8d236eadda9eaac53e581d9020ecb07585083ab65c770349dd504ac0382d3092a44e75cccf426c393c32f6397e1e3b8d4d5804af4c943beee80e SHA512 c5da6cc30b978e1307ddcb2a8d2092b79f9b5ae4a8fb489404fb8e575273f2dd5ce2dbd1151e9347c5956efc266b879661b56a8aed4e193d85b3c50686322da2
+EBUILD man-pages-6.01.ebuild 3405 BLAKE2B c8130de04784669488dab75485aafa711a3c6f649a6b0f9a5ad6d45fe12f63847fb3b6690e4862381aa5ccb5b22c2be1641b992f4031ab57b9452d3159e10be5 SHA512 e8364c65c48a3f6fa3e2d36b5a8b3ea70c7bc090d1c4f4fe03d55ea538ee248d85fd9d92c19683760d0e8c2f4b2718ce9e22b143aba1e718e886cb9f8bbdb777
+EBUILD man-pages-6.02-r1.ebuild 3384 BLAKE2B 2dcb051a1bae08360839c923125f5783abba112c923e98e3d707ac9768895e4a24af132b6b469858c8fc00e0ee73362758fd8d800f25eaccc368ab7af90f437e SHA512 0d58e0b646a4949e750d4a0444278930302d453b3829d72c9dcbeef2fcfbfcc817529e1e04feb708b10e5410bd27e0c248b7de95ba61370c700f0f9b1def6455
+EBUILD man-pages-6.03.ebuild 3392 BLAKE2B 92a00f25351e729e06a329eb69132638ebb4db356b5d17fd2c93093b54b6c8202220961ea66770e5f006b5bac45eee1cac90f330d64066e37ac09b0df0f9a6c8 SHA512 137dd7d96ab5fc8e96fe03df4e5ff7a8320714a16b085187b1f53ecd3807011ef3c18c2431c0426966c1824489bc365d42eaec0505da5c1587b5f72ae0acd37e
+EBUILD man-pages-9999.ebuild 3344 BLAKE2B 9969dcb2e3068fe54d7db1b2f7ff168fb6fa49d2023b19267c268d928555da2654335e2d6e24064ee43582ecd68ed716fe28f096090ee9718d782e3951edab84 SHA512 1c569bb5a2a31e90bf3565b7ffaf20e763adf69964b691c0c11e4c3ca17a7dbaf7b9cf5b8dc3c010a6a6b87f4fdd1678fbd7f87644c47bd53cca77e4142b666d
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-5.12-r3.ebuild b/sys-apps/man-pages/man-pages-5.12-r3.ebuild
index fc0a324bdb91..d8c374f4a6d7 100644
--- a/sys-apps/man-pages/man-pages-5.12-r3.ebuild
+++ b/sys-apps/man-pages/man-pages-5.12-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 amd64-linux ~x86-linux ~arm64-macos"
 IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.13-r2.ebuild b/sys-apps/man-pages/man-pages-5.13-r2.ebuild
index e42088c5e35d..b96481cba056 100644
--- a/sys-apps/man-pages/man-pages-5.13-r2.ebuild
+++ b/sys-apps/man-pages/man-pages-5.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
 IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-6.01.ebuild b/sys-apps/man-pages/man-pages-6.01.ebuild
index 620361bb4149..7921c7d5d435 100644
--- a/sys-apps/man-pages/man-pages-6.01.ebuild
+++ b/sys-apps/man-pages/man-pages-6.01.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-6.02-r1.ebuild b/sys-apps/man-pages/man-pages-6.02-r1.ebuild
index 2b358544342e..c5309d217f13 100644
--- a/sys-apps/man-pages/man-pages-6.02-r1.ebuild
+++ b/sys-apps/man-pages/man-pages-6.02-r1.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-6.03.ebuild b/sys-apps/man-pages/man-pages-6.03.ebuild
index 36a5195a9ce7..023f08c0211a 100644
--- a/sys-apps/man-pages/man-pages-6.03.ebuild
+++ b/sys-apps/man-pages/man-pages-6.03.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index f6d7d59817fe..da81a23a404a 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 161f94bbe091..3f7c09601935 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,7 +1,9 @@
 DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836 SHA512 cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
 DIST s6-linux-utils-2.6.0.1.tar.gz 40062 BLAKE2B 41aa8e3f6774383c1400f83c9b743c1abe106a46ae6213dfba799106cdd10ac2a7bac452c5af297e40081c109b043afa2011c194b50ea8aa53df6a96a632ef39 SHA512 52e10411ea2532534c397a07981e5bd79ce97c79c688efe0378edc4e696ce9dfdc4fd3eb942c4a75c06f16a5d7c10b2f8cd396c07d98620e94446fcd10bc5bae
 DIST s6-linux-utils-2.6.1.0.tar.gz 42798 BLAKE2B b3e858c5755ffc7604e23a8fc08344161a11cad7b52183f5c527cd155c0d15c50f004aa4365cbbb236c5c1e5a48ff8af7787084c10f7517ef0e81d4afcf12c8b SHA512 a9308cf6629439356c7379d7e07e79cd2fa780014f65fa997551b89fe8a7a9490145efea8612490ece4bdaf3b0ae06e07464ec157a1ed1509d4afee2d5722ec1
+DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955 SHA512 da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59
 EBUILD s6-linux-utils-2.6.0.0.ebuild 966 BLAKE2B a34447f3a84d3eed78eefc5f3c3e7fecc17d3b04ca198c4564e953b1194ef55e9f298338bd4e1e853af4151ba0b95c9208a484c6685c76499cfb28ea61317932 SHA512 9f0f3612ac4a528ccdeb03e7a73c5044a091faf486774c7a5996dd75dd0bd1890be1ee65424c5125879489c538529952438810a97a4abf100a2100ca8d087d71
 EBUILD s6-linux-utils-2.6.0.1.ebuild 988 BLAKE2B bf3af15622b397afc52ce8579c52948bd5bc3b66c50fad8a0b0811829617f62b53d954f56b7c5f3cfbd6e22d840b67fa3f133dd1687669b0ae5447c96016973f SHA512 1c739301b8066ba67624d094af453415702657c4928eae6fe83dceef8789129e873d212c37329d63425ae58be7ac22f4d1535da13f998a77063aa02b9616121e
 EBUILD s6-linux-utils-2.6.1.0.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
+EBUILD s6-linux-utils-2.6.1.1.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
new file mode 100644
index 000000000000..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index b578373d2807..47d989893854 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,7 +1,9 @@
 DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a SHA512 2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
 DIST s6-portable-utils-2.2.5.1.tar.gz 51814 BLAKE2B ce4f38d7fb7c632f0e8c10c2990d10eb4f5af38330f29aa3b6e6b97fcce5687eb06a7ee241be5f92f093d5edf5a523da993f140c697ec0dbcef46aacb7f88f87 SHA512 814ab6467034657d3b46e5b933786a2eab1f9cb630c6d67c91ee635facac7d82b5871b94e53445d57fd466c98cc21ea2df4b74c8d48acc0f0c96e14fb827f613
 DIST s6-portable-utils-2.3.0.0.tar.gz 51712 BLAKE2B a0a26d2b287629789861df1380ff2903a356a0f461356746c7793b1b99daf5158202b95ee2bdded9a290d3bed8a94286252301329a1d491f47dde44000ab9390 SHA512 1ef0b937e2f698fb1b98440a84be0310e9be44763969ca812744ebc0a91fe75c50d5082067b6bb07c1acd9df1540f71b6d20254b97e4851bb28937815073298c
+DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 50190c7c55a4e5d79a55a7a9edfa948931ecce3f6e33d2f95113a8e8ea3a5587dfcf7a98b54236eb66488976044d0b319ce0a45c0eb3a1b7399be299bab711fc SHA512 46f4a09d124e44b9b2ac3b8fa8f7b4492207f0a03a052e7b15309aeea175682f7366ff74fbd8a2732952c8f3bbb2fcc69b4bca89609b690e91d167bd25c16b90
 EBUILD s6-portable-utils-2.2.5.0.ebuild 970 BLAKE2B db0e01d27af55c7790a0704819648ddfa12ff7378e408b93f740090605e0d9c2a66a6bfbc6c5e6eff3427144dac4555641019b0edf0b6f2e0cb0204e1833d2c1 SHA512 62c7aff22c7ae80799ae3a46e2d83c3e6cb296f97892980244d34d971cb37998f4716effe158cd2475e84b42991446ddebe7e065b18c41070b066ae647eda4ef
 EBUILD s6-portable-utils-2.2.5.1.ebuild 992 BLAKE2B 014e826b0dd2af2bc51120e75a89d162cdc0b2836c6446ff0e8aa4312e0b27d5b943bb069b2aba678f83c6d90f00779b1cd383431241dfbac6d19ca2465206d4 SHA512 3c82d15f5fec8e08e5c766fc790548b4ed32d7bf24a3279645080941bcdf77b622fe15a2594d1b1c6c29813b8008916b7188ab3e02d8ca51c271a2c494b75443
 EBUILD s6-portable-utils-2.3.0.0.ebuild 994 BLAKE2B 7b2c678672b91cfd59de582900ebc76fcc6dc792323789ec5ff166abfa07657de10281f91e9aa186ea3bb2399321b517840ee495379740663f8d94b62380dd9e SHA512 f442fedab4fade4fc2846e0755bebf0099b88f87c4cb7a7c023e530d80a41edf218768c4c2c6a54bd84bcb65d5a159b16cfaa74dec4ce5cd773081ca65bbf2c6
+EBUILD s6-portable-utils-2.3.0.1.ebuild 994 BLAKE2B 7b2c678672b91cfd59de582900ebc76fcc6dc792323789ec5ff166abfa07657de10281f91e9aa186ea3bb2399321b517840ee495379740663f8d94b62380dd9e SHA512 f442fedab4fade4fc2846e0755bebf0099b88f87c4cb7a7c023e530d80a41edf218768c4c2c6a54bd84bcb65d5a159b16cfaa74dec4ce5cd773081ca65bbf2c6
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
new file mode 100644
index 000000000000..84d119227fea
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index b651cbee10bb..8edd5d0c74a0 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,7 +1,9 @@
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
 DIST s6-rc-0.5.3.3.tar.gz 100554 BLAKE2B b7ce91c27da4ded6a18879c1034fd9b7a9dbe50b4bf81b8e7ad8c932895124f0fad2d3f96c879841e51467549ee0beef2a9d35c0231d0f4a9a8352660ee3df3e SHA512 9ff86c1490c3ccb904126ad745a45628104880e04f3e95e2d899c8e5cc951d52f38885e85a4edc1f6962a741ca229aba6bf7878b1ef193efe2f307eeda8f262b
 DIST s6-rc-0.5.4.0.tar.gz 101034 BLAKE2B b3b8a5c3bfdb76870aad4f4bb100a3c0b48ec30c9edd24c87c990d3274e48dc05ef3fd765471509886daa8a123a98bb9aeb455c25510f8efd6ea545b5b4d26b4 SHA512 04e5fb73fca713f2dd01113fa70fc9a0f1d4bb600c7cbb0cbd6133a5d6641c07ce8774ce07f78854de5baae5be93b106f38a0687a07fff5e62744261a4d4ea70
+DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14 SHA512 6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086
 EBUILD s6-rc-0.5.3.2.ebuild 1497 BLAKE2B fd9d5b56b05c9f1b44625b3af94e8740f41094924e2e398e83858fac3e50022ba8aca12eb95997b3b42d1a77a44a101300bf6c0827ad8f0d17dfd964574d62e1 SHA512 775808ecfe3c2a577fd9bbab7371d9b1a912e0bdd54d37d1f77cf55391ece8edc63acc373b74324e79a9ee583a494ebea68f6002a7ffb5a4706ee9dc5f999963
 EBUILD s6-rc-0.5.3.3.ebuild 1530 BLAKE2B 7804a8eb8ccccf4f80fa7d540622d4b138df5b1c4cadf4a96c299f3a567c285d551b2141d7c3cfdb941cc460eef1b3986bbc034962b2d233821dac2ab074e45f SHA512 efa73a1c1016a9ec8fa8dee910ad36b9ce372991e1b057d08eebee98d9401fee83905660a4e411f082ac4f10fe6336cc8da6cc6713ce00b7dbd25dd7649265d3
 EBUILD s6-rc-0.5.4.0.ebuild 1559 BLAKE2B e890a4cea424776f5ad320d9672b522dd26af218c100ae4076e7b677cb2e6200314399a9c3521137c1295d627f3bb5cfc9eed8b66c8292f8e0fe2d6d42c0cfa5 SHA512 06597688ad3b06f1b0d46e90bf37953926df9617404c677084c82a95b5f1b578c09465d2b659f3a447a3a05cfae33fd741e685883f52154cc1a05184052d2f09
+EBUILD s6-rc-0.5.4.1.ebuild 1559 BLAKE2B e890a4cea424776f5ad320d9672b522dd26af218c100ae4076e7b677cb2e6200314399a9c3521137c1295d627f3bb5cfc9eed8b66c8292f8e0fe2d6d42c0cfa5 SHA512 06597688ad3b06f1b0d46e90bf37953926df9617404c677084c82a95b5f1b578c09465d2b659f3a447a3a05cfae33fd741e685883f52154cc1a05184052d2f09
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
new file mode 100644
index 000000000000..30a021e291ff
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-lang/execline:=
+	dev-libs/skalibs:=
+	>=sys-apps/s6-2.11.3.0:=[execline]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--libexecdir=/lib/s6
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/execline"
+		--with-lib="/usr/$(get_libdir)/s6"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${ver}" -lt "0.5.4.0"; then
+			elog "Location of helper utilities was changed from /usr/libexec to /lib/s6 in"
+			elog "version 0.5.4.0. It is necessary to recompile and update s6-rc database and"
+			elog "restart s6rc-oneshot-runner service because you are upgrading from older"
+			elog "version."
+		fi
+	done
+}
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 13142bee570d..80b0584ef999 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,4 +1,4 @@
 DIST sed-4.9.tar.xz 1397092 BLAKE2B 6c7c7dc782b87c3bd0b5e826ba46c2f1dc7bd8c1159945fcf14b394711742964628774cf9f27d844b672721d7849e6c31992d82fafb9ed4118b7feb60406d1e1 SHA512 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc
 DIST sed-4.9.tar.xz.sig 833 BLAKE2B 256bb112aa3aec1a8d40544ef1b0a7570f35d66369047ed3d261c57f938042dcb4a169137eaed6639bcfb472e4a6fc6ebec2de243b2c4d4c0ba0e9081f92556d SHA512 ceb235850184b99017783486e182ade9db38313d20b2b34d23f54d8affe180f7a191139b993e8ec7718ca33eff732f547ca4b3b59aaf865feaae611dfeae5c46
-EBUILD sed-4.9.ebuild 1300 BLAKE2B 081ed00219acebe1d28a97bff2c0bf1bc676cccd5c50d76403a5d832addc83cfb1d19c9b65ce12df7e825f4b0491ae5f8cbae7bd18f3189b77ad3ee42681c331 SHA512 fef401a2d439d2317881395929762fa3e9735e62d86188bb5728d1201078144b9c2cd2a9f677e97fe02bd1d42ddb69b793bb2f98d9d36e143893ece9e3bf92e3
+EBUILD sed-4.9.ebuild 1313 BLAKE2B 5907d678b35e5ecfa024402c12e090179ea0693b3a3830151edab5655af7452ae9a975f0165e36d70c27b3b7ede548f724f116c9e72fa506b147a15ebcbe2ab1 SHA512 e34ca363ee0e2a47ca74a5eaa5c2f47b3d0128bcda52e8e6edece9dd2fdd9788823a840c660699714c6d5e5db0de61c76949a5f8d1c0cfb64c035f8a8879aa82
 MISC metadata.xml 379 BLAKE2B 1be9eff00cdbbcf916d5e9d1c2d1bc698d4b0a040d45578a218b43049f7d6e6c2080d987c994006c734838ca744497d815c9177f91455c49248c0de3ac435134 SHA512 464326d075bd875f7dd540bb969486415fd006a6fa779a773b6b7d6048fe2017c932f959e992fa93c7266aa6e70c96e267cb55b21e7955fa4155ffcb7ef53c00
diff --git a/sys-apps/sed/sed-4.9.ebuild b/sys-apps/sed/sed-4.9.ebuild
index 7e3eeeeee600..9eca0e443be2 100644
--- a/sys-apps/sed/sed-4.9.ebuild
+++ b/sys-apps/sed/sed-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
 IUSE="acl nls selinux static"
 
 RDEPEND="