gentoo auto-resync : 28:08:2023 - 10:02:11

8 files changed, 379 insertions, 7 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ffb62ea9a9f5..3efc205d239b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index fce463c09916..c19c70cfe72d 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -2,7 +2,7 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cbindgen-0.24.3.tar.gz 207890 BLAKE2B 561c3f292a5361a5e798482d23d0a1609ba80b7d25faa09a0d8b5da525112533083bddc7d3d5dace6e56579c5eb647c00bcad80f5a32f868edb49b3c0e6f1ae7 SHA512 f2cf8172f8678510f9f09cf0316d4e7137c70606650857570a24dac6e5c76454cf61c60613269c6fa5737e4b05b2b337fb180671c5ecbc6fcff3318ccc8f21d0
-DIST cbindgen-0.24.5.tar.gz 208857 BLAKE2B 4770b766c5732e7593953670f857d025f86940edd34ee7f2986eeb59c25172fa148f5b6150bf07af520d48a258239aeda7e02fd7a089dee171db44ff674919f6 SHA512 a82f9c42f0bd863e55adf16702e8e6591150b7ee9f34ff777fdcc6f18ed7b3e4608b2bebacd1a56f63e075ced8a664cd2316117380ac104f71a92135f34a90e2
+DIST cbindgen-0.25.0.tar.gz 214117 BLAKE2B 1907da675c517aed72017d2fb0f40f3dbe462c3114a45d87dbc7350f1f19ec7b9afba43c60b22da0d882481d815dc9b5e6776e2b2cd7baf7c03c9777a0801600 SHA512 b5148dfe392dc9b0b44afa8a8ac522fee596176084e1186fd46806d8f6b87f3cfce2402bd2a0a060b2cc088788d80a6225f3eead930ab3600c4087e26391a023
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-3.1.6.crate 202211 BLAKE2B 9fbd6d5ad8442118716e01c10ec9388644ef6e5621019a1245ae937324265b96d50aa70777d149daeea6f812ee05414623f938a056c38a201d9f6ee0b98bded5 SHA512 397c277eeb9acafc1098f6b6aa7e428cf7c7016356a99139dbff66dd6c6e12434b14a457679fd99ea50c1fb0b54b9b96bad65f1198025986835810484e542824
 DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea
@@ -33,7 +33,7 @@ DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST parking_lot_core-0.8.6.crate 32567 BLAKE2B 9943244f813879ab85eae0b9a6bd8f8f0070fe190bc43148a832b217ad546bc97e58707a3987072965a79ae8bc2fa839aebac272f2de00993b8ac1ca0c5fc5ef SHA512 906241f8e2d71784d572fb78978c9550b19af9c4e32fe3b2da751287806d0faeba61f5bd36f7aab026970b2bffaaa1f62ddc10c64dc348eae61bf7b51297ef80
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST proc-macro2-1.0.58.crate 44519 BLAKE2B 34b728460fcc161cfba36298c596d263d4c7455f95907704a490c1a81c479823926504f03bfc169c1b0543611092258698ccaf00905b5b02a6b843308471ef1b SHA512 5c1505b847944098d85c30b8d0fc7f059526170d51adff39493e9701fc8479829d4ca4a7f728c35d11478b9dbd718e521da0699af3b70aba8a3a3df2c60881ad
+DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
 DIST quote-1.0.17.crate 28629 BLAKE2B f4c586b9869e9fa24e0b5a2eb9b4dda7aa55924c6a7f6349825c5c9a55ce170397af975d9c6b319009791cf48f51fdc0aa38530ea31efb45fc0659f07c30ca32 SHA512 d34fa0c864e3b9007449269ad5ea8736bbaa359e61eeb454e9c1cc30f9739a96778a04421e2a014879aeee417d8b51e20c6c41ebdab6878567af027096ff9ebd
 DIST quote-1.0.27.crate 28416 BLAKE2B 68715000ad56f93c573ebacfbad0987054ef7716e10144cc8de47636812271060e3aa8f0754d105abef46a27024cda03a7054f11cbdecf110735ef845dc59a31 SHA512 5fb5802aa667c60d1a721766081b01bfd6cd929db7a5d71cb74627c2325f7108740752e514db73fb3612c163840e60ef2d4bde31c41978f3d77605418bdf2b4a
 DIST redox_syscall-0.2.12.crate 24081 BLAKE2B 0c1cc5d82038df2ce07a65cefdd6f473f1403ab9c50f8bec1f33c5b1387b1fb887f07068b5a2ac53a64c8408c82d4e5d9407fca81da3b599e087bee9b40e9f3d SHA512 c89b2aa6ab9b34ba10983c9b6c90108e0b7e380357c9b5f50a72ea6ab54311437c88859d2345b28747d2539fdac29a597b72e7e47b4ded9b6dfbc54ea9792048
