gentoo auto-resync : 17:07:2024 - 12:28:31

17 files changed, 242 insertions, 32 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c8f30e609af0..01f72894866d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 99f8965850ad..fbc414fa190c 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -3,5 +3,5 @@ DIST ethtool-6.7.tar.xz 352772 BLAKE2B 94a6fd8d29ff479eb894fe56bf991f522fff9af5a
 DIST ethtool-6.9.tar.xz 358640 BLAKE2B e04fa530084ad14abfea8c3802f272eb61eae9ee07aa2a12d16eeb77708b5ab021f1cdee10c24f83f77d65f2740ba5aceda99c21c47ef6cbcd65834af8334b00 SHA512 bc7e56a1a27a0679119491d6fce076e68374cf47a86fa4c0533851df0aa737cb9139920a9f3f3733deca672923d01bbb579f3d79bd17a2c6738f9f93aa469570
 EBUILD ethtool-6.6.ebuild 597 BLAKE2B 8b3815d7ae1c0299034324a1ed58f0279796941284df7d71a4c6238a30ebbe997c4250d538e4f7fcfb0e4e4e6ee2ae8bd3ec5d99526ec44bdc5b885ebd3e45b3 SHA512 3d4d11b7a5a392618b0214485baa852bad92dafba66b8f44c9abfd25052019b1d11840a842283344a8f83ae6806d83c0e8b33fdfdb0fb8418b0211528e1ba6dc
 EBUILD ethtool-6.7.ebuild 597 BLAKE2B 8b3815d7ae1c0299034324a1ed58f0279796941284df7d71a4c6238a30ebbe997c4250d538e4f7fcfb0e4e4e6ee2ae8bd3ec5d99526ec44bdc5b885ebd3e45b3 SHA512 3d4d11b7a5a392618b0214485baa852bad92dafba66b8f44c9abfd25052019b1d11840a842283344a8f83ae6806d83c0e8b33fdfdb0fb8418b0211528e1ba6dc
-EBUILD ethtool-6.9.ebuild 605 BLAKE2B bbd695bc614b44c12e38b08e026b1dbea5dc8aee84dccc9bafd56734ef1b2fc005a345b3fb5ea486828672c92738ca348372a246347934df80afd5475ca3dd22 SHA512 4f5ced2b28468b5c2d5833461bdc8746338d98355891a0f9a800aa214bfd075d193c1d1e44c550c8636121d069c444c770e66d4744e00a4ca32aa1edebaf922d
+EBUILD ethtool-6.9.ebuild 598 BLAKE2B fcaa2dfd58b09b17fdd3fec6a377644ab0d7d66cd8e01c0399a99307680981229ac18315f4a670032d0dfcd4a51620c03e47aaa3e9d36939a73e04ac79ed5219 SHA512 83330ec32672f285d34a1328f78b7f39b1fed0eaf8486f17f8e5de96ecdc2abf4b09bc29d5d6712c28b192c528ec47c5627a422ac36d0cca28e539a7c099540c
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-6.9.ebuild b/sys-apps/ethtool/ethtool-6.9.ebuild
index e2e14f39f01b..68d44d2fc64b 100644
--- a/sys-apps/ethtool/ethtool-6.9.ebuild
+++ b/sys-apps/ethtool/ethtool-6.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+netlink"
 
 RDEPEND="netlink? ( net-libs/libmnl )"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index d00f2c4cf50b..e6818be446da 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,6 +3,6 @@ DIST findutils-4.10.0.tar.xz 2240712 BLAKE2B 2eebdcb425c04170d17afb80e7270ba095b
 DIST findutils-4.10.0.tar.xz.sig 488 BLAKE2B fadd7dbf80a52965d6da641bda21ce00790623cf2c959ed03c1193a22c19f30417733511a739edcb1a0a97892a1257e0e88e32d872f94e71e3ade04776337d3c SHA512 a835153a0671309021be187bf78afee58d9682acb40545aaa9dd187f0ebdea0cfa5583bd03f363243633ea056ddb0a7a6603987ab5e34a608426cb4265ac6d8f
 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.10.0.ebuild 2347 BLAKE2B 7a7c138f7ead545c3c9885f64aa703491539205ffe5d8a908f9d4819a67b9aeed3256fb9f6bd33c59c923c578c7b09219c03517cbc97a93784a2a9805944f84b SHA512 1b207e2c778e0d2f698d16182f5d9a72dac01316706e1d5ee7ece66de91eeae40b9ca5167daa0e866380fa68dc5162c5e73675dabda0bd02e2306f0f2a6b0d84
