gentoo auto-resync : 21:03:2024 - 07:00:13

16 files changed, 69 insertions, 155 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index d88c04073f24..1b0bd6a98cd5 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1fa2937bf741..cdf1ce393a7c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,16 +1,17 @@
 AUX 2.42.1-arm64-non-jumbo-fix.patch 1491 BLAKE2B 2902c8f26730fe92c3604ef264ed4bfc9b88d39fdc0f9babb9d48849840167b9d52eb45d20d8e4ea4a3363a8a3bb6b89a5a1ae32a24a0f9a0e86581c3c6d3d6e SHA512 f9be3b4bc29a8c7ae81e4cd5e817e52de409694db72303a255ee8660a1157b8392e3b9d8ff65a9ed84ee762b6b8b007aa2bf3811bba2276352182101097657d8
+AUX 2.42.3-arm64-non-jumbo-fix-925621.patch 1025 BLAKE2B 6a9641b4c05b62c143b2be5ed1d2d8563839466d56831b4dcba503c8892848155f753b0c892407882e41d9cdebd418eff68b94918ed098526813feb1cb87c435 SHA512 238531fe2cc6dff154527abafb8d9c3f0586a82122675d763a440d8dd58162840ebd0539b2ca5c797b203707b4b4470207e509f050220881bc5474660b057ab7
 AUX 2.42.4-wasm-assert-fix.patch 1631 BLAKE2B fe7272f849a816e85440ac3df0d33338ec1335e1b55508ea910be02ce103ea8907d401f8553761514d42164e1d771391abe7bcbcd18765358255569fd70e50f1 SHA512 83b1737e232d09128f18cc9662fc6d614bb1274f53d839fbf4048d5e4160b71a880229b46e6e99e914db93a936415d805821fbc82beb9b2ee54f6505a8ebe395
 AUX 2.42.5-x86-build-fix.patch 1375 BLAKE2B 0ce7224b81fbcf6602845cc5ba454c6e2c86301fb9b075c435308e420c42ed907fec18ef8e0c4e00f2b78cf3776531d9092f6c62fa176f149d21713da6fc52ee SHA512 aad29eecab37d12a983aa5748c08761458769643d1c9cd87c017c58a4ac00c0c6f3cf7f04d0b30e846485def9414a75a46f29256ca7a7dec89aa25b081b6f1dd
 DIST webkitgtk-2.42.3.tar.xz 32023120 BLAKE2B 8a132039895d859189b65a5fd09e35a99b5ce2ad0cf46c44a4ec9b6c499155c8dcc9d28d4add727f59078df99d03157f203fb12feed7e75f2e28fbebe9953850 SHA512 3ccd7245c656f2919357b8c0b867f47d223cac3cdca5e5a015bb3e6097051c87c8bd38db5fafea8801ca3f0d0d493d7f2f1079ff72fc2afc9cb7a281f4ae6839
 DIST webkitgtk-2.42.4.tar.xz 32059260 BLAKE2B 3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401 SHA512 2019408b3b6b2354ea3da380abaad34d51fed6d5ce9d5a9ff9db6f911d235f8a9eb765ccf1e5608ddc49516cafee9921b4a0f9912b9ae5af56701f8fc0f45293
 DIST webkitgtk-2.42.5.tar.xz 34651836 BLAKE2B 4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516 SHA512 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0