@@ -70,5 +70,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.24.3.ebuild 1552 BLAKE2B 7e7580b216a2d2b3ff91152a1ee828a28c129c99385be81a775a91334bd721dd3287ae57771fbb72c314fafff6acb49dad52b82debb22d7ce1436cfcf977e2c2 SHA512 0e7fdf2edd377a33e28cd1984a951fb423edc21ed967f2e1c8f1391a68bc92f668cbafe7dc74b4514d1a8dfe9950a74e83ccf5c7ffe22a132aa92ffe218135a6
-EBUILD cbindgen-0.24.5.ebuild 1487 BLAKE2B ce0536256aa652a64a3413168f1c7d0106833e794e4be5dc8eb0a107a58d87d4c168e45459a7f2eb487fdb3ee7bcd8573da65c642224db454433161ebd125125 SHA512 17c4f9573ab540604b64d1ca6cd2193afe3f2dd99898f166ac4e4c7a980d336b5fd3b16acda85c3576b4848e8a81a9cda9d5c679ed819dfb48c1062a5dcdfae3
+EBUILD cbindgen-0.25.0.ebuild 1489 BLAKE2B 84346fe129bde82bc2973b6d6180c20e21664207fe8bd1eed62c0c9eb5c0f9b4d97897d628f8c30baa4558ac1e465427358d79802c001f1e015a5469373e7d23 SHA512 233866e7ce66e55b1d350852df097e6f982ed292e7793a0af6a45ec571d81e43ad730d008cd7a1248abefd27c89be7efcab16eb3ebaad081a45c6f49a19eb64b
 MISC metadata.xml 336 BLAKE2B e2c5a91f198a9d49aabefa764c9a15e132c94819daf2d6282bfa883b00bc2ff69b6a475ac7739f3546afeb169d69fadbaff28803d9969f9b74fe8fead3d1e4d0 SHA512 92bd73dc605d28ff19c4b74ba3c499054d75a11dfdc3a25d4de6fd016e4d6683659eaf0459a1ed5227af2d919b876508c6da32635776a0be1b4cdefbc7f8bd27
diff --git a/dev-util/cbindgen/cbindgen-0.24.5.ebuild b/dev-util/cbindgen/cbindgen-0.25.0.ebuild
index 76a483173dd1..80a829420285 100644
--- a/dev-util/cbindgen/cbindgen-0.24.5.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.25.0.ebuild
@@ -26,7 +26,7 @@ CRATES="
 	os_str_bytes@6.5.0
 	parking_lot@0.11.2
 	parking_lot_core@0.8.6
-	proc-macro2@1.0.58
+	proc-macro2@1.0.66
 	quote@1.0.27
 	redox_syscall@0.2.16
 	remove_dir_all@0.5.3
@@ -54,11 +54,11 @@ CRATES="
 
 inherit cargo
 
-DESCRIPTION="A tool for generating C bindings to Rust code"
+DESCRIPTION="A tool for generating C bindings to Rust code."
 HOMEPAGE="https://github.com/mozilla/cbindgen/"
 SRC_URI="
 	${CARGO_CRATE_URIS}
