gentoo auto-resync : 13:04:2024 - 12:04:19

18 files changed, 516 insertions, 21 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4550c8886575..185d43887b13 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index dc288e61ea0f..5dfc0730c710 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -2,5 +2,5 @@ AUX acl-2.3.1-musl-1.2.4-lfs64-fix.patch 1028 BLAKE2B 3ce13de7ee1f58b7fd1c39ca9b
 DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
 DIST acl-2.3.2.tar.xz 371680 BLAKE2B 9f2abfddcd403df2c716c05f02a1b52453613d10948dc58a65b9ef41b44e37db6de99fb22dcfc4f6f0fb5d0319c939da61bd4e0fba2cdb5643e8087ecd34eeac SHA512 c2d061dbfd28c00cecbc1ae614d67f3138202bf4d39b383f2df4c6a8b10b830f33acec620fb211f268478737dde4037d338a5823af445253cb088c48a135099b
 EBUILD acl-2.3.1-r2.ebuild 1951 BLAKE2B af49c5dff0ec7e53fdc1f8671eab74fe88184b3a22e62beef1e4a9db1ffe8268ccffca52f9e2f4981862d21da0553c4dece14422bd4201d2df8f37a4c0ab416a SHA512 fff12fef1da544137734a8c524b0f812cb7c353b94ce5e82f35bb266c65300923d5c7dd17f95c30606f673cd23500891246c5b2595ac7589e3fe76564315b456
-EBUILD acl-2.3.2-r1.ebuild 1271 BLAKE2B df0d23aebb6b264f5f33d8a1df3513af77d8241caa95d6f0f728e77e8e25c5f03cb23901700c0b2ee881bfa7db8b560e2b5821dc54cd37f9dea833f6450e6ad8 SHA512 1c24060bd4badceccab57ac86b9159fe9e3e2f912ef949846b1bca74c38e36cfe12df32b2c6ac3d9ba1f45bbe916f34662b273bdcbb8298f3dd556d1172ce62c
+EBUILD acl-2.3.2-r1.ebuild 1270 BLAKE2B 10db5e113d1fca3af8971837e3b9bea51b368046204717372ddac58f09ea11b0bbae23eaad63c3bd44780fbfa3d1a248686c34350da96bf90d1a72e7d532116d SHA512 e61f4b256921f1a95f0644f9696070239ea6fd46214e6f6d21e4b0c5db768a3b1a3b0418e7db1c6431376231f427142a0fc9649698d02323b43a3d174c127c14
 MISC metadata.xml 345 BLAKE2B b168c40ceb66cfacdb1fbe9b5031705f5c3249afeb872163663564dac2ea85e6fa857804831a80b4c44323223b417a24a156d27f8231396d5b090e44a0dc9288 SHA512 e0cbeec10fb47ace3d0fd3c1ba8a5a0bba02345a3e0df30aa82777507fb6ab75f2705b06e7635a00406d2b0839bc41d0a9fafcd8926844e1d9877b8cf2ed6f78
diff --git a/sys-apps/acl/acl-2.3.2-r1.ebuild b/sys-apps/acl/acl-2.3.2-r1.ebuild
index 8eb01adfb453..d265f5bd1bbe 100644
--- a/sys-apps/acl/acl-2.3.2-r1.ebuild
+++ b/sys-apps/acl/acl-2.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+ 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="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 49a605d03917..b158327f5ccd 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,5 +1,5 @@
 DIST ethtool-6.6.tar.xz 352476 BLAKE2B dfbc5f9a6ac63210d1ae305c2458cc44d38d44fcc272c9b0397a13a93e0aa0a09e3750e330a27dcf4dce796c6bd302c4d4c1fd91faab824a81949c31f1ed3504 SHA512 1e7eae3abe59e6af4bce0ebedd0a7ea84d1b0adc7693a0f03021c4096677096a022fdae521ac02413f9db46ee232b89dd2015a116845aa6ca7686fdda50a5b21
 DIST ethtool-6.7.tar.xz 352772 BLAKE2B 94a6fd8d29ff479eb894fe56bf991f522fff9af5a94c176d06be2819fe2520125cb48dbded229df1a9f5a0308aeaec503c55caf5d248eef87640c7f90f1132ec SHA512 07d13f9a8f980dab73c07e7c68179cfee272f53103c6dfbce1814b768e3313dc671a0cbefc63d4d53a616876bc1f96db8db2444617e4d58d741fae3acf0be524
 EBUILD ethtool-6.6.ebuild 597 BLAKE2B 8b3815d7ae1c0299034324a1ed58f0279796941284df7d71a4c6238a30ebbe997c4250d538e4f7fcfb0e4e4e6ee2ae8bd3ec5d99526ec44bdc5b885ebd3e45b3 SHA512 3d4d11b7a5a392618b0214485baa852bad92dafba66b8f44c9abfd25052019b1d11840a842283344a8f83ae6806d83c0e8b33fdfdb0fb8418b0211528e1ba6dc