-EBUILD webkit-gtk-2.42.3-r410.ebuild 8052 BLAKE2B e1275ba81e5ac93457047d54e028123e3b9c4c699d2c31af7e4a0e695d2e87c1d80ff7ea59cd857a8efab1a2a6a5b59023946515caeaca96188ae1f45cbb2ee0 SHA512 c23e242f094e28e3e924b6d67bb03ef5dba29c601b2695089143edf2d4938a05b568c7af02e58c4ddb12793adfdeb189414e9061b5f43919b12f6945c2a0b87d
-EBUILD webkit-gtk-2.42.3-r600.ebuild 7949 BLAKE2B e3a0fa59c3750f9419c9b75f8e96eaf4aa956252f888fa68035742bc070caa8479ff0756aeb59b67313ed8bbd2852be2e02718ff3afbbad101532c767f02ec11 SHA512 5913a79999cb820c8f0db00eb1b29479997864815c2eb0ab5041676cacd85503827fd5d17d0d48fe3d4ede0019ea74085672a9dffd7be574f219ee4418abf65a
-EBUILD webkit-gtk-2.42.3.ebuild 7778 BLAKE2B 140fbf250e32d892dd7b60f749296b5db949ef04431258441fecc924c1c213f6e8127ed9e4f077c7652f70860544c2e035b898894ede9d08063bbd53052e4287 SHA512 f875ac61055970ff45cbc8b0be13912baca9f21ae5d89437bc890078c26b6cd136975fe195ff7d68eebabda29820dd00fcbdcbb6bc3edb15be3a5545e877285a
-EBUILD webkit-gtk-2.42.4-r410.ebuild 8206 BLAKE2B 652d0d03eafdbe65099216fb83900b9c24abad6817c6065734269bb4f0d5b06502e06a38602dfa5a30721dd1c26403bd0930b46cf2ac72b4142fe686770dbcb3 SHA512 a37c9bb7a5e1583332fb04dc43a00670390857e19a0b516a1618efc720dd192840cb8054c0f2487f246e1d751e9b3dbb141937b02d964df11fb6fc4fa41d7a92
-EBUILD webkit-gtk-2.42.4-r600.ebuild 8103 BLAKE2B 3ab76ad51b938f618d3012398cbafa12fd595cfec29493550f504cf79126f26e934876de80a136a5e2ef50701b88e3957d3eac69fb88dba0798bc8fdc881cee2 SHA512 97eec9186c4d15c0dff8aeb122346c8a9de4f7baf25f00803cd3c185fd168fa978736275698e5d17fbdaa8297d45d604af0c90ee4c5aea893c36da1043e3a342
-EBUILD webkit-gtk-2.42.4.ebuild 7932 BLAKE2B ee9487f32d0e624293558d5d61bd010acfd4323dbe059f1b9d7640573d84e1ec5e538b9d90e5cd0465aa39a88f409c90390cb2f66101d21c072a2079a5b42309 SHA512 2757f09c57ff3f235c63d252d2e6fa9ab2c6058f42aab90a1917e458e091d4f77fe920324ad886b97b71c244e09b97045fc250de966bd383883f9ee940f22304
-EBUILD webkit-gtk-2.42.5-r410.ebuild 8298 BLAKE2B 4b581b88d9525baf956895924a52888bbf3de65d47fc511d2e686fe46d1dfc0710c7eda42d3cf176131d17a71b948cf5dde861bdd03a61691e7baabb4696d371 SHA512 f50606bcc68bfe82ab19e3146b57a4cec1883da2e9e4053ea7af358197bf7ce4c36463a1b1f9b0c44e043ba6a8a6110c8e083310cab088c3e20775a48e1e5e82
-EBUILD webkit-gtk-2.42.5-r600.ebuild 8195 BLAKE2B bb73004d2834761a573ccac0160c4e888776918f6eacbd193d27ec50810a27315c3fb5e02965783e97094ad4e39cddc68c72091864304c1bbe01d7958bd643ed SHA512 f9b5d46c5720ac0a5a6f1d6160e5ac9f10ab4523940e70275ff27045d3f0e5d7f087f2c8cc954b4b0edc2192f5d5a3971d0fcfdd95a526bd9bf919c9540bfb65
-EBUILD webkit-gtk-2.42.5.ebuild 8024 BLAKE2B d8c3c372e3d11afc4f6ad989675f70dc6342e16152f4b21b765679d6021ad7ce188ef446ba7a4257ddf7ba68642cf66ede81dcd0adf93440aac5ab6d305e0dd2 SHA512 5bd05f97328d60569af7a21dfd8499f8ecb7b2c28895441c6931137436d4dcbeaf8a2ac40e4f495422b93b8a66d7461f5b07cf9bba13e16ef9c8c12e7372a64a
+EBUILD webkit-gtk-2.42.3-r410.ebuild 8114 BLAKE2B a98e45846e051838f8571c58c7af729a855e21cabaf00c178c59e053c01306db7b794b82b30af42e580582eb1ade94c3eafd9dde7c64e37b7d1846e9370e859b SHA512 c38679ce3a3d60c87a68f7839a34ab801e2a19d097d62617f26d5971b01cbe0a8a43f927faae3ac12dcfaed9d2f382dd4564cc6c43d9b3873a5de3216a85ebbe
+EBUILD webkit-gtk-2.42.3-r600.ebuild 8011 BLAKE2B 2f22d541295bb6bfbc2887f71f4e12ecee0b675ddf3c0a782c1b5fed21edf78c341f6b40133a60f8bcce86b67d994841016c1bb2921d84b86ae0cf5daf6b774a SHA512 1721c6c842b0185b771dfac6fb906d22f6ef5e55067c968f059464c94da5bb1c7a4d0475966bd5aa422591c3cd78a84d7f7a93c035b0cd3b577760b7c974e301
+EBUILD webkit-gtk-2.42.3.ebuild 7840 BLAKE2B 06c043a689ecfecb778258c46f1335deb5cf81ad5fb0e1392fa98bdf78b3bccbdb3160dea797d5eea1ebbee1b9bd53af077713ee7101bd1b2d94132be20d8db7 SHA512 0ad3bef0dc844646a082bf52702f245cddc88625e285eb9530bfd9cc672e29f777b5d69595dea60ed894e717d46dc600d244a216c52b469c78617d603be4b98c
+EBUILD webkit-gtk-2.42.4-r410.ebuild 8268 BLAKE2B 0226012f3b08d9f866419a3ec21980a88afcbf5a095a4f067758fa93416d5f5c3f49998e6e11bea675515327adb97cc010692d6b9a8a7e8b177e9c91ce28e3e6 SHA512 fef57f645a1812fa466a22e02c5693cc54e3cb27f0a4ccb942122b87ec461daf0c39df45d6c384644d9f40ec9df08b5769a27562f153c84dc647138f9ae5e82a
+EBUILD webkit-gtk-2.42.4-r600.ebuild 8165 BLAKE2B 12fefa969bf4d2e36f76a271e34bc593da89f0da673a39cc2ff0a33e6c3bfc2c24ce0f73f8deee9b6e3d4fdada9d306cd2e022c2722f9be4ac96474460089ed6 SHA512 ad3fb27b90a05e2e2b3e44e448f2eba4d900406561f48129c5c67956f72b547a2b5ab689a553e1dc6055f10f214714a4f19f115fbce577533c3b6432379aecbe
+EBUILD webkit-gtk-2.42.4.ebuild 7994 BLAKE2B 82e95102f93c9a7570465ddcac8bff269ab8a8dac27e17a0281506d8b8452abbb5ecab607fcb9f860bbce98642d2d5afe733d7d059c846e092cbbb0ba4864a58 SHA512 cc7790747ba790970fdeebce8ed310451d27a3e87de01ce38a6835ad95317c5fc7257510500f89ae252bda481180e0ad7689b85e157bb8714fda4ff172dc5371
+EBUILD webkit-gtk-2.42.5-r410.ebuild 8360 BLAKE2B d93aa2d60655262da71274cfca3f4d91ed02ffe7461ee3e7f867d54e6ec03a81a6678c302459550b33b53db05ab85ddd10c0a87b2fca3c14476336fcd1bfb75c SHA512 45cfe37e32418ea488a6c7837b5fad64fb500ef288338d5d977cac5f10b7285e2087dcc095a515f42c534c29730a6e59eec97acd8dfe1f9dca692f05d9ffe777
+EBUILD webkit-gtk-2.42.5-r600.ebuild 8257 BLAKE2B ef643b85a86ebd548e3cfa8c4c3934c9cfaa9e090158604208a00705a2a826520dc8860f33c501a26e062acd7623672de37f772fda95787931214d12ea87bdd9 SHA512 1b3d7520920db3f509114335d1ea74d10eed46b66b5847c75504eab9f113d4232f99e73c80b4572e17e1d516d5fea6b24e90dc98e235c75429a606381d5ecd64
+EBUILD webkit-gtk-2.42.5.ebuild 8086 BLAKE2B c1a64a0abaefb0e7ac91cd7f03817b4dedfa9c3f0d9988b9a5d7a5230646d6698168b52aeb80163ea5cc498a8796fc6ebf21644432a94fd9ec791268dee7d161 SHA512 2bd3a674a9ed6aa23543b7dcb938b7aabe3b2eab80ba703c9f6ccdf42a1d46f29e51dd4bbafcaffab8fef9bc0299a01adb57d392a4810e9e573bbfb908eae0d6
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch
new file mode 100644
index 000000000000..51fc45fa32c4
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch
@@ -0,0 +1,29 @@
+From 56001e951362a5064027b1af81283e523e35559b Mon Sep 17 00:00:00 2001
+From: Dennis Camera <dennis.camera+webkit@riiengineering.ch>
+Date: Mon, 4 Mar 2024 09:27:54 -0800
+Subject: [PATCH] [JSC] A64DOpcode include <mutex>
+ https://bugs.webkit.org/show_bug.cgi?id=270394
+
+Reviewed by Michael Catanzaro.
+
+When UNIFIED_BUILDS are disabled, the build fails due to missing std::call_once.
+
+* Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h: include <mutex>.
+
+Canonical link: https://commits.webkit.org/275630@main
+---
+ Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h
+index 0392bcb6e20a0..202aa4d1d81de 100644
+--- a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h
++++ b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h
+@@ -25,6 +25,7 @@
+ 
+ #pragma once
+ 
++#include <mutex>
+ #include <stdint.h>
+ #include <wtf/Assertions.h>
+ #include <wtf/DataLog.h>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
index 67a6f3ef6fd2..e42873a09ccd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -153,6 +153,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
index 55fb6a6fc4ca..8e47bab09487 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -154,6 +154,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
index c2dbd794b679..947457b3bc6d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -151,6 +151,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index 68f473b5cc83..39b921345132 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -155,6 +155,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 	# Fix assert failure on some machines, bug #920704
 	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index 2d58a29cbfa2..71847398694a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -156,6 +156,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 	# Fix assert failure on some machines, bug #920704
 	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index aa578715e450..0bd69d249c30 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -153,6 +153,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 	# Fix assert failure on some machines, bug #920704
 	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