-	https://github.com/eqrion/cbindgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mozilla/cbindgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 "
 
 # License set may be more restrictive as OR is not respected
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 57430e6c88b4..06132dd6d6cb 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,6 +3,8 @@ AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb5
 AUX valgrind-3.20.0-gcc-13.patch 1181 BLAKE2B a7cdca7b99e822444ab3c453efba979a341c31ad0882a8a8232ba96af4ccc94277b142a833435afc911b06b743c5bc6e7bd126b7f65246308147130ab0ee86c4 SHA512 c4d14851f7ea41d8b3f8391f3e2c0fd72afae0944594d126bf2d3dbbf65fd3cd5fdf5303c4b7b3f40c5fe48f0e965dcd6265d268b8e3483c9354ede8e5c53af5
 AUX valgrind-3.20.0-musl-interpose.patch 904 BLAKE2B c2f3e1942bf1a713c993d63ee7e69506feed7dd0c34b906b3b65fa065ea9fff081c49b8ed4341f3f48350b22235bbc0896ebf099a5ea211fe9d502efe899851e SHA512 74a2f29a68ff5d7c10d829469302946982c2ff558f5a9b08d0f6e74a5e73a713461838469efc11b5bf93212d67f9e2922aed3c6f7d772bb037eeb461f2cc6729
 AUX valgrind-3.20.0-tests-clang16.patch 715 BLAKE2B d81ca99227e8175d9ab4ad5e6c706e5033d25527ac9ff7fe784cfded3dd42783c0c27dfa7c97908cb50ce24d2b6ceecaa220e79fc6d77ac9e322ebf86ff2fd5a SHA512 e3d79c67d1589c6fdb26018b146ddf896aa19e5b45ce15ae6d6ef449c72c0ba151c2903e6600ae33a7f76205562f094fbe5d4ed3370ded87d2216d25b5b62b23
+AUX valgrind-3.21.0-glibc-2.34-suppressions.patch 4800 BLAKE2B ea36d61be93ca26b301f78bd4f1ea8b7f6769253101858bf27ae5ffddef5375ed1c0627ec648b7310e43a9546ae2a3c0c28ec4e6e6947e68ab8a2f0b0fa0fe27 SHA512 c21d0b7dbe91683669e92cc9f93d0912987b5b241116df08a48eaf422d9961f2c83398a2d8610c22d8cbf5bddf6f1ab8e08c3cdd1ed77b51269f3584cd8a2622
+AUX valgrind-3.21.0-memcpy-fortify_source.patch 1058 BLAKE2B df5e131dd7c01f0d7cf0b2c5b3ed484d1cebf34fd8f5ae10d37aea36e17903db9f243ccf35962c7b1da225cb8b413810911eae55eddadd5aeaafef3afb2d5f56 SHA512 e52233d187c7594773e00d1531b4488c684e8764b715ea0ec7ec24380c4ac8c1ddf104eb35eb3cc0fdc5f301a1365989bb0f1690b25947935e7c9247364d3c2d
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
@@ -10,5 +12,6 @@ DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd
 DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba
 EBUILD valgrind-3.20.0-r2.ebuild 4300 BLAKE2B a7c9b1f23d8e84375846633c1f91e48cf12ac40b9238b2f0d0edd3500c28706837ec1733f7c81e81c2469ae444e8153ea64670c1612e696205629171d3578019 SHA512 7ad54251e9ae5ac05dbb7bc5d59113d7c74cd3a98e1085e6c907672fde857ce2f5acd4ce02aa616db3e4aada01ad3e0923d5695b7e14623e3537dc316b27f823
 EBUILD valgrind-3.21.0-r1.ebuild 4087 BLAKE2B 3e615ab2b642809cef8220734be89fd63b42bf33e725e28c6b9095f8f0b0036d072904447b8b8be3b42c3f7279c63baeb2398e034e4e414aadb399c2b3d9af1e SHA512 69a47d9c01df9f2e94a91dc7de85dfa11d0dd2d291682d607236c8f0de7cbc91c45a41c269ada95e8d341aafa0fbac83556219a0b0e593104ea27d5ed10cdb65