-EBUILD ethtool-6.7.ebuild 598 BLAKE2B fcaa2dfd58b09b17fdd3fec6a377644ab0d7d66cd8e01c0399a99307680981229ac18315f4a670032d0dfcd4a51620c03e47aaa3e9d36939a73e04ac79ed5219 SHA512 83330ec32672f285d34a1328f78b7f39b1fed0eaf8486f17f8e5de96ecdc2abf4b09bc29d5d6712c28b192c528ec47c5627a422ac36d0cca28e539a7c099540c
+EBUILD ethtool-6.7.ebuild 597 BLAKE2B 8b3815d7ae1c0299034324a1ed58f0279796941284df7d71a4c6238a30ebbe997c4250d538e4f7fcfb0e4e4e6ee2ae8bd3ec5d99526ec44bdc5b885ebd3e45b3 SHA512 3d4d11b7a5a392618b0214485baa852bad92dafba66b8f44c9abfd25052019b1d11840a842283344a8f83ae6806d83c0e8b33fdfdb0fb8418b0211528e1ba6dc
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-6.7.ebuild b/sys-apps/ethtool/ethtool-6.7.ebuild
index 68d44d2fc64b..b84034311ce8 100644
--- a/sys-apps/ethtool/ethtool-6.7.ebuild
+++ b/sys-apps/ethtool/ethtool-6.7.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/file/Manifest b/sys-apps/file/Manifest
index adafe848db24..b2d63555dd85 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -6,6 +6,6 @@ AUX file-5.45-weak-magic-shell.patch 1166 BLAKE2B 715d220e472a6ea1c6374f8b0f7896
 DIST file-5.45.tar.gz 1246503 BLAKE2B 30fc77c091e6624f2e9a950f4c6fe69ea6aa46d4a8ad9f20d49320a3675617c5bfbc9ff1ebba5eeb2cf4435c38d71b47b8beeb5146c9f55fe3bac11fe65e89bd SHA512 12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a
 DIST file-5.45.tar.gz.asc 163 BLAKE2B 1405080c63412e9c66bfe06086ecee28b276b77cc2ddacb20cfd370c539a0d983812fd29dcf7a33bad69d6490cd439ef8d1219bfaf3928fb835a38da85013af3 SHA512 56bf131b2f35e896788be19b4d8cd1c7ec942c794fb584d5e589375d22fbccebdd04c03e779fafc0c10840586dc41e64251b3de1767ae9ab95f5d3300f9af254
 EBUILD file-5.45-r3.ebuild 4154 BLAKE2B 8029a67867a813b16eb13accbbaafe02cf3234ba010e1071b5e3f00cde262f76f1ee6e4d857f10ec4467d926d8bc7e3ae2d1cee39a57537ca9121280dac54275 SHA512 b2e1e21b7a9d8819b85b1711a84034fc767e5e17a0f16c626b3e43338c1200bcda3017b9ecf3077a84db50a82eacf9aac997b8e2c1ded9461c42b45124642c9c