index 0f1a6bea0d66..38d773a9d41c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -155,6 +155,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 	# Fix assert failure on some machines, bug #920704
 	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 	# Fix compilation on x86, bug #924873
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
index be33daab50ba..78f3686ffd25 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -156,6 +156,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 	# Fix assert failure on some machines, bug #920704
 	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 	# Fix compilation on x86, bug #924873
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
index 002acc94dddf..b2b5f75bcd7c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -153,6 +153,7 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 	# Fix assert failure on some machines, bug #920704
 	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 	# Fix compilation on x86, bug #924873
diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 0648611e21a6..aad6960bbcef 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,8 +1,6 @@
-AUX 1.4.0-no-Werror.patch 2521 BLAKE2B e424b9fb203b78d45f49c5a1264c01509b6da2a95914ca713e43d9e444a5a3b360323b44bdba547035dff46d880197626eb0999532772c5f2757205c280ff272 SHA512 06a10e5c7bf4bf841dfab692c9dc18b8d1a1730426f4ef92de278a604a98aa7833dff547fd6ecc284d0f0111c0e1011bd8d14315451f0e5963ca64264e8891b7
-AUX 1.4.0-toolchain.patch 2479 BLAKE2B c907fa98fff2ad93d0f72d75237bff6fc7aab05e10e76d5b30555b0a7d64f6012f1555d806acf0127019d0ec2f39eeeb7741d62bf858ab1d9da5e9c85fc33c48 SHA512 6321960eca342a2d89e2118c0c8826dd415871e79e9f7685e1d4b44d1e2af987cc7a4c893c1b98578df8075e0705d1279131c6e2356ca5fd86d4c3d8ba22495d
 AUX 1.4.1-fix-memory-leak-in-xsk_setup_xdp_prog.patch 1120 BLAKE2B c922ec5fec6b4a7d73289a56aab40505dfca1d79ec36038631e6c337fcc5aa6c22671110b278bfd9e8fc68410a212bf3a1b9bdc8a61e867d0c803c554607e266 SHA512 05387a2625dc25349d8ac941c16fc0fd9216453c771cdd166bfef0afba61df512888bd9e14b55222f51b5956fd54db41b45be0487fd8fc0fd65d861109837aac