+EBUILD findutils-4.10.0.ebuild 2341 BLAKE2B d726b2cab359ba667887bcb37987b6b6e2d020095ea44638df4e4b44b271b65142cc6f31529ee6e37db001fd93a871175a82423d877ddeeaae0d8bc8da50a907 SHA512 fe5043983a955e712a5e52b8e9d28efbacea818ef6f66a9559161d4f4c54e208ba11be4602cd62a7b1906b3f6058276096e5401b756ea2d453e257716c53ba05
 EBUILD findutils-4.9.0-r2.ebuild 2396 BLAKE2B cbe790df642bd27f266854bd1b608fa8e65700147b64bcfb4677cca440020c2fa201da7ae6d88538533ac91a1b259eb026c05b5a833fa404d1353d3a0b8119c9 SHA512 cf654ce1aed5809b1a78f61487013929d0450a49efb4e245bcfb826f60400bb1714bbcf29c696113c01c304797f7072b0a928979eb5d6af81bf66545769387de
 MISC metadata.xml 383 BLAKE2B 19523d687c23d0f2e1edc4f9f9f183642d34717f29e0ddb0215c3fecabc4af9eb36443451044dd41e0b379c5b69d11ea60332f777c4ebc17dd8569483b88e3b2 SHA512 355aca11f02d0770f684a423dad09a107b28f4d4bcfdbede4b5dd80523803fe6f0d03dea23569c1d728a51c7545ee3ac041068492038ace55093d738f81d04d1
diff --git a/sys-apps/findutils/findutils-4.10.0.ebuild b/sys-apps/findutils/findutils-4.10.0.ebuild
index fd4180661649..29503c6d58bb 100644
--- a/sys-apps/findutils/findutils-4.10.0.ebuild
+++ b/sys-apps/findutils/findutils-4.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index 6fcf8cfe49d3..b831ec595c6b 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -5,5 +5,5 @@ DIST hwdata-0.383.tar.gz 2430035 BLAKE2B 7f53f08fa6df5d4dd2eb5a92b419914a0fd04a7
 EBUILD hwdata-0.375.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.376.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.382.ebuild 694 BLAKE2B 6e0d1777463dc18ababddd75e3b185e92efeab8bab61776093b14a9bcfbf5dd5aeb2f2223616bab6cfa9b9e08cec82f350bcdbe97f050f6a8cbd34fdb4c8b631 SHA512 d6715e361e6afe6ab68fa4e56f8439480f491e4d1edf6fd46cc8c92647ddfe489e49e33e776bed1a4dd845b873bb71b7369fa6e97c70ac537a1781a67369afa4
-EBUILD hwdata-0.383.ebuild 702 BLAKE2B f9b23f4f07d7e4b8d58f6802221703cae82ef55ccde4c4ef948d27912241d5ef19b8d9d76cb41432ae28bd42f568aad8eea15f3b9e862c352015b7c0608b7d57 SHA512 f647ab18b6ebfeee6e14d6787a6dfcbdc3ae76631eb356889986c561bfdf31353668f3a52bf364c34f8344933c12a08fd9613b3800dad7334eb17559351e69fa
+EBUILD hwdata-0.383.ebuild 694 BLAKE2B 6e0d1777463dc18ababddd75e3b185e92efeab8bab61776093b14a9bcfbf5dd5aeb2f2223616bab6cfa9b9e08cec82f350bcdbe97f050f6a8cbd34fdb4c8b631 SHA512 d6715e361e6afe6ab68fa4e56f8439480f491e4d1edf6fd46cc8c92647ddfe489e49e33e776bed1a4dd845b873bb71b7369fa6e97c70ac537a1781a67369afa4
 MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/hwdata-0.383.ebuild b/sys-apps/hwdata/hwdata-0.383.ebuild
index aa8f1bb9c78f..294584919180 100644
--- a/sys-apps/hwdata/hwdata-0.383.ebuild
+++ b/sys-apps/hwdata/hwdata-0.383.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index cecb80b35ddb..4dfbde215895 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,13 +9,15 @@ AUX iproute2-6.6.0-revert-CONF_USR_DIR.patch 1325 BLAKE2B 4301d995f758167719699c
 AUX iproute2-6.8.0-configure-nomagic-nolibbsd.patch 7010 BLAKE2B 4aab31c6da283789a6d7aca1b2dddeb828983d8bd4d929a05f5678dc1e4ca67e6e60be173c0968b5aeb3c8b40a4a1d4b307df02171e7adb296d508bb758f8e3f SHA512 0aa9cd6963cbd400f8284299cbeba7d36fe9f4cc775ebc114caf3f7e9479296776bf62415e49cbf821dc3a1c6f6d161fa23e973c44620c3f2a7077de750e9cda
 AUX iproute2-6.8.0-disable-libbsd-fallback.patch 777 BLAKE2B 099a8a59ff6fe385e0bc3e33b94e20ea3319af70b54e45eaad870d8bc84a9cc59057a3d9e51fb566891128a051244e54365c5fb0287d6db859bfd4596dd0ce86 SHA512 c577f536781e1b37f40ddc691697d4875614d392b28f3cd5c53bd27b3a66cfeab39b9e69140274d8713d948cbaccf62fad1845c97500931ec67de51154e59640
 AUX iproute2-6.9.0-mtu.patch 1135 BLAKE2B 503eb3ece9ef5b5a7918a0e26f7b1d57ed6889143e440d97ad7a56305d7a36e148b68e1f9f5de0c13656336ca9a675902aacb42e9866f053b2a68f5ae8c1bd80 SHA512 6b8fec963825ed8e9a51d559a87aa2ae0df53f8c288804547c2e8a9425a2c41a6c0524ee491f1600d011d9175aff3fcdaaec20a18f81e225cab7472f625f4b07