-EBUILD file-5.45-r4.ebuild 4102 BLAKE2B e88f2c75dd4990c95fafe4b4e52a641ede07c786c9982d5a08db452d4b39d99c89b5fcda651c1e4c6ba0bb7cf07bd0000319cd25245986e43ca7505091e4949f SHA512 ef2e9d9333b18a2182be192e498ef5dbf7bd54967db11aa81ed979910d19039270abf95ea338367a8fb5c5f2d7dad0525aa197ad13549153ee80de6fa23e77f9
+EBUILD file-5.45-r4.ebuild 4101 BLAKE2B 3bd216823752a8ef80a64e6e5e8912f0b618a3f79185284ca505d40f52b7b4f8f59437419a2a3c6e673359a81aae4d3817e48d53d3d9ab5ca04dd2198e373337 SHA512 2ece7f436f94306ff429b34a062f720d45a1415453244dd11d120906a0b582849f1e1cc4e37de2b321037f145a4d843dbe14147f0c4d5d4d383949f0372d0d99
 EBUILD file-9999.ebuild 3900 BLAKE2B 2e69d6d3f97891ae509d7efd1fad5fbf9162316bb9a4c415db19904d6432971d513df284bab4a28509dfa02b11ed2f2e2392e23ac58bf0290b595d7ef02e6d77 SHA512 81cc6b152667c0f72773b28f4692892c7fb414bc045bf2e8f9f5491cbd4d801b6fe96ef4b0f307bd9d0bf1d48d485e27ae74f7e6a25b91686166c60219d268c1
 MISC metadata.xml 439 BLAKE2B d937d412b733516f49ca24a5de5238688ba56c06872cec060608139cb551f78e165e05990bcf6ea5bb1e98d27eb2650f5a972a4cded85eb67dbe9218d5d705b8 SHA512 20ff0c1b94dae95c3b277cfcc10da2b6ff31582cfe8f4e2ae60a74ec45db2a854eef40950f354465a45563ee6333f327566565e40cb16249d191bde585c5b1f2
diff --git a/sys-apps/file/file-5.45-r4.ebuild b/sys-apps/file/file-5.45-r4.ebuild
index 4947c83e8990..f822d863338e 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.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 ~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"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/highway/Manifest b/sys-apps/highway/Manifest
index 18bf839f9940..16bbb6dab294 100644
--- a/sys-apps/highway/Manifest
+++ b/sys-apps/highway/Manifest
@@ -1,3 +1,3 @@
 DIST highway-1.1.0.tar.gz 319516 BLAKE2B 40df25eb139433f759ca98724d18bea8c324138fd26c24dce6899c899bd86d5cd86d1a16cd5631c0986d76f324d53e9b4e96ebf3582557f1e6699a9faa448a3a SHA512 c30c90f5b601a775e64a684037d668acc6c1a8b6e64f7aa1204c184978c49079a3cd07683ebeeab674a9b64932223da0c067fdb184b5918bf88eca7e113c05fd
-EBUILD highway-1.1.0.ebuild 409 BLAKE2B 881f6cc31eb483efe17427766dbabae3fd518ad7e145d410ef47e6bd568ec76467fc46fc7ce8b9e1fff9c1d6ec00edfa4170c4d8e7ef3cb542a272491de3529b SHA512 6be557e488304d910d914315267d1305418aa5c9b84e09514eec0136daae89717b04ba84332d8d286d204baa021112cf50de8289b6dd0d08b253e2c056edaf75
+EBUILD highway-1.1.0-r1.ebuild 401 BLAKE2B 8030af2866d75e21f35c3c9e5ea7b20e5a8493d51ed2a511ac9f48b308d47e1657b3d5e45bf4426017299becd4b28e81c39c6bdd13d62fadc736c44e8d50b4f4 SHA512 b26f428f8cc157da00fd63ac67cb2c20c3edf851350ba545b37b3dc61155a60f82f0693cb56919a093e749178b300a4c1dd42a5776889c7911a9d5110683b55d
 MISC metadata.xml 587 BLAKE2B e54e9ffbebfecde6eb2f5141a9db8ebbda5f07a33d7b6ecac30ece5005954e6002523681b24b4134733f90d4adb9bcbe8fcfa4ee1cdeef5bec3150b15e17a788 SHA512 87d25ceb62d0750c0d06acd010368f7cfe82800941c397affb6bc6c22d405c964acb556844ae18e18c5ea55d3a0542b8f26bdcd9d22b5e3870bf8438a04c3db9