-DIST xdp-tools-1.4.0.tar.gz 337221 BLAKE2B 008dda0fcfd403e47ab2b8c801fc0a5c4e103fb3b9869f1d1bf5af258fc646dd5a0285d3126c012c9b81805408b9669da886b9fcf2fdf33b256f74bbf898222a SHA512 c17bd6e9e6e4cf59c33f4b9ae4e3e0434863d147abf80f87b425215261b96d4574898fa09cc2b201a427a5e9d49ad64d0c70e50e3f72e3a18c6fbdf7f4cd4a3a
 DIST xdp-tools-1.4.1.tar.gz 339878 BLAKE2B 30ed245dd0da8404cf67313ea4d5f9a148507d14bd7330bdac3b03c07d1cc0b38eb1a376636551cb8ea14c8a2e77d02527da363733a1059e1c2ebaee9ac90392 SHA512 9d2ad42713aa53c10ccbde2c344bf2696524e317544f3693114b343ab74240187699c3802cfc6efa05b3e9f9bfec80fd2537799aa3ae050717bb1f6aab435996
-EBUILD xdp-tools-1.4.0.ebuild 2031 BLAKE2B e7a741b9038e1e1723fd02929c89e8522c37646edc9c14d9dbdcd90c0cc80e4c5846a1d56f7337ceaec32a087ff2cd1a24a922ff2619ba0bc3435af054ed6ee9 SHA512 3c4769533b3841ea3a0242cec4caf91f931ba0fd6db3109e854f7c59cb44383e36c19187a19beb6ef9f22166ece7f6cb1bbaf3b040b66b006ac544af00282a3b
+DIST xdp-tools-1.4.2.tar.gz 340864 BLAKE2B c5197330ff917043e03a16346823acab760db5fe903f2e039bd2c178ad34bb04d96a0d6b321fd3565256c39422f3f1f7b475970bd22ab487e30468c96e11c711 SHA512 aedf79859872523d514f18e7a6e8b7999bd1942021968dbba9a7e86cde1c193e31b328bc56d6bf2b3fbc7f266c9df8d942d90a70bbd9d514ce38d56c07cd18ca
 EBUILD xdp-tools-1.4.1-r1.ebuild 2358 BLAKE2B f9973bea06b0b725c5129783e3bfdda194ff5fd50fec0b3d60e04efa5fdfe38c7b5438344107a9923625de4dad63544e53448a97ba633c10ffca1c40f3efd0c6 SHA512 99510b221167078abb9b0c97330fb74d8913401ec93bb045914896b01822c8b1081f52d34b6a3893bfcff4c7ebeb91739fd378507f364a25443bc1d4c98dd418