-EBUILD valgrind-9999.ebuild 4154 BLAKE2B a97cfa84b586051f943d3793ae227aa077e197da9c645bacabdb79daf061af5fee000e63d5c7766cc79c10458db240e26160384c07ca6883fee80d84a89c8ed0 SHA512 6ef312def3f5cebe6c60950fd7bd56699c1c9ad29c9deed138f90b2774dde7fc329c83c6fed66607d60fa1fe01a4534aca54864e7b0eaeb1cd0585904cd9498e
+EBUILD valgrind-3.21.0-r2.ebuild 4459 BLAKE2B a7fa39fdcd43d30a396101eb073b05ba7e3c92c6f04eae0c63f9d2782742e3929d80aa77aceb7d887a862dc0f0491f0d8e671996270a371a1b40b414ee123e7d SHA512 5814b127f0a5870297056f07914a74dec21a50892ede7be5a730f255394578a15a99b888d053981277e2bc04b39ac92ec1467146fd729f77c6735f69358e74ae
+EBUILD valgrind-9999.ebuild 4522 BLAKE2B 496c4eb8913b525876b5e16b9a27746163ef0c20f9face4582a770d5f6fb198f06e5ed1f0c7c8dd74242f06ae6500dd9a6c70e8af3c4f3a19ba685798fad876c SHA512 91c7b93e69d1a7c8cab4b202999415a19949605493400cb545156ea2b2c6d3648f8854d592be437a2b138230c0d405e7dfca9b01bee1a781b372075544033711
 MISC metadata.xml 1037 BLAKE2B b39708a006ad3ff24b100c702382ec8c45f6e300f3497ccd06199a6195abfa936c8f71ebd3223e0f7299e6644e378ef1d8d2c95a23059b66757d8a91bcbfce15 SHA512 4398f60fdacedbd92881dea016e60c5def5abe8989b56fc450b71b5c65b0d9c26a44b8ee89d0dcb71ab376d987c8e22d12031e9fb2a17b126e3223adb12e0f2f