diff --git a/sys-apps/highway/highway-1.1.0.ebuild b/sys-apps/highway/highway-1.1.0-r1.ebuild
index 4528ce2862bd..a0aaaa41a09b 100644
--- a/sys-apps/highway/highway-1.1.0.ebuild
+++ b/sys-apps/highway/highway-1.1.0-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="High performance source code search tool"
 HOMEPAGE="https://github.com/tkengo/highway"
 SRC_URI="https://github.com/tkengo/highway/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE=""
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 2202dd3356e0..77d757a1d2aa 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -5,9 +5,13 @@ AUX iproute2-6.5.0-mtu.patch 1719 BLAKE2B ef2dc2f3ce23432464b778584c53b3a204a05e
 AUX iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch 754 BLAKE2B a7035177a9e8440b42543786e11b7f470469d63adb0454d683ea9563ab9b4e704c8e9c524d08369b9c87f63855ed5bcb983322ee9de1508752553166945c38e5 SHA512 4f3bc78450615ae8f9180caca2ba6c86d7954868273762aa488d347852d7d6807e5aee52cad5e4709a64aa257df448b9471e2c729dcd746a24ae8209bd2d9796
 AUX iproute2-6.6.0-makefile-use-usr-share-config.patch 1896 BLAKE2B a4fdb2cc8ca3cba86e00d57138f306bcb7465ac04fb7ba3750f0f3ac20c3774e247e743d706cefeb418591163eb4fa7a38c1548605e9699c34df129bcba5069c SHA512 d769ff1f01e6015b27cf151868180a9b3058b53cbc920bb580284d6edbc95821a5493020b667927da51b28cd178eeb35216f00451012a49e7508f406792b680a
 AUX iproute2-6.6.0-revert-CONF_USR_DIR.patch 1325 BLAKE2B 4301d995f758167719699cfd04692debff6b2b46dda442ff53cb9b913406c95e2df31e3f763dc22d5923e0eb387439feeac8d55751419c9f4553a89a476f9a80 SHA512 23f20035b0a0fe42695b560785820f31d005963ff4cad18f47b7a412836cd4327962244055b89b53794e41a92754fd3464a9ca1fd2cd767aad094a0c125a7d13
+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
 DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f SHA512 21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
+DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f SHA512 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
 EBUILD iproute2-6.6.0-r1.ebuild 5949 BLAKE2B f3709d671f62cfa6b79b307515c000833dc05cf9edd5cd6bf571e5a6daed199fa60fdfd627424402634a5faf98f29ad1da00d666a5cbbbb46fc345eab84745a4 SHA512 7a782790289d13760258a77e2c96fc6d934a0e2e3541232e734abf09ba79411416f6344595954316c229fe9b7728740ccc7d2fc1b090ca56a0ec6b4727f0173d
 EBUILD iproute2-6.6.0-r3.ebuild 5914 BLAKE2B b5b650ee92e921cdc0a9e15597fcaac1274dc15a01f6be7f661ff6f1ec485cba6c4fa57d37590ab0446a2af672b49872e472e2f702d107c9e6420fffb500e770 SHA512 fadd252646efd8831640b9b55cfcc8dc95db1687d244f2e2f677889503176a7f507e046cd097bb41d7a33bb2cd63f449a67af3ffa138535da6954c2b122b03c4
 EBUILD iproute2-6.6.0.ebuild 5856 BLAKE2B 730d2141e0a966ea7fa8c5b290bd673a8c03bdbc6fafdfed7a0c0427d97ffc454801aa8d50f8606c882f40f90ef160174fc57efe5e7a542b3c1d9a62eaf8ad31 SHA512 3b9574a49d3b267c0cd0efdcf50b2fed33beae6728f9372b6f8920f2a048a2062d85e14a0633c6532d23cfbd363638e5c1159a194734a5e0dac557494ecfaf27