+DIST iproute2-6.10.0.tar.xz 920812 BLAKE2B 66332ea333ab2cdc4a2c71000fa2d06fd87cfdf5237dae458aff60ce606155302eb9d0ffaf87107255ab04c02f2b773dc040abb08bb89afb53091396dfc8a3ad SHA512 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41
 DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f SHA512 21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
 DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f SHA512 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
 DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6 SHA512 1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325
+EBUILD iproute2-6.10.0.ebuild 5908 BLAKE2B 6c8b25e7d0ab83b5d3f4f734d244101727f85601f803edd8e6f0fe6287ce7afff851ff50304e6e47e9e8a2c4f0f302b2a5de8144dbc3cf890aec5cbb869333f0 SHA512 1335da63ac9341db20a010e4a84bb33ecce9ab4d6e3840d16985f707b79fb39763bec29be157d75069e2c2dc8cb73335dbb86c94ad868d5de3bee2a591b8c127
 EBUILD iproute2-6.6.0-r1.ebuild 6005 BLAKE2B 9fc5b0e58119278043b53d8a200170f2613065d838922119a03b47df5bdbf98bd167c68a1ee220a5b6ef18ab8a6595470dc515c1f5265d931a6a0f1aab928e9c SHA512 860fd63ceac311bc945fd0729f4b373a824eb7130893c1eb871d1d4138539896385e3380ffa600486d58844aeb08a17a57f2a8daf2672fe7cc0bbf20a1b40dca
 EBUILD iproute2-6.6.0-r3.ebuild 5970 BLAKE2B cd6a2a71c8991b42a23ee59ce356aceb6e2a6801ff48866558f973229cfe525d03ba3eb3f30e679d29dbfa0145b555b5b9ef525eae3b1469c0904fea78359d5d SHA512 2002fd7eca14a2b7dc80bbc7004e5f349229f26bfb097d94d82d9ae5c6f29637ce34e38491401f995a8ccdc0c37eda8f1a5fda91fb16dacef34e4d4da17a5d55
 EBUILD iproute2-6.6.0.ebuild 5912 BLAKE2B 8a2fbae9e828f4ba106489cba07a94f5ce7e287a4e2d8e38901c334e1daaa162d3d94a6ba14116049b9c245b0e76904cf5401c799c32202c7af33df25177d021 SHA512 95d267179aacb4666b0d14dce83ebd790f099d31546c30ec7e61b9dcfa1c7b946e24839d30f4a3a42a6191427b2e3963b5569cffd4256bc09353680a17d9f68d
 EBUILD iproute2-6.8.0-r2.ebuild 6010 BLAKE2B b25a20920e33183fced01a2af9ac98aa76f400f1a3213bbf90e995a0bae555909e6d74b10cc1a1a1566409f3780447d57b7578f2f0bf84b0ba047318be3e2e13 SHA512 26930567fd01feb648117675a52c6fadeb0f13afdfeed8fd4a177f0868ef33a082ce6f333e1f59db6a852330c1745936dd82a6fa8d815b8c956b0831ecc02ef7
 EBUILD iproute2-6.9.0.ebuild 5974 BLAKE2B 0d78cf38466338e0918d60a11edb627297d2363657aa7dba67667693a4560889e0edbb876f7ef5c6bab64aa921ea39b736f3fe2c677c072803b0b1533153507a SHA512 2e260795bffca6c49af09981ee3e4079271d16a13ff46886796ffe3264c79a2562bc2ecbe0cd159d3b1345091af43f24041d7c399147fde7dfbe020b46abe80e
-EBUILD iproute2-9999.ebuild 6105 BLAKE2B d2b239882f105b285305b77bff60e12759226b4ea629f2a84caaa9fc51a35c3be42a9ad46e0c4a7ee3c0a34cd824071c9587d06dccd02a0a5fa61802d24135be SHA512 e6a24e56f94d8d56526a89771f1763849d0eed86dc06aa3d484d78bcb7e3fd63e26a83f4c5c7854af49072df042656b94ed1c752a5cff294ea486034e4a9db72
+EBUILD iproute2-9999.ebuild 5974 BLAKE2B 0d78cf38466338e0918d60a11edb627297d2363657aa7dba67667693a4560889e0edbb876f7ef5c6bab64aa921ea39b736f3fe2c677c072803b0b1533153507a SHA512 2e260795bffca6c49af09981ee3e4079271d16a13ff46886796ffe3264c79a2562bc2ecbe0cd159d3b1345091af43f24041d7c399147fde7dfbe020b46abe80e
 MISC metadata.xml 887 BLAKE2B 28f816c12d798665f2e32e22ffd69dfda03e251bc6447a34e3ddbf0d5d00046c561b7f8282f73ed8609b3d9397da9bc2b1bf54d23bc82d5395af141e2448a3e3 SHA512 e5cafc242c2e4fe64df7456b3e001285933a680b674400ef53b2fc5f966f0c8551fc2ad7d07798d56eed365331ae01536d7b6d41fa5a710c1c2257900ce45d3e