+EBUILD xdp-tools-1.4.2.ebuild 2281 BLAKE2B 9688a8d834a659c0d59d97d521188040eb7fa5cd3e7368d53222da5cc796d5002fe480b80e1423986766c773e1d57d2df4ce40d0bf1f53e673c1eb6c09332dd4 SHA512 087f92f9a3f82ebb2f267c46202e4b875d59408636decd32b7c7bae2d238318f8bf11565aa2ffaa1936b3c4490d51218a1c73fa8319864a777d24a56cca17a81
 MISC metadata.xml 731 BLAKE2B a9c958d31f9ece376e4518e213823c14474df47747205020b76da7a0a67f7ed926ec55002b586143ce84cb965a23ad1794a42862597278682ef3605fc7d07911 SHA512 78774e4bcc6e05d56fe82b0aacd46e4d23e3bd89aa5bb55900adb94648d06b3251c575d4d0b6108cdad0f2ffbabcc2973e50e804b120a73e8923cd679601384f
diff --git a/net-libs/xdp-tools/files/1.4.0-no-Werror.patch b/net-libs/xdp-tools/files/1.4.0-no-Werror.patch
deleted file mode 100644
index fb086f5122b9..000000000000
--- a/net-libs/xdp-tools/files/1.4.0-no-Werror.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-Bug: https://bugs.gentoo.org/899744
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 5ee035d..5342ab3 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -1,5 +1,5 @@
- 
--LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Werror -Wall) -fPIC
-+LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Wall) -fPIC
- 
- LIB_DIR = .
- include defines.mk
-diff --git a/lib/common.mk b/lib/common.mk
-index b680a75..8dbcb39 100644
---- a/lib/common.mk
-+++ b/lib/common.mk
-@@ -116,7 +116,6 @@ $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
-diff --git a/lib/defines.mk b/lib/defines.mk
-index 54b259f..ed246c0 100644
---- a/lib/defines.mk
-+++ b/lib/defines.mk
-@@ -40,7 +40,7 @@ endif
- 
- DEFINES += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
--CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES)
-+CFLAGS += -std=gnu11 -Wextra $(DEFINES)
- BPF_CFLAGS += $(DEFINES) $(filter -ffile-prefix-map=%,$(CFLAGS))
- 
- CONFIGMK := $(LIB_DIR)/../config.mk
-diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
-index 431932a..a0c625d 100644
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -142,7 +142,6 @@ $(XDP_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
-diff --git a/lib/libxdp/tests/Makefile b/lib/libxdp/tests/Makefile
-index 3c22901..a4463f3 100644
---- a/lib/libxdp/tests/Makefile
-+++ b/lib/libxdp/tests/Makefile
-@@ -72,7 +72,6 @@ $(BPF_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK) $(EXTRA_DEPS)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
-diff --git a/lib/util/Makefile b/lib/util/Makefile
-index 24070f0..37485b3 100644
---- a/lib/util/Makefile
-+++ b/lib/util/Makefile
-@@ -26,7 +26,6 @@ $(UTIL_BPF_OBJS): %.o: %.c $(KERN_USER_H) $(BPF_HEADERS) $(LIBMK)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
diff --git a/net-libs/xdp-tools/files/1.4.0-toolchain.patch b/net-libs/xdp-tools/files/1.4.0-toolchain.patch
deleted file mode 100644
index d4bcb511310f..000000000000
--- a/net-libs/xdp-tools/files/1.4.0-toolchain.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-
-Patch from: https://github.com/xdp-project/xdp-tools/pull/341
-
-From b1377b35cd05daf4d3afc3d59839e9889a642ffb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Sat, 8 Jul 2023 12:34:20 +0200
-Subject: [PATCH] libxdp: don't use direct call to readelf for symbol table
- comparison
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gentoo CI previously reported symbol mismatches in libxdp
-(see #302 and https://bugs.gentoo.org/899742). This was
-caused by a direct call to 'readelf' instead of using the
-command injected by the environment/toolchain.
-The fix is simple: use $(READELF).
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
----
- lib/libxdp/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
-index 43de3e8a..532e0687 100644
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -93,12 +93,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(SHARED_OBJDIR)
- 
- XDP_IN_SHARED	:= $(SHARED_OBJDIR)/libxdp.o $(SHARED_OBJDIR)/xsk.o
- 
--GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \
-+GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \
- 			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
- 			   sed 's/\[.*\]//' | \
- 			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
- 			   sort -u | wc -l)
--VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \
-+VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \
- 			      grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l)
- 
- check: $(CHECK_RULES)
-@@ -110,12 +110,12 @@ check_abi: $(OBJDIR)/libxdp.so
- 		     "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
- 		     "Please make sure all symbols are"	 \
- 		     "versioned in $(VERSION_SCRIPT)." >&2;		 \
--		readelf -s --wide $(XDP_IN_SHARED) |			 \
-+		$(READELF) -s --wide $(XDP_IN_SHARED) |			 \
- 		    cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' |	 \
- 		    sed 's/\[.*\]//' |					 \
- 		    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'|  \
- 		    sort -u > $(OUTPUT)libxdp_global_syms.tmp;		 \
--		readelf --dyn-syms --wide $(OUTPUT)libxdp.so |		 \
-+		$(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so |		 \
- 		    grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 |		 \
- 		    sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; 	 \
- 		diff -u $(OUTPUT)libxdp_global_syms.tmp			 \
diff --git a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild
index fb70b301ec4d..6617263e054b 100644
--- a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+tools"
 
 DEPEND="