-EBUILD iproute2-9999.ebuild 5721 BLAKE2B f8c60ae3940584a536436a27f06e969b729252b88a5fc505f9318097ceee3c5aae62a4b6c3f7e2ed123dbac26ef874446e693701d1bfcf056dbfcd9db4714ab3 SHA512 a298163336401e7399d7c5cd3eb0dd521ce86dde892e47e315c7fc492c8c63b2adb6d2d50f855cf407d9580d17e27b10f92786edc892a3740e41312930806677
+EBUILD iproute2-6.8.0-r2.ebuild 5962 BLAKE2B 1e1420baeaaaaa86a1fb59fd79d8fd08ff28687d4e72610555497888c333ad1bee0984ef0106ca4ebec69441e4a50e80c22676728b371fd5780a80a7254260a6 SHA512 318cf2dfca0f910f8e0f8c7efed9f389ad22ae5f3b5577abc68dd263348403efa3cb3ec801fa57793e51cc67956511a3ec040286ad65c6b6aed498799e69165c
+EBUILD iproute2-9999.ebuild 6105 BLAKE2B d2b239882f105b285305b77bff60e12759226b4ea629f2a84caaa9fc51a35c3be42a9ad46e0c4a7ee3c0a34cd824071c9587d06dccd02a0a5fa61802d24135be SHA512 e6a24e56f94d8d56526a89771f1763849d0eed86dc06aa3d484d78bcb7e3fd63e26a83f4c5c7854af49072df042656b94ed1c752a5cff294ea486034e4a9db72
 MISC metadata.xml 887 BLAKE2B 28f816c12d798665f2e32e22ffd69dfda03e251bc6447a34e3ddbf0d5d00046c561b7f8282f73ed8609b3d9397da9bc2b1bf54d23bc82d5395af141e2448a3e3 SHA512 e5cafc242c2e4fe64df7456b3e001285933a680b674400ef53b2fc5f966f0c8551fc2ad7d07798d56eed365331ae01536d7b6d41fa5a710c1c2257900ce45d3e