diff --git a/dev-util/valgrind/files/valgrind-3.21.0-glibc-2.34-suppressions.patch b/dev-util/valgrind/files/valgrind-3.21.0-glibc-2.34-suppressions.patch
new file mode 100644
index 000000000000..c4111326cfa2
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.21.0-glibc-2.34-suppressions.patch
@@ -0,0 +1,197 @@
+commit e04914e10126d3a8de13302e958bbfd5e83a6637
+Author: Romain Geissler <romain.geissler@amadeus.com>
+Date:   Mon Jan 30 16:09:47 2023 +0000
+
+    Fragile temporary fix for https://bugs.kde.org/show_bug.cgi?id=464671: avoid using @GLIBC_VERSION@ with our recent toolchains.
+    
+    This is fragile as it might a bit too many things (especially ld*.so, which maybe shall be written "ld-linux-*.so" to be a bit more robust)
+    and also it doesn't work for glibc < 2.34.
+    
+    Ideally something similar to GLIBC_LIBC_PATH shall be introduced for ld.so and libdl.so, so that
+    it covers both glibc < 2.34 and glibc >= 2.34.
+
+--- a/glibc-2.X.supp.in
++++ b/glibc-2.X.supp.in
+@@ -39,74 +39,74 @@
+ {
+    dl-hack3-cond-1
+    Memcheck:Cond
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld*.so*
++   obj:*/lib*/ld*.so*
++   obj:*/lib*/ld*.so*
+ }
+ {
+    dl-hack3-cond-2
+    Memcheck:Cond
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld*.so*
++   obj:*/lib*/ld*.so*
++   obj:@GLIBC_LIBC_PATH@
+ }
+ {
+    dl-hack3-cond-3
+    Memcheck:Cond
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld*.so*
++   obj:@GLIBC_LIBC_PATH@
++   obj:@GLIBC_LIBC_PATH@
+ }
+ {
+    dl-hack3-cond-4
+    Memcheck:Cond
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld*.so*
++   obj:*/lib*/ld*.so*
++   obj:@GLIBC_LIBC_PATH@
+ }
+ 
+ {
+    dl-hack4-64bit-addr-1
+    Memcheck:Addr8
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld*.so*
++   obj:*/lib*/ld*.so*
++   obj:*/lib*/ld*.so*
+ }
+ {
+    dl-hack4-64bit-addr-2
+    Memcheck:Addr8
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld*.so*
++   obj:*/lib*/ld*.so*
++   obj:@GLIBC_LIBC_PATH@
+ }
+ {
+    dl-hack4-64bit-addr-3
+    Memcheck:Addr8
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld*.so*
++   obj:*/lib*/ld*.so*
++   obj:@GLIBC_LIBC_PATH@
+ }
+ 
+ {
+    dl-hack5-32bit-addr-1
+    Memcheck:Addr4
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld*.so
++   obj:*/lib*/ld*.so
++   obj:*/lib*/ld*.so
+ }
+ {
+    dl-hack5-32bit-addr-3
+    Memcheck:Addr4
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld*.so
++   obj:*/lib*/ld*.so
++   obj:@GLIBC_LIBC_PATH@
+ }
+ {
+    dl-hack5-32bit-addr-4
+    Memcheck:Addr4
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+-   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld*.so
++   obj:@GLIBC_LIBC_PATH@
++   obj:*/lib*/ld*.so
+ }
+ 
+ 
+@@ -124,7 +124,7 @@
+    glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
+    Memcheck:Cond
+    fun:index
+-   obj:*ld-@GLIBC_VERSION@.*.so
++   obj:*/lib*/ld*.so*
+ }
+ {
+    glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
+@@ -136,7 +136,7 @@
+    glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
+    Memcheck:Addr4
+    fun:index
+-   obj:*ld-@GLIBC_VERSION@.*.so
++   obj:*/lib*/ld*.so*
+ }
+ {
+    glibc-2.3.5-on-SuSE-10.1-(PPC)-3
+@@ -149,9 +149,9 @@
+ {
+    glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86)
+    Memcheck:Addr4
+-   obj:*/lib/ld-@GLIBC_VERSION@*.so
+-   obj:*/lib/ld-@GLIBC_VERSION@*.so
+-   obj:*/lib/ld-@GLIBC_VERSION@*.so
++   obj:*/lib/ld*.so
++   obj:*/lib/ld*.so
++   obj:*/lib/ld*.so
+ }
+ 
+ {
+@@ -168,9 +168,9 @@
+    Memcheck:Param
+    socketcall.sendto(msg)
+    fun:__sendto_nocancel
+-   obj:/*libc-@GLIBC_VERSION@*.so
+-   obj:/*libc-@GLIBC_VERSION@*.so
+-   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:@GLIBC_LIBC_PATH@
++   obj:@GLIBC_LIBC_PATH@
++   obj:@GLIBC_LIBC_PATH@
+ }
+ {
+    glibc24-64bit-padding-1c
+@@ -180,7 +180,7 @@
+    fun:__nscd_get_map_ref
+    fun:nscd_get*_r
+    fun:*nscd*
+-   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:@GLIBC_LIBC_PATH@
+ }
+ 
+ 
+@@ -199,18 +199,18 @@
+    Memcheck:Param
+    socketcall.sendto(msg)
+    fun:send
+-   obj:/*libc-@GLIBC_VERSION@*.so
+-   obj:/*libc-@GLIBC_VERSION@*.so
+-   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:@GLIBC_LIBC_PATH@
++   obj:@GLIBC_LIBC_PATH@
++   obj:@GLIBC_LIBC_PATH@
+ }
+ {
+    X11-64bit-padding-4b
+    Memcheck:Param
+    socketcall.send(msg)
+    fun:send
+-   obj:/*libc-@GLIBC_VERSION@*.so
+-   obj:/*libc-@GLIBC_VERSION@*.so
+-   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:@GLIBC_LIBC_PATH@
++   obj:@GLIBC_LIBC_PATH@
++   obj:@GLIBC_LIBC_PATH@
+ }
+ 
+ ##----------------------------------------------------------------------##
diff --git a/dev-util/valgrind/files/valgrind-3.21.0-memcpy-fortify_source.patch b/dev-util/valgrind/files/valgrind-3.21.0-memcpy-fortify_source.patch
new file mode 100644
index 000000000000..87acc9ff9f55
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.21.0-memcpy-fortify_source.patch
@@ -0,0 +1,26 @@
+Avoid false positives w/ overlapping memcpy args with _FORTIFY_SOURCE's
+memcpy_chk.
+
+https://src.fedoraproject.org/rpms/valgrind/raw/rawhide/f/valgrind-3.21.0-no-memcpy-replace-check.patch
+https://bugs.kde.org/show_bug.cgi?id=402833
+https://bugs.kde.org/show_bug.cgi?id=453084
+--- a/shared/vg_replace_strmem.c
++++ b/shared/vg_replace_strmem.c
+@@ -1128,7 +1128,7 @@ static inline void my_exit ( int x )
+    MEMMOVE_OR_MEMCPY(20181, soname, fnname, 0)
+ 
+ #define MEMCPY(soname, fnname) \
+-   MEMMOVE_OR_MEMCPY(20180, soname, fnname, 1)
++   MEMMOVE_OR_MEMCPY(20180, soname, fnname, 0) /* See KDE bug #402833 */
+ 
+ #if defined(VGO_linux)
+  /* For older memcpy we have to use memmove-like semantics and skip
+@@ -1714,8 +1714,6 @@ static inline void my_exit ( int x )
+       RECORD_COPY(len); \
+       if (len == 0) \
+          return dst; \
+-      if (is_overlap(dst, src, len, len)) \
+-         RECORD_OVERLAP_ERROR("memcpy_chk", dst, src, len); \
+       if ( dst > src ) { \
+          d = (HChar *)dst + len - 1; \
+          s = (const HChar *)src + len - 1; \
diff --git a/dev-util/valgrind/valgrind-3.21.0-r2.ebuild b/dev-util/valgrind/valgrind-3.21.0-r2.ebuild
new file mode 100644
index 000000000000..59d9e5a4d678
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.21.0-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# The Valgrind upstream maintainer also maintains it in Fedora and will
+# backport fixes there which haven't yet made it into a release. Keep an eye
+# on it for fixes we should cherry-pick too:
+# https://src.fedoraproject.org/rpms/valgrind/tree/rawhide
+
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="https://valgrind.org"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/valgrind.gpg
+	inherit verify-sig
+	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-valgrind )"
+fi
+
+PATCHES=(
+	# Respect CFLAGS, LDFLAGS
+	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+	"${FILESDIR}"/${PN}-3.21.0-glibc-2.34-suppressions.patch
+	"${FILESDIR}"/${PN}-3.21.0-memcpy-fortify_source.patch
+)
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	default
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	# -flto*                fails to build, bug #858509
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	filter-flags -fsanitize -fsanitize=*
+	replace-flags -ggdb3 -ggdb2
+	filter-lto
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	# See README_PACKAGERS
+	dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/*
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if libc (e.g. glibc) does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc. See:"
+	elog "https://bugs.gentoo.org/214065"
+	elog "https://bugs.gentoo.org/274771"
+	elog "https://bugs.gentoo.org/388703"
+}
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index a32a0da1588d..35e98ebeba1d 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -3,6 +3,11 @@
 
 EAPI=8
 
+# The Valgrind upstream maintainer also maintains it in Fedora and will
+# backport fixes there which haven't yet made it into a release. Keep an eye
+# on it for fixes we should cherry-pick too:
+# https://src.fedoraproject.org/rpms/valgrind/tree/rawhide
+
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
@@ -32,6 +37,8 @@ PATCHES=(
 	# Respect CFLAGS, LDFLAGS
 	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
 	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+	"${FILESDIR}"/${PN}-3.21.0-glibc-2.34-suppressions.patch
+	"${FILESDIR}"/${PN}-3.21.0-memcpy-fortify_source.patch
 )
 
 src_prepare() {