@@ -32,14 +32,26 @@ QA_PREBUILT="usr/lib/bpf/*.o"
 
 MAKEOPTS+=" V=1"
 
-PATCHES=(
-	"${FILESDIR}"/1.4.0-no-Werror.patch
-	"${FILESDIR}"/1.4.0-toolchain.patch
-)
+src_prepare() {
+	# remove -Werror: #899744
+	sed -i 's/-Werror//g' lib/Makefile lib/defines.mk || die
+	sed -i '/-Werror/d' lib/common.mk lib/libxdp/Makefile \
+		lib/libxdp/tests/Makefile lib/util/Makefile || die
+
+	default
+}
 
 src_configure() {
+	# filter LTO: #861587
+	filter-lto
+
+	# filter LDFLAGS some more: #916591
+	filter-ldflags -Wl,--{icf,lto}*
+
+	# force ld.bfd: #916591
+	tc-ld-force-bfd
+
 	export CC="$(tc-getCC)"
-	export LD="$(tc-getLD)"
 	export PREFIX="${EPREFIX}/usr"
 	export LIBDIR="${PREFIX}/$(get_libdir)"
 	export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
@@ -47,9 +59,6 @@ src_configure() {
 	export DYNAMIC_LIBXDP=1
 	export FORCE_SYSTEM_LIBBPF=1
 
-	# bug 861587
-	filter-lto
-
 	default
 }