diff --git a/sys-apps/iproute2/iproute2-6.10.0.ebuild b/sys-apps/iproute2/iproute2-6.10.0.ebuild
new file mode 100644
index 000000000000..3d0c9ec799da
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.10.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs flag-o-matic
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
+# Needs root
+RESTRICT="test"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl:= )
+	atm? ( net-dialup/linux-atm )
+	berkdb? ( sys-libs/db:= )
+	bpf? ( dev-libs/libbpf:= )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf:= )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	nfs? ( net-libs/libtirpc:= )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	app-alternatives/lex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
+	"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
+	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
+)
+
+src_prepare() {
+	default
+
+	# Fix version if necessary
+	local versionfile="include/version.h"
+	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+		einfo "Fixing version string"
+		sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+			${versionfile} || die
+	fi
+
+	# echo -n is not POSIX compliant
+	sed -i 's@echo -n@printf@' configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly. Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null || die
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
+	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
+		setns=y
+	else
+		setns=n
+	fi
+
+	echo 'int main(){return 0;}' > test.c || die
+	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
+		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
+	fi
+	popd >/dev/null || die
+
+	# build system does not pass CFLAGS to LDFLAGS, as is recommended by GCC upstream
+	# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
+	# https://bugs.gentoo.org/929233
+	append-ldflags ${CFLAGS}
+
+	# run "configure" script first which will create "config.mk"...
+	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+	edo ./configure --color=auto --libbpf_force $(usex bpf on off)
+
+	# Remove the definitions made by configure and allow them to be overridden
+	# by USE flags below.
+	# We have to do the cheesy only-sed-if-disabled because otherwise
+	# the *_FLAGS etc stuff found by configure will be used but result
+	# in a broken build.
+	if ! use berkdb ; then
+		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
+	fi
+
+	if ! use caps ; then
+		sed -i -e '/HAVE_CAP/d' config.mk || die
+	fi
+
+	if use minimal ; then
+		sed -i -e '/HAVE_MNL/d' config.mk || die
+	fi
+
+	if ! use elf ; then
+		sed -i -e '/HAVE_ELF/d' config.mk || die
+	fi
+
+	if ! use nfs ; then
+		sed -i -e '/HAVE_RPC/d' config.mk || die
+	fi
+
+	if ! use selinux ; then
+		sed -i -e '/HAVE_SELINUX/d' config.mk || die
+	fi
+
+	# ...Now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	# Keep in sync with ifs above, or refactor to be unified.
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers, bug #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_RPC      := $(usex nfs y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, bug #144265, bug #293709
+	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1 NETNS_RUN_DIR=/run/netns
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die # bug #330115
+	mv "${ED}"/{s,}bin/ss || die # bug #547264
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+
+	# Collides with net-analyzer/ifstat
+	# https://bugs.gentoo.org/868321
+	mv "${ED}"/sbin/ifstat{,-iproute2} || die
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug #47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	elif [[ -d "${ED}"/var/lib/arpd ]]; then
+		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index bfc78c186a70..94334695f4ff 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
 # Needs root
 RESTRICT="test"
 
@@ -48,10 +48,10 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
+	"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
 	"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
-	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
+	"${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 & #932617
 )
 
 src_prepare() {
@@ -192,6 +192,7 @@ src_install() {
 
 	dodir /bin
 	mv "${ED}"/{s,}bin/ip || die # bug #330115
+	mv "${ED}"/{s,}bin/ss || die # bug #547264
 
 	dolib.a lib/libnetlink.a
 	insinto /usr/include
@@ -201,13 +202,6 @@ src_install() {
 	# https://bugs.gentoo.org/868321
 	mv "${ED}"/sbin/ifstat{,-iproute2} || die
 
-	if use split-usr ; then
-		# Can remove compatibility symlink in a year: 2023-05-28.
-		# bug #547264
-		mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-		dosym -r /bin/ss /sbin/ss
-	fi
-
 	if use berkdb ; then
 		keepdir /var/lib/arpd
 		# bug #47482, arpd doesn't need to be in /sbin
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index e582ed9f8936..137744f86087 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,5 +5,5 @@ DIST pciutils-3.12.0.tar.gz 668358 BLAKE2B 6d57b0654a26e959d2a953a102fd616ba0a0a
 DIST pciutils-3.13.0.tar.gz 672999 BLAKE2B d779ca0fd8c96a54bf81f6234d6a38eae2882d39dd1a52a508246bc46b5f4ac9318bbca20266378ec3917e72fe6ec30c47b1b5e9df4e86d3f59cbe860e2ac70e SHA512 73f99b5c2251676368738e0dc9d82529f3516966f1658a96149768b9775a0e177d630512dc7ea33087a7fcb960a3498f0c4c1a9f7233ec1cf242b9ab087fa0d1
 EBUILD pciutils-3.10.0.ebuild 4905 BLAKE2B fc998bbc04dd08d1707890bafc62deaa9a282640a7ca946b37e24841b2bf00205d4ee18678786a3616293fa211a1ada48da41bd564e0d6716cd5c7ab2edf2fe0 SHA512 5435ab9fef31732c00f278c4ba19501f99cb13aa2ab84974bef5571798121747c2a9cf68c1d20b4d4a0ea2db4f93b842f7149ac46ab3ed615a5793209c97f297
 EBUILD pciutils-3.12.0.ebuild 4905 BLAKE2B cad6c1d863f7abd2bb357da7e4ff70aae73793dbd7cebad082ff15c098b77a74ad8cd323471e76ced701fe572f3114f3d37849f98c7e2897d462ceedf0f1e437 SHA512 9c7e8c45acaa4d03c86092e79b369c0d94f818c68a975c46db017246e9161cc89f94c461390ab0b61abdbd4334cc0dc16b40683cb68e197483cc141a825bacd1
-EBUILD pciutils-3.13.0.ebuild 4913 BLAKE2B 301520e077afbd9406e5f330b1a3013d8e89cacaa8f72757da44935db7c9b532cc732e4131366db4b79972df85ecc5df0219c7a46f7e0f39796baa99499421e4 SHA512 8e1d393c8c32b3dde40fd0f80f1a99284cc24c8f4ed1a80c34d7f0fff830947ee7e04328d1ad47bbf9ded42f57bd4d831d846af0d27c23c2821ba10b0d6c4cbe
+EBUILD pciutils-3.13.0.ebuild 4906 BLAKE2B 7f34d5ff16c89d7fe6112c252b0db3d6afa919d037d82709ef8fc1e4decd17e1c813653baa873dc3d195bf543ae2198ccf8229b5c3143c7c846cda26ae00682e SHA512 ea32c95dbffc4fe0d5a0e04a482355b5e59ba78f2c0ee3a190e99b7d384fed6673433b6b7cd05bbba370b54ada69d3fd0051b8bd924da3a781fa1669ce96777a
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.13.0.ebuild b/sys-apps/pciutils/pciutils-3.13.0.ebuild
index dd3c7a05627e..57b9f333b119 100644
--- a/sys-apps/pciutils/pciutils-3.13.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 REQUIRED_USE="static-libs? ( !udev )"
 
diff --git a/sys-apps/syd/Manifest b/sys-apps/syd/Manifest
index 09220b8d41a3..a88f19fdf800 100644
--- a/sys-apps/syd/Manifest
+++ b/sys-apps/syd/Manifest
@@ -13,6 +13,7 @@ DIST anstyle-query-1.1.0.crate 9832 BLAKE2B de106e289c874bca806214e275647415bdd0
 DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST argv-0.1.11.crate 8683 BLAKE2B 44344e0f3678b159b64d06287d58508479831dc0bd7b044a1ccaebfffdd9023508da5d86f3e6d8af8579cf5351f6c8963581af978ca46bb0b87a37c1802e67d8 SHA512 011e8d5333b305387d7667bbcd4d3e694fb73d16ba4c51a10969d5dae7a7a4286f8583c160949fc2724c56c7d47c618813d0dd55c42665c8c2d1cccfcaf414a3
+DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -21,7 +22,6 @@ DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea519
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST caps-0.5.5.crate 17575 BLAKE2B 77d788f936eb36c2f4776ee719cdc138dac4b840ce632190f34ed26e705175209f9905c71d96d54f0c69f4c6d25f0a203a4d490f2034c330480bedd5ffab149e SHA512 866312aa0f3847dc2779570d1466aaae00945d78a2f5f3b05a833c67a2abd04c0380715f61dce79814845e4e57321adde67fea97f99dca56a970c6e6f80aa029
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
-DIST cc-1.1.4.crate 81127 BLAKE2B fef48f4305d9ff973408aaa73dbe17c2420a3fcf1f46eb1865157ad91b96797bca3b258f9c8c473b6306bd0a148fbd8fc04b2952334b0985f880b890e80d72f3 SHA512 f4140aa80d8263dec91f602b8d08adf95cdcb239c9dc6085dabf3a4a47ca2b0ac7d370aebc882593c0d548bea5d082dfed8eeed113e5e89a08228330b57fb6ab
 DIST cc-1.1.5.crate 81493 BLAKE2B 3edd99cd9d05b090a57cf62f1236c02d0731baa8b2bdcd6c14f21e68323cdf4a65439f81701c1b1960b70919f1a342f1ad8e0bc830bfd187eedbbf443a5df77b SHA512 2ee646d3808bd06b3bba5788d0f93762009875e1f5c25dad67b0f8dafcb512be3ff105bf9d2e92a2507a2fd942b8d774004971c1f203ad40894336ffb89ceebd
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
@@ -86,6 +86,7 @@ DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b9
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
+DIST hex-conservative-0.2.1.crate 25440 BLAKE2B 1cdcd4a7074f4dd4db8512023552b526b51ceef8f506b581159b9c5b8a47d5c8c07d63369da10a2987f8a84f2a74c4521b2b497f5bf125b76395a86d60475119 SHA512 a1f15f80d2775509c8e6b00b58795eaab080604bf913a28d0a93f9dcd4e0dd16bbde7df04307cc472ed017172ad2561eac27fd51bd38d47978c954041a0bafc8
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
@@ -157,7 +158,6 @@ DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b40
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
 DIST rand_xorshift-0.3.0.crate 9121 BLAKE2B 56c29e159c0beb9c751429130e84e4666f9031b6f70e180544f9cc8f8e85d98676b861b588dbda46f2cdbd254fb908c02c6ba640d53422e6bfa1ae4e48ca5a33 SHA512 256e410e5bc08c56496c53c3d53936f3b1cfed41458b0ee8879d7aa8b95375055746ca49e29000ef847b37f01e9237f569cd000c4b281f6c78ddfc78ce439a49
-DIST redox_syscall-0.5.2.crate 23957 BLAKE2B 6261df25a59af5119a21d31fc3b6a8800bb1783cf2fd63a5524d48d0b187f5f2e65ebbdec00d9282adf110ba8f307d4ceb154bf029a0c6a26e8a887fc722b2d7 SHA512 b7e39a08e220153370449cec7b058c2dbc4916ff7be01b34658e1793035323ecc28f40712194cb9bfc9b863e4bb316e58662721eb0e54f68f09438bd880ea032
 DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
@@ -193,8 +193,8 @@ DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST strum-0.26.3.crate 7237 BLAKE2B bdc348c718c39609c00b9fa7d47b7090b1467022b7a8a28cc7c8a72a0aef20569c6ab22a8a8d26c2d9272f18d000e4ce94858a6647194f0a7b86d812d52b05a9 SHA512 62f116d5bbc6167a6ac68b049f8045bc660901f1ce1252f8bdcd91cb28bef821aad8098905369db6c2fe74c134a5d549e55ddd28e383d7d78f7175258924b268
 DIST strum_macros-0.26.4.crate 27531 BLAKE2B 7f7d57c957a1591054288fcae6590a5e669fba1b47d8f1a52371ce60fd84f91fdb430e48cc7edbb5fc72914be5ce12af29758b653680da3f4177339b31206750 SHA512 77a17ce47d5e8fe8a89cb6aa6c3ca5d5c2625aea0f93456f05a9994238cd3b08b3f7c6a45e9b3db21bca8fb5759f505f15cc111ac84acbbb34d59cdae8307b0b
-DIST syd-3.23.10.tar.gz 815048 BLAKE2B 35f892bd31562c8fbd1862e92dc1168e752dc5697902f764bb63eb71fbd6db890f0c5fa387dfde3ff7a1362e2a0319bdd30efcee165145ab761668ceddf3ebce SHA512 1a9587b7486784d21832f9b512f3d31460df0428de7c64b56049befe163267d758673df6ed68577b97966742bcad080221f49fe85a1a33f7fbecb5495cac2544
 DIST syd-3.23.12.tar.gz 816491 BLAKE2B ec20fe87a79600be9a32f47e43fc46e5c73043e873d5290165e60aa769829090899d5d67bcf5edcecfad4256d81c437a8bd2bc2df3ee65c5faed0a89c320ad6a SHA512 828856652553c8898c5e7022bc09616bb5328dc64d0068d82d02cc5da70abd4f6ae8bde867ba7d522e8e5d734ac8db3c7b61d865946e8f112538462a9341c5ae
+DIST syd-3.23.14.tar.gz 819972 BLAKE2B 3e80ef22c4c39250db29654c84692600af319c4b41cd5b054bfc5a42049e57d6e01f34d653bc6099c378c5690cccdca7b679f04ddfa89de86fd4e00f9988e5dd SHA512 5916d1ac5a43ef6503b9b59189c7ce63a068dbb2069577abcb7c8233d2eced2cf1e4eb180bb08e91ecd5024ee6e6072a71e281c05cb698ba0a5fb31ccd0baf75
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.71.crate 266398 BLAKE2B 78760c9965b59e14ab5d97e83c4dabdba99cd1933b66350c7d5c5f9e55f34fe68207597b51aeb023b211a065d986889655ab701b94347397ca6856a4fcbcdc85 SHA512 cf6264bc148ec550d943d7d146c7360a7d753e37ef553e6d0c6dc265bf516084530a5617f6826069275cc6f71d9f820014f7d92f04356ae964df8b79edaf7bbe
 DIST tabwriter-1.4.0.crate 9951 BLAKE2B 8833c5a7f37749268187e60d95b07262e77c461ab868cd934e58031703dc0c9ea83b8757e681747900dc07eb5c8e41e589d9c37568b66ca25c95f0fbf07c8a8c SHA512 066846124e3beee816f76ed3a59fb224593537ce5807aa472fbcd0cb98f638dba6801d171b6d1026e56b6eaae6f2e873d64c190c97bbd8d6ffeffc82f3b4d52f
@@ -251,6 +251,6 @@ DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cac
 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
 DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
-EBUILD syd-3.23.10.ebuild 6203 BLAKE2B 6c7c6a3fc2f106f1b87efacfd370b7a49eb21dd1841e4fd573da29b7fc79e51d77f86f94636064a1ad759177c30d48e858b307e839f32846c3e7e4acd4baf898 SHA512 8b5bb9fae83394a7e10f7d16f5670403bbf65c4689f19b293991200699a7ece7de6af56cdb7bf1b72d44bffbc5961e2c505eaf21f4b5a1faacb1b3c8f19e3cac
 EBUILD syd-3.23.12.ebuild 6203 BLAKE2B 0b7f84f31ec717418d9ae3215d541cb40c6227c8f05208fac741a50bc1f2b4a3f1429fa292ebd598831166e372534696de46c49a046e733d531883a09354d038 SHA512 538b1600c806dd7ac9d7a7764981beb19a1d622145201afe97d1464a0acb3e6e8e531db3d67b0adbb8f8b4bdb69d19e4d663fa76d8ecf03d6f9036c32713a991
+EBUILD syd-3.23.14.ebuild 6243 BLAKE2B 9671028404b58620c75ec9387bfa19b6a9a8925f856b2b2b559fd742a44595fc5cb98b51db87274f48e3954f5f5c97aba04aeec3fc83b644d16cdd5135a16ad8 SHA512 aaef7461cfba9aaa9de9d037f549e51c0b72767d294d0fb0d44acc7b5ad14ac04534103da10a1f10b44148ff3eb64a0050e056524ba7851dec3c501989d7eba0
 MISC metadata.xml 254 BLAKE2B 0e6d918ec0aa523a1d7ff2da1c9081d8257c2a83396bc5c7033412341b400364ee2d9b155d9d1df05da92b11f6a940dcda2adae7c158e479d082ce4a0583971b SHA512 24b045489397ba3bcd9dc48dbbc8a26189c1220053c04f09035dd735d2a3fb2ad6a55791f943f4502fee20c633c4a30983b76093f31ce752994f424fbb3cd21b
diff --git a/sys-apps/syd/syd-3.23.10.ebuild b/sys-apps/syd/syd-3.23.14.ebuild
index 0c26bb384ad3..202c39ee202b 100644
--- a/sys-apps/syd/syd-3.23.10.ebuild
+++ b/sys-apps/syd/syd-3.23.14.ebuild
@@ -21,6 +21,7 @@ CRATES="
 	anstyle@1.0.7
 	anyhow@1.0.86
 	argv@0.1.11
+	arrayvec@0.7.4
 	autocfg@1.3.0
 	backtrace@0.3.73
 	bitflags@1.3.2
@@ -29,7 +30,7 @@ CRATES="
 	bumpalo@3.16.0
 	caps@0.5.5
 	cast@0.3.0
-	cc@1.1.4
+	cc@1.1.5
 	cfg-if@1.0.0
 	cfg_aliases@0.2.1
 	chrono@0.4.38
@@ -92,6 +93,7 @@ CRATES="
 	hashbrown@0.14.5
 	heck@0.5.0
 	hermit-abi@0.3.9
+	hex-conservative@0.2.1
 	hex@0.4.3
 	home@0.5.9
 	iana-time-zone-haiku@0.1.2
@@ -164,7 +166,7 @@ CRATES="
 	rand_chacha@0.3.1
 	rand_core@0.6.4
 	rand_xorshift@0.3.0
-	redox_syscall@0.5.2
+	redox_syscall@0.5.3
 	redox_users@0.4.5
 	regex-automata@0.4.7
 	regex-syntax@0.8.4
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3cd3be782037..9fba5603bc55 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -21,8 +21,8 @@ DIST util-linux-2.40.2.tar.sign 833 BLAKE2B 10aae23d25c1364bac0034d6862df5738c7a
 DIST util-linux-2.40.2.tar.xz 8854820 BLAKE2B 8306d651f27db6665e91a937c9f1970938fec5b069636fea3c2688afddebd1a3424f0b0802a034eab049cf7692dd435cf93e82aa5f4a40cc8064d60b4ca59535 SHA512 ffe20b915a518a150401d429b0338bc7022190e4ca0ef91a6d9eea345db8c1e11ad01784163b8fcf978506f3f5cad473f29d5d4ef93a4c66a5ae0ebd9fb0c8f2
 EBUILD util-linux-2.39.3-r2.ebuild 10872 BLAKE2B c44068bc288acf9c77d4c697cc8b7848e3c85ab0d548672283cc76bf34eae1bf80aa39cc9afaa7105e5ad9bf0ed0494ddbebe062e7dba6aa9ec0616ee77a7eb2 SHA512 b8cc2a20122f1c094cfbd4fb3652672cf7def1d6d9b38971f2f52511893f9de1e7774ed06c03a17c4b19d58cc564a1291833974ffe0c43778d077165f6f6f538
 EBUILD util-linux-2.39.3-r7.ebuild 11231 BLAKE2B c8734054faf407fd1d7b0f077d3f84a7c59cb7698e0b6c810f164d60d186f7efbefc117cbb3bffa701a0d83f8d1d1a42ce2a081031bed9179c5bc43cd9ed9038 SHA512 94d84e7221d67e9a061c34f7cd5eff3da45b4763b813a7071f0d9be93528da38f1d378ef56a85e19948881e8540528d2cfdab7e4bfd1858f0fa09a3f7ca857b8
-EBUILD util-linux-2.39.4-r1.ebuild 11171 BLAKE2B 40e06d4c563271a3e891270007d0a21e1743eab09e5385a21f6dcca02d2c6bf3a7c0620ff569b81a3e9fc48c9ee125f16a10d7baf71cf9ce3700cfc653905f59 SHA512 f0cbc998a7d908960bc0b9f767998280c09c02417d206ed833fb6ebf6bf3265212337ae7b5e6418221f50e14601b55df4a3d9b8cb0ffc02536f4223ccda0d14f
-EBUILD util-linux-2.40.1-r3.ebuild 11242 BLAKE2B 7719aedf804e87e8b78a8d3eadf4ec0aeca94b4a213b34a17059003922f8efa94e0980556159c6c7e119606c1a44c092252473dbdcc3bb891b1201952f5740a5 SHA512 3d081701737757531746ed1528838dba624baf237816a5fa439dd371020e1b301036b42e534da43f05525c4de146f71ae35176a2a6465cec22b229d58ab14f98
+EBUILD util-linux-2.39.4-r1.ebuild 11167 BLAKE2B ff8220e7e303bef38128cac9c9d44536719ca87813c6cab54ba8846bcbd559bf55f3b725c5e910111298458974cf577493ca0225ad5c46c6e75b06cae725e0c9 SHA512 0e9e2b82d57f13b96c87a7d634f80b62f7a2ad7dcee7f5406317d1f271eaaa164d080cdcc949089c426102e1a03077f89704f9fe154661506181deb8dfb99baf
+EBUILD util-linux-2.40.1-r3.ebuild 11200 BLAKE2B a37bf02f4d65a710247c4734ee5dea5e22f9dce1455733d1de2cabb6bfd32a5d2470dcd624f043ecd9aecc8cf23724874eaa0819964f2784a2f1b98260b9691b SHA512 b6e87a2090e4dab1c4969ce9b303118d6265a4bbc9b3127d6f32e4fa5667212fc8ac351dc8c7c69bc2b3285ad41bb395feedf97ac8d5d0e2ac0f6debb7cffd08
 EBUILD util-linux-2.40.2.ebuild 11851 BLAKE2B 8fc9679a373037aa1f1a2feb69757e6a35aba6f4d40f7c04206abe1a0d2e06293ccbfc2686aee639a1b0f031a113699215cb90b46669a887783e78c5399449b4 SHA512 6f2f04b9ce98f6469b2c7d07cab3e062861b105925153bec47df3132d8faa647c727b9cc731618e65a3c3f532b50fd11961c9e11feb0dc4c0a3c237a4eb76c28
 EBUILD util-linux-9999.ebuild 11851 BLAKE2B 8fc9679a373037aa1f1a2feb69757e6a35aba6f4d40f7c04206abe1a0d2e06293ccbfc2686aee639a1b0f031a113699215cb90b46669a887783e78c5399449b4 SHA512 6f2f04b9ce98f6469b2c7d07cab3e062861b105925153bec47df3132d8faa647c727b9cc731618e65a3c3f532b50fd11961c9e11feb0dc4c0a3c237a4eb76c28
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild
index e61811263ec4..5b7975b7b36a 100644
--- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild
@@ -22,7 +22,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+		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="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
index 1205062fedfc..857fb9418af0 100644
--- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
@@ -110,10 +110,10 @@ pkg_pretend() {
 }
 
 src_unpack() {
-        if [[ ${PV} == 9999 ]] ; then
-                git-r3_src_unpack
-                return
-        fi
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
 
 	# Upstream sign the decompressed .tar
 	if use verify-sig; then