diff --git a/sys-apps/iproute2/files/iproute2-6.8.0-configure-nomagic-nolibbsd.patch b/sys-apps/iproute2/files/iproute2-6.8.0-configure-nomagic-nolibbsd.patch
new file mode 100644
index 000000000000..04ef44ad826e
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.8.0-configure-nomagic-nolibbsd.patch
@@ -0,0 +1,243 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libbsd, libelf, libmnl & libcap based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
+Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
+Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
+Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler <polynomial-c@gentoo.org>
+Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler <polynomial-c@gentoo.org>
+
+Update 2023-09-05: Removed libbsd enforcement from config.include for bug #911727
+by Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- a/config.include
++++ b/config.include
+@@ -0,0 +1,26 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++	CFLAGS += $(HAVE_ELF_CFLAGS)
++	LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++	CFLAGS += $(HAVE_SELINUX_CFLAGS)
++	LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++	CFLAGS += $(HAVE_MNL_CFLAGS)
++	LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++ifeq ($(HAVE_CAP),y)
++	CFLAGS += $(HAVE_CAP_CFLAGS)
++	LDLIBS += $(HAVE_CAP_LDLIBS)
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+
+--- a/bridge/Makefile
++++ b/bridge/Makefile
+@@ -2,6 +2,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o vni.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+--- a/configure
++++ b/configure
+@@ -154,7 +154,7 @@ EOF
+     if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
+ 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+ 	echo "yes"
+-	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -221,8 +221,8 @@ check_elf()
+ 	echo "HAVE_ELF:=y" >>$CONFIG
+ 	echo "yes"
+ 
+-	echo 'CFLAGS += -DHAVE_ELF' "$(${PKG_CONFIG} libelf --cflags)" >> $CONFIG
+-	echo 'LDLIBS += ' "$(${PKG_CONFIG} libelf --libs)" >>$CONFIG
++	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' "$(${PKG_CONFIG} libelf --cflags)" >> $CONFIG
++	echo 'HAVE_ELF_LDLIBS += ' "$(${PKG_CONFIG} libelf --libs)" >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -340,8 +340,8 @@ check_selinux()
+ 		echo "HAVE_SELINUX:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'LDLIBS +=' "$(${PKG_CONFIG} --libs libselinux)" >>$CONFIG
+-		echo 'CFLAGS += -DHAVE_SELINUX' "$(${PKG_CONFIG} --cflags libselinux)" >>$CONFIG
++		echo 'HAVE_SELINUX_LDLIBS +=' "$(${PKG_CONFIG} --libs libselinux)" >>$CONFIG
++		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' "$(${PKG_CONFIG} --cflags libselinux)" >>$CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -366,8 +366,8 @@ check_mnl()
+ 		echo "HAVE_MNL:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBMNL' "$(${PKG_CONFIG} libmnl --cflags)" >>$CONFIG
+-		echo 'LDLIBS +=' "$(${PKG_CONFIG} libmnl --libs)" >> $CONFIG
++		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' "$(${PKG_CONFIG} libmnl --cflags)" >>$CONFIG
++		echo 'HAVE_MNL_LDLIBS +=' "$(${PKG_CONFIG} libmnl --libs)" >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -408,8 +408,8 @@ EOF
+ 	echo "no"
+     else
+ 	if ${PKG_CONFIG} libbsd --exists; then
+-		echo 'CFLAGS += -DHAVE_LIBBSD' "$(${PKG_CONFIG} libbsd --cflags)" >>$CONFIG
+-		echo 'LDLIBS +=' "$(${PKG_CONFIG} libbsd --libs)" >> $CONFIG
++		echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' "$(${PKG_CONFIG} libbsd --cflags)" >>$CONFIG
++		echo 'HAVE_LIBBSD_LDLIBS +=' "$(${PKG_CONFIG} libbsd --libs)" >> $CONFIG
+ 		echo "no"
+ 	else
+ 		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
+@@ -425,8 +425,8 @@ check_cap()
+ 		echo "HAVE_CAP:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBCAP' "$(${PKG_CONFIG} libcap --cflags)" >>$CONFIG
+-		echo 'LDLIBS +=' "$(${PKG_CONFIG} libcap --libs)" >> $CONFIG
++		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' "$(${PKG_CONFIG} libcap --cflags)" >>$CONFIG
++		echo 'HAVE_CAP_LDLIBS +=' "$(${PKG_CONFIG} libcap --libs)" >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -614,7 +614,3 @@ check_cap
+ 
+ echo -n "color output: "
+ check_color
+-
+-echo >> $CONFIG
+-echo "%.o: %.c" >> $CONFIG
+-echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
+--- a/dcb/Makefile
++++ b/dcb/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ DCBOBJ = dcb.o \
+          dcb_app.o \
+--- a/devlink/Makefile
++++ b/devlink/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ DEVLINKOBJ = devlink.o mnlg.o
+ TARGETS += devlink
+--- a/genl/Makefile
++++ b/genl/Makefile
+@@ -2,6 +2,7 @@
+ GENLOBJ=genl.o
+ 
+ include ../config.mk
++include ../config.include
+ SHARED_LIBS ?= y
+ 
+ CFLAGS += -fno-strict-aliasing
+--- a/ip/Makefile
++++ b/ip/Makefile
+@@ -18,6 +18,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
+ RTMONOBJ=rtmon.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ALLOBJ=$(IPOBJ) $(RTMONOBJ)
+ SCRIPTS=routel
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ CFLAGS += -fPIC
+ 
+--- a/misc/Makefile
++++ b/misc/Makefile
+@@ -5,6 +5,7 @@ LNSTATOBJ=lnstat.o lnstat_util.o
+ TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_BERKELEY_DB),y)
+ 	TARGETS += arpd
+--- a/netem/Makefile
++++ b/netem/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ DISTGEN = maketable normal pareto paretonormal
+ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
+--- a/rdma/Makefile
++++ b/rdma/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+ include ../config.mk
++include ../config.include
+ 
+ CFLAGS += -I./include/uapi/
+ 
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -4,6 +4,7 @@ TCOBJ= tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o tc_monitor.o \
+        emp_ematch.tab.o emp_ematch.lex.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ SHARED_LIBS ?= y
+ 
+--- a/tipc/Makefile
++++ b/tipc/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TIPCOBJ=bearer.o \
+     cmdl.o link.o \
+--- a/vdpa/Makefile
++++ b/vdpa/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ CFLAGS += -I./include/uapi/
+ VDPAOBJ = vdpa.o
diff --git a/sys-apps/iproute2/files/iproute2-6.8.0-disable-libbsd-fallback.patch b/sys-apps/iproute2/files/iproute2-6.8.0-disable-libbsd-fallback.patch
new file mode 100644
index 000000000000..0c1eef227499
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.8.0-disable-libbsd-fallback.patch
@@ -0,0 +1,25 @@
+
+Disable the optional libbsd fallback in favor of iproute2's own
+strlcat/strlcpy routines. This prevents automagic linking and
+all sorts of other related problems.
+
+Bug: https://bugs.gentoo.org/911727
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- a/configure
++++ b/configure
+@@ -407,14 +407,8 @@ EOF
+     if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
+ 	echo "no"
+     else
+-	if ${PKG_CONFIG} libbsd --exists; then
+-		echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' "$(${PKG_CONFIG} libbsd --cflags)" >>$CONFIG
+-		echo 'HAVE_LIBBSD_LDLIBS +=' "$(${PKG_CONFIG} libbsd --libs)" >> $CONFIG
+-		echo "no"
+-	else
+ 		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
+ 		echo "yes"
+-	fi
+     fi
+     rm -f $TMPDIR/strtest.c $TMPDIR/strtest
+ }
diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
new file mode 100644
index 000000000000..c5ab1aee142e
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -0,0 +1,213 @@
+# 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.5.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
+)
+
+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 0d61a15abbfe..bfc78c186a70 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit edo toolchain-funcs
+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"
@@ -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"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
 # Needs root
 RESTRICT="test"
 
@@ -49,9 +49,9 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
-	"${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
+	"${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.4.0-disable-libbsd-fallback.patch # bug #911727
+	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
 )
 
 src_prepare() {
@@ -104,9 +104,14 @@ src_configure() {
 	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 --libbpf_force $(usex bpf on off)
+	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.
@@ -187,7 +192,6 @@ 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
@@ -197,6 +201,13 @@ 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/logwatch/Manifest b/sys-apps/logwatch/Manifest
index e467e16429b6..7b9ebe820873 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -2,7 +2,7 @@ AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab47832
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.10.tar.gz 511766 BLAKE2B 66d7cb09f4c73ca55a3bad9eb2e9a46eabdc0da444e5361ddc10e7bee28de2e58f2c10530f75d40b2689d33624d612f439171b995e9f21a7e48bf211db1f2bd2 SHA512 838bcc7a3b12eb31450a20195fe2ca4ab238500051bb2f50bd1775272fefa412e0a2473c0294a5495ef594fa530b00dac0dc6d18b93e124f36614686502e55cb
 DIST logwatch-7.9.tar.gz 501086 BLAKE2B ebfc65c88036244840fe4fbf42c0bea668cac3063771f0042827a2f583d654403b75bdfa428f50a7fdac5f0098ec08ef5a27006db7f7576b361653594462d607 SHA512 d091fbbeb0cac4b661fb066118fd384dbdeabe137c699ea6892d53567a45978c0742b1be9cf2f8b8c2e522314351ee6c2e3710ac2e61bbf1a3c8d63f78a3646f
-EBUILD logwatch-7.10.ebuild 2485 BLAKE2B 606862c83852deaf258f89f10b549d815833cc92d5468cc5587ab2eee123adfd170f1815e3cc3ffa99d6a159cefed5331e7d7e13ad4a140b2669dae3ae791e41 SHA512 58c6da397d0c255b13f4542b3155e9607a4f405915d851a47e578087ae0f5e663f41de4cfa03d5f677dc4c4a317578dfbcd6a01a095e4a7226253463f5c0d80c
+EBUILD logwatch-7.10.ebuild 2484 BLAKE2B 5750c3e9cf68856e8f34a60eb0adf8c2596f5982257a5cff488d900f2dd62cdc44aefe7771dbef319a407174a917e612931c7758e9de4a4f1e88d8ec417167a7 SHA512 a2340d109b6e4f05eac7a10676b36ad58a2fac98560b0d22925ebe74c8f640b232c735a385bb135a4fe32e42baa15049df2eb46c88664e228b846819e5acf3f8
 EBUILD logwatch-7.9.ebuild 2484 BLAKE2B 8a30d602bda388e99701353d6765c9340251b325a813ff927cf6a6b34e4a2fde31c3c03a1f223948838b0d8e87472272ba7fa93b150af677b8ad2036ee70588b SHA512 4334bde2e9f7a4640b4ce27392badaf22ba1383d267f1835b32879519fd65ee0fbc2eac138d709a078a9d8d09b4a97455a3cb823dd8cd83fdd3edce35b744df3
 EBUILD logwatch-9999.ebuild 2492 BLAKE2B 88119a119c08dd47428628e1744fdec2fdc4ff429bd5d3e81da52b26c65671e5d34af83b73a374b396d576b6f648afe072f6fc03f160e5504ea2c6cd4d867eee SHA512 eed8787ba2c1f079d5d34fa5400e21991031438aee9bdde80e07f9d31dd2c49163d2d761df0e0574c645158476d4bca8d44ff2861bc85dd348667cce28011721
 MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a
diff --git a/sys-apps/logwatch/logwatch-7.10.ebuild b/sys-apps/logwatch/logwatch-7.10.ebuild
index d85439094965..c27757935fcb 100644
--- a/sys-apps/logwatch/logwatch-7.10.ebuild
+++ b/sys-apps/logwatch/logwatch-7.10.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 99df68512869..4c3240dd8962 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -3,5 +3,5 @@ DIST mawk-1.3.4-20231126.tgz.asc 729 BLAKE2B 72d8e626aac6354f2e568eb118f2d19b3d7
 DIST mawk-1.3.4-20240123.tgz 413943 BLAKE2B 29a9c89995e969a62bd0b30e494c67e53aea0466c9286e2005422a54a44bef661ef6223522c4b51bc49b83c56512ae47e784c237dd39dfef77b7aa13ec33973a SHA512 f6d5da44280afeac4a9bb6d3788ed71ee816daaa5816f49b9d40add5292f3ae06e5af007a6c993d14405238cbb70ba4997fdd2fcd5901c9a1a4b61357045c4a6
 DIST mawk-1.3.4-20240123.tgz.asc 729 BLAKE2B e4ba4ddd1f3227a9dc922a1325b00fac2d9c95a848fdc03f57eaa5f354bf45da218cbf6e931b5c1464b799c05d10ff7fe95d1eb81221b4afba468bedc7805815 SHA512 3b4b8b8b7b74aff7061158a7c284d1949c09d52d78003b678c9dcc1da036a4d84b873103d76362866daf914d5a7d717c71baf13d30d7e882b03c5f87c8e4c452
 EBUILD mawk-1.3.4_p20231126.ebuild 1298 BLAKE2B 7799aa876bf05b81a98c9d63116862da55b44e37c56bdbde188e19ebb1dc88d0431130a6db31f6e4eaf242c5c55a8e077702b0190aa22e773ce91e585d1561f5 SHA512 7726ebd7e05af3f8bde3c93ad928085335cfed0d0d9d68124eef4a33bab60eb77cb5ce83b361bc584dc3b6fdcb51a4f015cfc1d9ec3c3f5ae05b76098d66dc99
-EBUILD mawk-1.3.4_p20240123.ebuild 1299 BLAKE2B dcbd2989e29f208f4ad0c17d024a5fbdca44006f05d02d355c170030721467b917949bdcf1639c3173bc6cd43d9f31395399ec7564c659dd52f4601b05a22a01 SHA512 0f9559f4ec06b09e24714738424fe47240f3e7543cda53ab3b903e9d71a94f9055ad1ad68f9905116a38b3269b265296b0528e94e13d801d2b62b1d2ff1718da
+EBUILD mawk-1.3.4_p20240123.ebuild 1298 BLAKE2B 295253a5cfb6b861214a4072acc84af892d557e2aef52b7066e97043012fae3550a78c070f521df68e8befe6419488391c5bf3313a5eb0b83603aaa7c5575e2c SHA512 1b44dc09bfe3254ba8b89b5d4a38c335e1d328ad95a9f59bdf4beeaf22ad50ed43241be65c20d1b72225de757053caa85952f853df67f87303fb327630c38469
 MISC metadata.xml 422 BLAKE2B 8bd344848b5247eb1858b7cd31d91a796671c321610b826e602d9350e59769a4e6612438d9bf89ee2d6d63c327729d88a9ccb538b162beb816fde2910d0a4d9a SHA512 9adcc3c3b54ee935d3363e874e76f9e9b1efee00faac94184a84d10a6600dad4f11da51d4567acabf63707ca55f9b3d5ac3df107c6de8b38cad1da9891e82086
diff --git a/sys-apps/mawk/mawk-1.3.4_p20240123.ebuild b/sys-apps/mawk/mawk-1.3.4_p20240123.ebuild
index 5b9e829aa666..df59ce811bad 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20240123.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20240123.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 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"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"