gentoo auto-resync : 31:10:2023 - 21:49:19

44 files changed, 292 insertions, 221 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f266fb93ffb7..1382dc817a91 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index dd5b567c3974..e859355b3757 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -4,6 +4,6 @@ DIST astyle-3.4.9.tar.bz2 229873 BLAKE2B f698ec0f3447caf64f324760f9d9feabeb9588f
 DIST astyle-3.4.9.tar.bz2.asc 488 BLAKE2B a5ed720e7c87f3603ba514e0fd15fb3a6687d913ec6cb41323aa5b1b38e76ac4ece310307ad23f8ba4c5d3e7b0cc00b78684d0c219fc50cd9e5db9c327c4f04b SHA512 b9f18e2c20b431b98859b996c52b31edbd9368d3a7ada1324f3139984f5480af860981f3b72802f548f2a73e53232f35fc2256a8a3eb7cc6a31685921682d9e4
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
 EBUILD astyle-3.1-r2.ebuild 1891 BLAKE2B fea27eafaf14eaf1245a87a873dbfa327a23987468a291a9bf8de1af50d57f168143ae94b6dfb8dadfdf121ee3fc13f6efd90656962bd866093e27c2477544be SHA512 ecab4c77e646ee8dd2f174e50e8b5c3af9a077b1c1ddfac4ab05ec56e1b83e82ff7f8053d3f52454c282a9f545a470ba2caa2f1786956a26514b6f0adb988fe7
-EBUILD astyle-3.4.8.ebuild 2148 BLAKE2B 2a8f138ef3118aa31255267024ca77cc365ae6800afb624cae03ce0c33c592ac2e4553ccdb48a180f94785615d24acad990f007f15dab4406a293baedc8f7552 SHA512 8a87d6ddf39ffe8cde711b687518d5140e45ee0994a14071279a7cd83e59329e9d8ab87a662c07cc5e217ce21ec1a1b7ca41b372402761058b6c240e6cff8269
-EBUILD astyle-3.4.9.ebuild 2148 BLAKE2B 2a8f138ef3118aa31255267024ca77cc365ae6800afb624cae03ce0c33c592ac2e4553ccdb48a180f94785615d24acad990f007f15dab4406a293baedc8f7552 SHA512 8a87d6ddf39ffe8cde711b687518d5140e45ee0994a14071279a7cd83e59329e9d8ab87a662c07cc5e217ce21ec1a1b7ca41b372402761058b6c240e6cff8269
+EBUILD astyle-3.4.8.ebuild 2138 BLAKE2B 4cc5c392792fd5fd0db75691ccc0df1f554713c8928307fa9484b522065f975b1a6bae5d6884fdec628dce32e89b777c752471f4f7ef41d2369c7049f58cb524 SHA512 95d162cf7f9f2bb467fc653820978df60a58bac4a3e540444be7208574cf52ac4ca4bcc07c7f7d98477ff9908367bc1b4a162e3e56bd6a451dda817e72cd3da8
+EBUILD astyle-3.4.9.ebuild 2138 BLAKE2B 4cc5c392792fd5fd0db75691ccc0df1f554713c8928307fa9484b522065f975b1a6bae5d6884fdec628dce32e89b777c752471f4f7ef41d2369c7049f58cb524 SHA512 95d162cf7f9f2bb467fc653820978df60a58bac4a3e540444be7208574cf52ac4ca4bcc07c7f7d98477ff9908367bc1b4a162e3e56bd6a451dda817e72cd3da8
 MISC metadata.xml 807 BLAKE2B dfd2069298224cf105959f5ee459cde21c66816860ae56591c91d2bea7630c96223361831bbd5f3d36bf2af24d014ac342705f89c21e29e9fa1fa8eea7d8bc53 SHA512 202bd7a541e3d61dbbcae8c23fc7197def7eef8b1cd91b48af8894787d1876651796aea7d191c85ee7ddd9c297912b5b035c5b777ee797dae66ac0cf1d307b6a
diff --git a/dev-util/astyle/astyle-3.4.8.ebuild b/dev-util/astyle/astyle-3.4.8.ebuild
index 126f56e4b4a4..d3e03051a1bd 100644
--- a/dev-util/astyle/astyle-3.4.8.ebuild
+++ b/dev-util/astyle/astyle-3.4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/andresimon.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
 inherit toolchain-funcs java-pkg-opt-2 verify-sig
 
 DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
diff --git a/dev-util/astyle/astyle-3.4.9.ebuild b/dev-util/astyle/astyle-3.4.9.ebuild
index 126f56e4b4a4..d3e03051a1bd 100644
--- a/dev-util/astyle/astyle-3.4.9.ebuild
+++ b/dev-util/astyle/astyle-3.4.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/andresimon.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
 inherit toolchain-funcs java-pkg-opt-2 verify-sig
 
 DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 8b71c9f9f07b..6ce33878df13 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -2,6 +2,6 @@ DIST bcpp-20221002.tgz 151426 BLAKE2B 6978b30ca684ec5e9eb781955679d333e7efdb389a
 DIST bcpp-20221002.tgz.asc 729 BLAKE2B 64a211fb84ac6ca2926cb54b06945a908bb19ef15fb8784f4201b29dbc1ebe1be85e8bb0d05d14ebde126508cb33bb9e2d2411fa54b1290246263829d1f4f7f0 SHA512 867b2c04c957daff028a0eaa14ce2c7fd8718dbe9a9af5bf46b293ce51a0a49f823b18978f10f77b7363ff62691683e2945d0d71280185386f19dc7f1cc883d5
 DIST bcpp-20230130.tgz 155972 BLAKE2B f51ae04ef75125d2040f9ef2ab9fb5513ad83fc6095b85bc091bf109d43b066723743c02f703b90f5d4faeb368da86d611d9ce46237c10e31b861b473de49282 SHA512 1fd22707313c098ac2a338425029d2c6355e9042b9bba3d2a6c8d4315dc59a33ea1bfc0cf30671ab2eb1c05981c4be5313a20d357bbbbb4f14374772253b4c30
 DIST bcpp-20230130.tgz.asc 729 BLAKE2B ffd6266919c8598067b09ac9f855c3b1d93dbd4d6536dbd68a12ccbc5f8cc62e10315e44376fc72d40881e43dfa51676a1af46400aed66bf4c2ac1d4a17b499c SHA512 b52cfa95115726ec7b9575ef8a813fc5d1eb8dc7083b19508d5058b80d41203e70d3cd61a18eea4f35755f77e92ce15c2a1f24db0befb3b62dab3b71065a3955
-EBUILD bcpp-20221002.ebuild 1157 BLAKE2B 405d8ca7ffd8dc04148b75824dcae7d68f200c79ff9fc357704b6eac62a11402be26ad066bd5e1382df8f1a6921535c12ffa4922631e8550e03daaee8fa37a59 SHA512 466d468ea8faa18b5b1754427c250f772f1450c1e1feed9b9f36b4e24f3f1c01e0b68f1ef0fd551386d638ce9929884f821531a8a92606555c61e77de92caad5
-EBUILD bcpp-20230130.ebuild 1157 BLAKE2B 4d96ba3ec14bfc44e341be5b7ac1352785b3e9b733eeb882347dd4128bb1df2144081e4fb9c9ca12f371a02169978334c9805885de3992dcc491b23ec6e76a1a SHA512 6f35e7e77042b6dc761a4a82597bfb6f96c0b31017b2d88c8c5827ebaa922266b49719702d1acbccb7986c05420905907f04bab6ed7b1c20a14371509e3e0f76
+EBUILD bcpp-20221002.ebuild 1147 BLAKE2B 360ee828f24246357d4044eab88d6008af981c161699b492edae1e7e44e7b881e34c4a75dc5576151fffd4013d7b3170e74328dec5b9a99975d7b5d61d71ef72 SHA512 fa71cc44db2176a662a39be65fd43f37bf303151aa846ffd3e9fbd5ff952e6f530d411669cb8dc3002a58d26a6fa18c48824822d9b4e2ab2cabd873dc5a7c0cc
+EBUILD bcpp-20230130.ebuild 1147 BLAKE2B 360ee828f24246357d4044eab88d6008af981c161699b492edae1e7e44e7b881e34c4a75dc5576151fffd4013d7b3170e74328dec5b9a99975d7b5d61d71ef72 SHA512 fa71cc44db2176a662a39be65fd43f37bf303151aa846ffd3e9fbd5ff952e6f530d411669cb8dc3002a58d26a6fa18c48824822d9b4e2ab2cabd873dc5a7c0cc
 MISC metadata.xml 327 BLAKE2B 98cfc008c1157e6c7bf26938ee9cb85afed7b4ca15f625a6bfb4f10a4a7ec9b7ad101c38c6b5bde51ac8ff8f6ebc15ca0cdd2903db65f1d691c13f534f5783e1 SHA512 ebaa5a7e3f02bc91337c50366007ffb65ef5a8a5604c43872d3a45f50a372adca5ac279b84309e3045fd34b81d0a9a138d2f73141955e15f0e827a42fab70673
diff --git a/dev-util/bcpp/bcpp-20221002.ebuild b/dev-util/bcpp/bcpp-20221002.ebuild
index def3e0f75a50..cf6014812594 100644
--- a/dev-util/bcpp/bcpp-20221002.ebuild
+++ b/dev-util/bcpp/bcpp-20221002.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Indents C/C++ source code"
diff --git a/dev-util/bcpp/bcpp-20230130.ebuild b/dev-util/bcpp/bcpp-20230130.ebuild
index 519db7f27f84..cf6014812594 100644
--- a/dev-util/bcpp/bcpp-20230130.ebuild
+++ b/dev-util/bcpp/bcpp-20230130.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Indents C/C++ source code"
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 578abee57843..7d56a5ba9e32 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,4 +1,4 @@
 DIST byacc-20230521.tgz 905214 BLAKE2B daa48f0aed1f3e2d7aeb4cb51551a7528fe1ad043f0e10191fe553ab29c454aeb1f5705a76479517fbf939ccb3775a2f19c47b5ed02cd007519064f01c112a16 SHA512 9437806510f49a785ab7d4685c56708cd0053d242f1491e9c40af36112d6c6c471e579a75da75980a0356c1c9f319afbb8cc01139d6823511d285e0dd413d9c4
 DIST byacc-20230521.tgz.asc 729 BLAKE2B 493e2d775e927981175d8bde4e9e152b16e8471bddab5b2a5a6d9c7785f873b9b238bb303f386a06e17ac991485d526800ebf1e6e6b811476e66dbf91887a741 SHA512 952adc16913d058c78398caaecb8ea69472127b759f2a62090cc0b43a168884458d02e2f2f13c0b3aa277ead784b0fabd02fa1b2cebe249bc7d91c7ee24ec049
-EBUILD byacc-20230521.ebuild 874 BLAKE2B a1ca7407edc54b202e76ca677ef39c2559a4f30950628a99512db5eafeb587d710e553e18a9116c109cb463a13800023be73e036f3a0b600b0e341f02d7e994a SHA512 9a9c64b418b0bede57704c6e5f6bc2c161850b920273928c42c9079334bc9fea936e6c911642c535dbfaef7b5e968948a37f4b192fa442b68e5c56c21195fba3
+EBUILD byacc-20230521.ebuild 864 BLAKE2B 34680ff98ecbaea087ae0830abc572aac3c81b3d74d2d0336d4621a4646c2efef0cf64d8f0f73ba905471c8fa931dfcd6df7168194ec0cd6e08acdf62b54fa25 SHA512 2501760cebb6ea47fd3089b93aa34cdd21687190d76b8ee53e9e72cfb2de3412a159375c6182167fe7c2daabbdb99752f1b3f8d9ab8681aac94011c5b48cadb7
 MISC metadata.xml 424 BLAKE2B f7c1172e12c784d254658b3743db6fec9d6ef008891fe84114c71c1d0edf24a37f00ad61a1705716bbaf6c912b763756995185f2cffd95c831b8ca57abec6d68 SHA512 8bbdcf35f0499db09f1d55d038d93f8c3aa516e0baa74ec078c7a3032d4885110530be47cdd309de1a44b8c92e6dca3f4353d3ff1d3da04b052d492c91549067
diff --git a/dev-util/byacc/byacc-20230521.ebuild b/dev-util/byacc/byacc-20230521.ebuild
index 1443f38c93eb..6a247f3f4053 100644
--- a/dev-util/byacc/byacc-20230521.ebuild
+++ b/dev-util/byacc/byacc-20230521.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="The best variant of the Yacc parser generator"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 7505c0921cae..a9d9253e6807 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -10,7 +10,7 @@ DIST ccache-4.8.2.tar.xz 560888 BLAKE2B ca907c16b353fabfb8e6479a076aa5cf791e6150
 DIST ccache-4.8.2.tar.xz.asc 833 BLAKE2B ea92ceaf9873a1a8373414bb7ad74f101873cbf3bae2ba1c6986d40018b8f37d2fd7cab8d0bcbdfb7cbd167edf0128edb2a6d61ecce2645018a01d450aae25a9 SHA512 6182b7a793d5142c1d9d627b6ea058ac524b6914a85d9628788f7eeea7b762c5422ef6007c404fe9b5d77841b69382289ffb6efbf931c9507940c10bee8ff95f
 DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f SHA512 e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
 DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726 SHA512 2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586
-EBUILD ccache-4.7.4.ebuild 2489 BLAKE2B c96ba952f7f90c54812fcc1ead1bc4adf7b036937b2d80a05c0bebc54cdf3cdaac456e8918b6f4905cb38c19aa98d9c912624d22bfd76c0ae35d32e8c7cea6dd SHA512 90802b6ff902bb7cced6947824d38ea90bf8da66b48dec9cc7f1584193f4fb3f4d50217685306e1504118a55a46c6680f27b6a59368c835058171ef33f772e4b
-EBUILD ccache-4.8.2.ebuild 3690 BLAKE2B 7313f411c41f78b049c9432885f5922aac4678e736e5cb0527f3556a310690390e0e6b9e9b8bba65ab898352c27cde52fed35bb3a04ea60c937c523c6b11c913 SHA512 91861f7cdcfc4fb207d80b357298d4cbee65ed80c85de931ae74147ea23e9a8f7f6168a8b6dc7fc06f5607fd480c94a89ea7356b8de26b87b6334b251a8f5597
-EBUILD ccache-4.8.3.ebuild 3783 BLAKE2B 6d712601070506130b50b51424e65ffa00f92a449abbbd72f97e803cb0e491e8f0da21c5195c58c04e4a81d4b85d4b5d5a36dc2c49a32ae49af742e75b00b179 SHA512 a97e990cb37d9ed86b8e164ea380249cceddc2ed736144ca730f8dbd1fc303f32d95639cbbf2d91b88398889ceaef670a1e427a239ae67000d179af496810717
+EBUILD ccache-4.7.4.ebuild 2479 BLAKE2B 829ce214d1cae3d43a36edcfcc00a9715e10ad46c1f8da206be588f55a776af7040b632c61d83640126337a53b4008f24f75bf80892e20bfcc8d104c1bd38722 SHA512 565514f1aba17ef8aa513cece8615f322e3c84ad35647fe213ec156aed12d4546bf4a14fe1463e7dba3a4700beb1427ba2aff3c101f95f48bcbd118c41b8f2cd
+EBUILD ccache-4.8.2.ebuild 3680 BLAKE2B 1aeab0da8eb490d0f5b9b59695d2a4807fba6528b3a0d6c0744168c1b01aa5a8a4fa04a7cbe89a2f9cdb5b4e8cc618e1aa353e28b8a74a0da2c7fa4da0a300a0 SHA512 469ac7a2e107d919b3aea9b9acda541552b6bc9af0fe1f903377793bde0422964fcbe309048a4f8f821c76d1f45374056a1860afb9efe555c0d8dd95e7bd8fa1
+EBUILD ccache-4.8.3.ebuild 3773 BLAKE2B 621132ba86b434b41ad8dcd58fd9172a62201e192bc3be034dfaf400c42b094002d7631124ead5570162315dfc96cbeffe001b45e0936ca16cf35a75102c64ed SHA512 e8c304dac5ebd23412934b0fc01d4d2bb0b179f7b20621209aac5d3c98861c36280d314538c5baf2a66d16dc3e936df4dbaa6122e14ec7adc127662f5341aae2
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.7.4.ebuild b/dev-util/ccache/ccache-4.7.4.ebuild
index 12144ebf5f86..10b421bb1cec 100644
--- a/dev-util/ccache/ccache-4.7.4.ebuild
+++ b/dev-util/ccache/ccache-4.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
 inherit cmake toolchain-funcs flag-o-matic verify-sig
 
 DESCRIPTION="Fast compiler cache"
diff --git a/dev-util/ccache/ccache-4.8.2.ebuild b/dev-util/ccache/ccache-4.8.2.ebuild
index 9bc2873389e3..fbbc909e5d51 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -17,7 +17,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2)
 # See bug #784815
 MY_DOCS_USEFLAG="+doc"
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
 inherit cmake toolchain-funcs flag-o-matic verify-sig
 
 DESCRIPTION="Fast compiler cache"
diff --git a/dev-util/ccache/ccache-4.8.3.ebuild b/dev-util/ccache/ccache-4.8.3.ebuild
index b514b4aee0cb..d89d4c4b2486 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -17,7 +17,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2)
 # See bug #784815
 MY_DOCS_USEFLAG="+doc"
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
 inherit cmake toolchain-funcs flag-o-matic verify-sig
 
 DESCRIPTION="Fast compiler cache"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2a2125147b46..3a2ed8fbda92 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -29,10 +29,10 @@ DIST cmake-3.27.6.tar.gz 10982239 BLAKE2B 1aa876c0c4601261de30fa7829726f9423f359
 DIST cmake-3.27.7-SHA-256.txt 1646 BLAKE2B 452413e7d2fe4eb8db96227e6b262bb540c8b58dbf9b34d07ecbc5ade69e76035940c82b643830086e09f113ba08271f271042a8e18b40478959f8f6010b081a SHA512 5f093ed51b10f530318c8b8205ff35f91443a71064008115eecce2f7e8393a3cb3b7dd1c35e5b7b58981c49b19ee708966321085a3237ec313a0865d26948e32
 DIST cmake-3.27.7-SHA-256.txt.asc 833 BLAKE2B 687dc73a61abbda26be24dfce98f617e032c3f5494c7e5bd12aa83e3b91f2cf87cd1b08e7cdc5465eef29d005dcc317c3550cf6d447a199e94bf756374b57262 SHA512 cf5a657d739f66daa515b1c49914aabe264bedc24a6e91a18c7959623fac42390b75dc74063587c84b4a365451d5176766d76868279a4db1826eca6b69a44965
 DIST cmake-3.27.7.tar.gz 10982558 BLAKE2B a20fac503ba54b4b7e85896056a614b67aa346ad2636e7ab1bf09a2660b92a52754485527f36101e59d47713e7445d27797577c1fa6a8ebe59acb4675227c6da SHA512 2e9b83dee8f8c012be4219ab74ebaa8b8438ea55d5204237a1c9feba94c732afe7baceddb9c681672903112b1e40f7b1a86b284cfceed15f46ce8f90143dbb86
-EBUILD cmake-3.26.4-r3.ebuild 8804 BLAKE2B fdb48b62ba66d6aa0f162bded4ef491f9476a6289ca61804eb18f328d8bafffbbb10f0134dfc8d10fb54032d3703444244d3ea7a62069505b2ee600a9b957e3b SHA512 faef92a7b8f1822c1df936e5bf89f533eb33d192dca09e140e157b6d4d8589ab73bb49189de998e91f53c4180e4c014e38b4d64bc5865a0c2d1e47dfc70a477d
-EBUILD cmake-3.26.5-r2.ebuild 8805 BLAKE2B 1da0302fa4bd402e226a898ba1f43daf22ca6ad6d9f29850c57729448b9c83f6f39866e2f07f043849306bcf4568a85203c3b35be915428b712238d639aff5cf SHA512 ddb5480a9deba4eeaba8ee57d5a712887525544b720908ce5a5c3dfb5eb49c347b86f6f08d4cb85d2dc9cfad161761092c59900dee875ad07666ef0bb821da4a
-EBUILD cmake-3.27.6-r1.ebuild 9132 BLAKE2B f1142e9c7425d65ef6ace05df14a1651d8c0ae968a24e2bc8265fe70f972495408e70352aea6bc7e1e5c329fa4730f11f37112c993974a9ceec14c4777e620cb SHA512 7035fa3e835c4a34e8fc92dd443d7817202efbf24f52a09f788bd6888ae65246d16d023260313f9cff37a253d4504b58d1c3db7a4a2fd20bbac2d88e5c4ecdd2
-EBUILD cmake-3.27.6.ebuild 9019 BLAKE2B e6b5634aa8c3f54dafc0df82d3f2ac3fc6220ca8034b8fbea516a8cf37a4ed3d2b7f99fa8c0fec06704e3fc237b6ade8f6f7af9db52c21b50eb549440b3c70dc SHA512 4930f6197e984e1d92de5daf777f62c7ec85d32672388af582f18ae3be0242eddaa170cef0a36db993415d23e4d2740df47a9f87e75ae705769eedf65e80617f
-EBUILD cmake-3.27.7.ebuild 9125 BLAKE2B 8693efb52d37845cac66267ae26c67a6b3a84238caebeee600f3cec01e3bbf7ecf3f674ef8bb5e489478e59a96cbb0ebccb99f4babb25536263a6bbe401cd4da SHA512 54cb98297df9d527f1b8a5083d33e9f98690baa6ad997e805b3bc882219685326aa989702c3d5900c2e39ade63323845884385a34781a589a23f833f789ea468
-EBUILD cmake-9999.ebuild 8947 BLAKE2B 083307c4486f18f6716658217634bef9854d2d955fe05bb43ec1168d728e09849337f146648002483a1efc7cb8353894794552528e9888a4f71874b6f5a915b1 SHA512 748622de8b1771ec7f5cc422b4de227cffcfdead272ea29f7999651cf9d445a84254e44968f23afb33d3ea514c890ff1b32a934810877912fe4e821fe6cffbc8
+EBUILD cmake-3.26.4-r3.ebuild 8794 BLAKE2B 982e137e469a24072c2f94f15bdddb4899c7d595ccf98cb72a7226bea8f87202c07d6e85329d59f53de58cad1e73a0eae885287f2e91f7c594520d269d08a463 SHA512 86e754256e8f19fac4b656a877555e9cd2d4c06f8e8d0bd84ecd3f944143adb65b8d526c8b300b8bee384bb9d40f35d330b7bd1d3922f5c34cefc2bb4e690f4e
+EBUILD cmake-3.26.5-r2.ebuild 8795 BLAKE2B c5d15b9c10766befa324beddcb54ae6eedbcfd4b19fd0930d0d8ea16e17c5229fa2379f6ce747de0f93d74eb9f9ef90f665f0b352856fc875aa85e3cd549f290 SHA512 02499b28af97b619ac17e6734393f1fde7a64bc1cb5de49ac4bcd3eb9128d3b1bd88737a277ec501f6b60bb3e0d4aad14d92e7e99514f8b561f45ae1de53dcce
+EBUILD cmake-3.27.6-r1.ebuild 9122 BLAKE2B 0ce77ab08f5fe9c7a9f3c8aa2534b39040b8de5d6e1204cc4720f6b3d1d19d85a00ae4cf3ae1be07fe446bcfa7cc572d1dc268459e2dcac93d7f6d627e939206 SHA512 d2edb5597fa8bd3e5a33242fab8797abba3ff59570a9ae04925591ee07c0b11af4a35be4558333ab7be83c514ef0d6a8e34ab4f78561465f0857a3af9d29cfe9
+EBUILD cmake-3.27.6.ebuild 9009 BLAKE2B 82b5995de0ecd5e8706135e37fe4b0fbee9741b392747fba00611596d772e8be355914a9d0fb8e864a1ab523c35c42993a42e7534dc3ae37734477acbe7f7217 SHA512 304cc1876385b5d664c5933898d1ac579cf00559c4da895b73d9fe1cf8aa5b6143f9020631a33bd4d98635f6d512635f89e465de5cfe9ef779bde3193103ee90
+EBUILD cmake-3.27.7.ebuild 9115 BLAKE2B 4b06a181740a16100ca101dd9f9e809476a62f615d33ca1fa2d81074fde90d5fc1e5ace9642c5bfae224bfbd450ab0efe0a0211fd4f91816141b7afcee969e90 SHA512 8cd6f0896498971ca640e25ace401c2b74bcb76b07d391b9ae6899e9c89d4492b3134c415b33389523f5e30bd326268e889265730d0f263f3ded810a68a1976a
+EBUILD cmake-9999.ebuild 8937 BLAKE2B 9fea7587c59cecfd5489081046ebb765f8cccec053f97be581d8f15f51de66e9297a239524fe6a9943353c68d5656a72521ba8cf8f9960e08df7a9729ec2bafd SHA512 18d9c8da0474731cf31119d6869041dd4d86d4493291a7bda185dfa0df346dab27fdeb39cd18528a7d7e0249c166b6add0a94e25b137e32513fa85df302d8ace
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.26.4-r3.ebuild b/dev-util/cmake/cmake-3.26.4-r3.ebuild
index a212680b12c1..e74b532f3b69 100644
--- a/dev-util/cmake/cmake-3.26.4-r3.ebuild
+++ b/dev-util/cmake/cmake-3.26.4-r3.ebuild
@@ -40,7 +40,7 @@ else
 	fi
 
 	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
 		inherit verify-sig
 
 		SRC_URI+=" verify-sig? (
diff --git a/dev-util/cmake/cmake-3.26.5-r2.ebuild b/dev-util/cmake/cmake-3.26.5-r2.ebuild
index 0f86727af214..0a5b408b8ee0 100644
--- a/dev-util/cmake/cmake-3.26.5-r2.ebuild
+++ b/dev-util/cmake/cmake-3.26.5-r2.ebuild
@@ -40,7 +40,7 @@ else
 	fi
 
 	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
 		inherit verify-sig
 
 		SRC_URI+=" verify-sig? (
diff --git a/dev-util/cmake/cmake-3.27.6-r1.ebuild b/dev-util/cmake/cmake-3.27.6-r1.ebuild
index b122058f45cd..cc2a3ce1d1a4 100644
--- a/dev-util/cmake/cmake-3.27.6-r1.ebuild
+++ b/dev-util/cmake/cmake-3.27.6-r1.ebuild
@@ -40,7 +40,7 @@ else
 	fi
 
 	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
 		inherit verify-sig
 
 		SRC_URI+=" verify-sig? (
diff --git a/dev-util/cmake/cmake-3.27.6.ebuild b/dev-util/cmake/cmake-3.27.6.ebuild
index b999a8475ecc..cea75f0a0909 100644
--- a/dev-util/cmake/cmake-3.27.6.ebuild
+++ b/dev-util/cmake/cmake-3.27.6.ebuild
@@ -40,7 +40,7 @@ else
 	fi
 
 	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
 		inherit verify-sig
 
 		SRC_URI+=" verify-sig? (
diff --git a/dev-util/cmake/cmake-3.27.7.ebuild b/dev-util/cmake/cmake-3.27.7.ebuild
index a0fdebab243d..1022ea4f8fb0 100644
--- a/dev-util/cmake/cmake-3.27.7.ebuild
+++ b/dev-util/cmake/cmake-3.27.7.ebuild
@@ -40,7 +40,7 @@ else
 	fi
 
 	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
 		inherit verify-sig
 
 		SRC_URI+=" verify-sig? (
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index f6edfcf41871..c13fb3391127 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -39,7 +39,7 @@ else
 	fi
 
 	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
 		inherit verify-sig
 
 		SRC_URI+=" verify-sig? (
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index c35e641ed604..051f48c1aa1b 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -4,7 +4,7 @@ DIST cproto-4.7u.tgz 183364 BLAKE2B 679cb2c41b396e363ebcf69c61c8b00448ddd27c4d11
 DIST cproto-4.7u.tgz.asc 729 BLAKE2B 4120151f5ffcaf42c1134e8998cd767aab58c4f09bf488186829d96bdc44266273e89b96e1bcad3b84d998ca3d82c4b1bc7d9213f11790853d9fd2f4d0a7c901 SHA512 bdaa60edf0a04e15f2de61398d118efced4c25849d8d2a326e2ad21cd296b73cb6a809933476fcbe7b4471b297368c8090b31e725a9ab3081e334a06c2282753
 DIST cproto-4.7v.tgz 193874 BLAKE2B 0fb13ac8f501b9111096666c54ccfa466fe7ecce6f26f7b62d72e12d19cd2f8dcef9ce37247018abe8ec4affc8c26f4d899e01f960c36b4cb7ee2239b11361fb SHA512 865d65a0db1198d4d07e8a9fba85e347a69d61530423feafae9b3a881606942279942af42ea67558ad2ae82926aaef76bd635913b3e00604eaffe82a8a6621fc
 DIST cproto-4.7v.tgz.asc 729 BLAKE2B 577ce738de30ab32099836041fe7b651764750eddee13135a9340410a50c0b46cf8034fb566d31748ea1db8d6d013e4e0c2abecc02d074a998828ce8b00d0fe8 SHA512 b0b03400b79aa04131bfe7176811dcb46cce05d339ab73552b787d9ade26a38e234f6c4f588e5a3cbe3a0521df73a6f7565a3a20181f3b677446ba9379ba8532
-EBUILD cproto-4.7t-r1.ebuild 685 BLAKE2B f51d024f8454f1c4af6a7cc8c602f6cf42f04d6aad04d9c7997518e38d8c66a54b458ec8e90ae13431a13111036b9992ba25eb4129b30d0c00b3fd1a1596608f SHA512 365f226b2d5bc23b1d75aba3f7b8c198d06db544da46e3cf00174bc01315ab44485a006b5ff22578d8402668c503aa7835696649390d4b8a6fa89ef2536ff19d
-EBUILD cproto-4.7u-r1.ebuild 713 BLAKE2B b4c25f8ff024b6570fc4b105fa84ecff5536ba24c5dd9dd3395641d93f3fe648ac482e860fb8041e86b760dc95336ee56f1b2ae86840817a22bcc529a9034b75 SHA512 e08d6bfea22bc18c028f6d7e82e4af0500a25afceccd33373376959e329e8a9b17e7550f1b2663fb542081c86de19c89180f1ea0de93f8e4826537645b87c5dd
-EBUILD cproto-4.7v.ebuild 741 BLAKE2B f611613a9cda3f109b0af6b6623b037fdcd3af71b004e884ea4bd4165485c7d556ed016336db128122407d4d3c20e97a6dff12056b16629aec0a7f7e778b7c88 SHA512 628948aecad291b64e01da5699138c0a3b3e273896cc62d176799e771e5b8ad9c1af35eed8e8a0f79e509b5cccea02fe1ac511e71630e80a1b02f40d078548d8
+EBUILD cproto-4.7t-r1.ebuild 675 BLAKE2B e4c1e1e7737c2d2754bba51c301fec35c4ce354b5a6feff86dad3816bf85dd7d33727080752ed30dfb47334833e566e47124b9f5a705935d52242c975cba9c02 SHA512 551e147882300103da25411d21e26a5eb093480f21b1e31cef153a40821f98aedc09519c5a463a784a1a16ec9519038d7606e7039a6473caa1f3d23905590e16
+EBUILD cproto-4.7u-r1.ebuild 703 BLAKE2B e3ff52e283cf2d727107a5de844575cd1991ba78c63116069e064d2bb95b0b862b908093a43263b9b40ea5e82480cd1d1dfdb87b9e593990e764b8f2179ba605 SHA512 ad8553d157ec6b1dea948138e6ea6d9fa7204fb1098b5d27538948889eed4d8d7a7973acc3d2d8c4dca77e0b735d7f9489e4c8715b6d060fb5cd93111a6eec55
+EBUILD cproto-4.7v.ebuild 731 BLAKE2B 957e04134860005ec3d03fbea5e0e2c8f8664959097034737c39990642f1805b98a8a8f2a67c4830b59191af465ba9ea799b3016a1ed5e6e94bac7a77a3d24ea SHA512 ec1e769c98c96723b2cfed59a82d1b2ba70a1e7b03fc9581c98280d2ee5f4650c3c8a8b1e75866db7815470f216e164c95dc5bdc0f5fb8c60c63553b2080d54c
 MISC metadata.xml 408 BLAKE2B 44cf79171b98215328ec22d1d07768d411832bf5c1bc652c59818b5687bd3a4ee99a6d06d875a9aeba323ef36c8e4c6bb5e191a2e048e4a0546f1cdce3b4db00 SHA512 5792884bc44d07930751c56997483ea9ef2a9543732230dddb22442c028b04108b9826bfaa959743f78a999b4d3e8882946b310f7591ef1ecd96dd908e63eefe
diff --git a/dev-util/cproto/cproto-4.7t-r1.ebuild b/dev-util/cproto/cproto-4.7t-r1.ebuild
index d03094dfc893..de48705f8f68 100644
--- a/dev-util/cproto/cproto-4.7t-r1.ebuild
+++ b/dev-util/cproto/cproto-4.7t-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Generate C function prototypes from C source code"
diff --git a/dev-util/cproto/cproto-4.7u-r1.ebuild b/dev-util/cproto/cproto-4.7u-r1.ebuild
index 81d598ac4fa1..782b8df79ffd 100644
--- a/dev-util/cproto/cproto-4.7u-r1.ebuild
+++ b/dev-util/cproto/cproto-4.7u-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Generate C function prototypes from C source code"
diff --git a/dev-util/cproto/cproto-4.7v.ebuild b/dev-util/cproto/cproto-4.7v.ebuild
index 9750b02e5cb9..f447e8f88879 100644
--- a/dev-util/cproto/cproto-4.7v.ebuild
+++ b/dev-util/cproto/cproto-4.7v.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Generate C function prototypes from C source code"
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 3ff2dd5f76ed..99f9778bee72 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -5,5 +5,5 @@ AUX debugedit-5.0-readelf.patch 13298 BLAKE2B 40a561495ea4186c9565482c73f24fc5df
 AUX debugedit-5.0-zero-dir-entry.patch 4172 BLAKE2B 8eddb4deb23304576df6730e4b5b517ea700c8be6d5b2617dc51cc27b975b07fbaccbe2ab656dff99287fdcd7f1f13dc8c3f3fc4378ef7edad26d83e8b688848 SHA512 f9f3a3db717033f7a4909d66d938051e525a6e6ebc238e898d54b503b9e4e99b068c04be4b57454fc188cfcd2cd56e2528875613c24da94ce5931a1b60942cb2
 DIST debugedit-5.0.tar.xz 164820 BLAKE2B 8e79f930a7e5c91709b1646794412836fff0b08da17a4b54beac4752a3f62c7418e3e8b8f7f3c3111ba375d6c672fee0f4279632bab3fb406a2fdd75a9e81a64 SHA512 7e7f529eafe41b53f0b5bfc58282fdbfa0dfa93ed7908b70e81942d6d2b6f80fc9c6bff2ed9674fd98947e5750b615f4c8b222544989e2900c5f8ff5ae0efb92
 DIST debugedit-5.0.tar.xz.sig 310 BLAKE2B bd8b092e400575fa62f759e4fd2e6bbfc9dbd77da2a363bd13c98b32794d515fbe7987824874b9c4be048e458c334bccb74082a78d845f07429b150083f2bcbf SHA512 2223841eb6c63616dc24028e8076ab9d82579e8d6efa4bba45e5dbd0eb181c947feae6f944136f3504a78678569ae96dc6c4a0dd4e7012bd9aa522b0f7525dc9
-EBUILD debugedit-5.0-r2.ebuild 1040 BLAKE2B 4b93b6fb7097b9ef524a5122507aa7df345d420585b26fc271b62459fc740ffe890df45399158826ab7de0528d1ee7388d4fcf4e014fd26008799378f2315982 SHA512 dd77bc8de92cef5c55df79e39499d90163807bc2a9669eed3d54fda565f61a8246e58aef35b86bf94eee984601c94fdccdb0606d2f4fce05943c705fffd00ab7
+EBUILD debugedit-5.0-r2.ebuild 1032 BLAKE2B 0cf6741b582a82a89568b76f06f544d206d8ba4794fecc545d2c839141af08b770062ffd44d7c22bce8001dcdf5f842bc0a9fdce4fca989aeefb677a6b28ed20 SHA512 8ea5845d684e330b954b2f21a8abb9425308beab629df2ef0df633922343473ff570e06bd208cb1838793c6a6c07b045d228f4780496009770970c7ad4b83072
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-util/debugedit/debugedit-5.0-r2.ebuild b/dev-util/debugedit/debugedit-5.0-r2.ebuild
index eef678585541..b32485c37b6c 100644
--- a/dev-util/debugedit/debugedit-5.0-r2.ebuild
+++ b/dev-util/debugedit/debugedit-5.0-r2.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	)
 "
 
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/debugedit.gpg
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/debugedit.gpg
 
 PATCHES=(
 	"${FILESDIR}"/${P}-readelf.patch
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 164a097e04fc..f1b5d6bbaec8 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -6,8 +6,8 @@ DIST dialog-1.3-20230209.tgz 573222 BLAKE2B eabca049a4a4c7ea8f2023534116bc173685
 DIST dialog-1.3-20230209.tgz.asc 729 BLAKE2B da27d94a4fe61ebcd1481f6b1bd750fe4c45db01153b059c7c329afcbb51c2f290b0a888e8c8b8bab65eb35fdcee6b8bb599fa9345eeea79ad2f298335528c21 SHA512 bac6a17614ca0798e2f52fc2635169e5256b7f3e970fe0a2693503d2fd6b618aae78f7a11bfdfb865e67f4f920c9597b3e8b050841f0b1454838ffcd4823e2a3
 DIST dialog-1.3-20231002.tgz 574625 BLAKE2B 7eed34a9aa5188046d0f86a5206209cda5cb2080fc8876b0b9f540c5ed79120c325a23769c4c28787da9792f3128587eea4903ab597847e8a9ba03f7cd7087fd SHA512 ac3fea3053699b5b6e359bbe62e0f6220232898af1a8199225f6002211fe2eb6de42a868e71471f740580f35e428542940a93f89fd74b61923d4fd111deb82dc
 DIST dialog-1.3-20231002.tgz.asc 729 BLAKE2B e670bad0ead62c2fd6c936f16ebe91423f56347c609c73e1664586469735e8907ce0bfa049d9014b5f878256e54848b517fb3f754c8791280f7760d415d5bbb2 SHA512 405d4a1a98dde1214844eadce8dda5ca4b6c185bfdb18b944e127b6c36f0331cd50316eb7e611f3f744204fac35b41dc2c8e17085a3829d1d45195c517e5a495
-EBUILD dialog-1.3.20220728.ebuild 1536 BLAKE2B fbdd5948331c59d85f60772d0e199200846f56d362dc6cfbc9e2dcfffcb4bf6020514b1e05b7ad2445801e95e68784a73cec347f96058f8239af06c5ecd22bf5 SHA512 932c0004bfa89dac2f4de3efa4020a43e7890b9952af31470c1b21887afa83bac775abdf756fda8b711648deb7d993934e222eceb08932bc7fdd63d5722b9e0a
-EBUILD dialog-1.3.20221229.ebuild 1536 BLAKE2B 51ef4d5c8aa14a5d7e6a7481bd18a99d31096444845787edaed0489709e148a9416387ec07a2c8809917099aa2e2098bc12250ef598c8e702edd6c627a16d6d8 SHA512 93fa4cb9f6d5f9f3bb0cfcfec53a526169617d5885315e2fe434d441bfd8d6d222254c2057dfd7023b09639bc5f9d6b60ce2d5c142eeadca06ff5af5f16a5071
-EBUILD dialog-1.3.20230209.ebuild 1554 BLAKE2B d4054454c1edee55dff7a391037a03f174888c877b48753ee8d6bfeba5e8b4ef51cf439e49c2462f948dfc1e8eba584bbbce2431147771e35f5f7e3b00bbb8a5 SHA512 8913ca74fe4eaa186ae20ce787b0ec0e81e413d42dc227fd0b978dcee8a14b750e776d0fcf84b0ffce8fde30b690dcb1b120fff5c9db738b6c833ed45ff0511b
-EBUILD dialog-1.3.20231002.ebuild 1562 BLAKE2B cfcf9eab004d87ea406c0c9ce1483ac0a0269bb8bef25460b7fb7f20fa5ce1422876b61542e5b30fe1b91088ffe3f98536353106f2ba842af060977e3226a047 SHA512 225961e5079a1c38832205a7c609b0e9faab5b7b3006deff80494a29e4cd7fed5e824544abc962abcb71b3c67796dae0ff91944b25de4094c7e00f22faa7cb4e
+EBUILD dialog-1.3.20220728.ebuild 1526 BLAKE2B 7e83b895acb0e99e7cf9c950278fc9c48ad33258923f0226e0d2e44fc6ab9f8287297d725568244541d31119cdd5981827cce502457f56f0b91154067c2cdad2 SHA512 2f3cf7f736c04eee04aae1d3d6fbe73e53ac705eb9f1e2744f678dbfdeafcefc06b71822a371c68333d7a3250f64029106e86529eac3849e73ff5e180d043f4a
+EBUILD dialog-1.3.20221229.ebuild 1526 BLAKE2B 7e83b895acb0e99e7cf9c950278fc9c48ad33258923f0226e0d2e44fc6ab9f8287297d725568244541d31119cdd5981827cce502457f56f0b91154067c2cdad2 SHA512 2f3cf7f736c04eee04aae1d3d6fbe73e53ac705eb9f1e2744f678dbfdeafcefc06b71822a371c68333d7a3250f64029106e86529eac3849e73ff5e180d043f4a
+EBUILD dialog-1.3.20230209.ebuild 1544 BLAKE2B ee3c4d6a1cd1de34d04417e74c6653402f072b591fa5b17241d9b92695d48ff3b0c776ce1832dc4d4d167a8535b6688649d4fc0d0fa2155f5862f7d36e33b1f7 SHA512 7d7a9c7b3887530dfe2b4843b173fed492fecc5ef1b4344a93936854c37ce6199ae6bd9c3bcbb608ac49edcaa3c6d41de9367bc0bd9b535ddb65e03fbb969a14
+EBUILD dialog-1.3.20231002.ebuild 1552 BLAKE2B 16c09aff2314d8ca07bfd0554dcc92f1381eb5ce81e345830262bc62c1c364d650c40d7d9102418d6a3b814124f73acef6aec1dc5758e36e728e95d656695ad5 SHA512 8438202ba147f9f657f040208ffd223e0e979e73231b96534dcc4f2f90b388c641323ea16c72e8df86ee04d05bc742143a4b850a571b1374198fdb88ba724ae6
 MISC metadata.xml 530 BLAKE2B 018162b342a7a0462f5087ead1bfaf931a299a2934220afe0d1f2736951b66d05b9985dcae0b3a9039ccbf2df21f3a20271e5718a4f8cc8391daf23f16c0b1cb SHA512 e49c5b6feeabf720469a5d34e7c40b26cec9800eea1cdd54c103407d653b45c22de4fe341d1264d516fa00d8706c6a969ded915f2df24f463b0a8d40072afd40
diff --git a/dev-util/dialog/dialog-1.3.20220728.ebuild b/dev-util/dialog/dialog-1.3.20220728.ebuild
index 2ba63a9bb748..4ebba37eb5ab 100644
--- a/dev-util/dialog/dialog-1.3.20220728.ebuild
+++ b/dev-util/dialog/dialog-1.3.20220728.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_P=${PN}-$(ver_rs 2 -)
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
diff --git a/dev-util/dialog/dialog-1.3.20221229.ebuild b/dev-util/dialog/dialog-1.3.20221229.ebuild
index ccb366c584ce..4ebba37eb5ab 100644
--- a/dev-util/dialog/dialog-1.3.20221229.ebuild
+++ b/dev-util/dialog/dialog-1.3.20221229.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MY_P=${PN}-$(ver_rs 2 -)
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
diff --git a/dev-util/dialog/dialog-1.3.20230209.ebuild b/dev-util/dialog/dialog-1.3.20230209.ebuild
index 4dfb5dfde628..a49908a07852 100644
--- a/dev-util/dialog/dialog-1.3.20230209.ebuild
+++ b/dev-util/dialog/dialog-1.3.20230209.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MY_P=${PN}-$(ver_rs 2 -)
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
diff --git a/dev-util/dialog/dialog-1.3.20231002.ebuild b/dev-util/dialog/dialog-1.3.20231002.ebuild
index b7b3a73f4a29..0a34f33d15e8 100644
--- a/dev-util/dialog/dialog-1.3.20231002.ebuild
+++ b/dev-util/dialog/dialog-1.3.20231002.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MY_P=${PN}-$(ver_rs 2 -)
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index f84f202c4679..931e83ec4829 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,4 +1,4 @@
 DIST diffstat-1.65.tgz 295596 BLAKE2B 85a0967854473d7893fac7e49c7e22d9039bd46a45cd00cfbf85c0d20d48bb05876d3e68d97ca6ae785d0cf9cf90540dbd248d39503ebccb195cb9b69dbe4111 SHA512 8b516201d3070ccc37522f3e57aa8b1abf4ddb52956e5a7c7a7027ac0ada1630bb54c95c57e6acdbe6e110867073d1cec2b1726edb2d60d326caded1501b1e89
 DIST diffstat-1.65.tgz.asc 729 BLAKE2B 31dc2cf15df97d83dbc466f30c7eebf451450395fba76d9561dcee5a7dbb7f3972928c60634fdd78b947f7d3cff6dc1eb3d3ae77270e960fc8ce5ee1a60d8b3c SHA512 f25b88b5f70e30ada85650a081fa3f67409d06d2a0ead446c038d08dcd9ccb7c0ee711d12ebc202669456bbeb9807cfc891018048f5a08c20b46d56433fac6ec
-EBUILD diffstat-1.65.ebuild 667 BLAKE2B 90c6254ca120526c00d8772c519fde3ac7bafa3e76dc3b4ec17c40d7e697d9431ca0e2ed93f3f129e4555a6d338e915a66e1391a0ec45738ff5bbad004a8aa88 SHA512 2e143537dafa9655b1e83420971d6d3c0a2a8b9200cc69cb70fe055caf95bc31eb5e7d845359e57b94fadcab4f0302f9d1d35179ff5bc731bd54f49dd7191c7f
+EBUILD diffstat-1.65.ebuild 657 BLAKE2B 13747e7a038c2f887abd0b6a5c97a5ee472ed15e72770284b297b03509558928df2273b00745f0ae44cb2a2ad4e782425d7b64c6b3e600642b06fc77b60e48d0 SHA512 6e8650aad505e0f40ee95550d86f373f85d07d3b1a2c987f3e415a774b4047dbcb3ce46afac1cb134f393b11e9ffa1e2fb49a71e6d1410ae1a12b94f0f475327
 MISC metadata.xml 445 BLAKE2B a07a359b64943c219636468163918f32cfe9a053879f32b4275ab2659788e3c59251b2d1c478c234fa807924947fbdd24db7c693fb2803d9f8335eb5ec9c1ccd SHA512 b8a077397848122d36f000d993280f1f2f8b0783021d1423f5b8dee1a43c159fb790819b0a475ae9b148ae25108292e11a396af3cef086679fb2eaeec5a587af
diff --git a/dev-util/diffstat/diffstat-1.65.ebuild b/dev-util/diffstat/diffstat-1.65.ebuild
index b6e9504bf448..09cce309af48 100644
--- a/dev-util/diffstat/diffstat-1.65.ebuild
+++ b/dev-util/diffstat/diffstat-1.65.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
 inherit verify-sig
 
 DESCRIPTION="Display a histogram of diff changes"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 76da2d60e7dc..0840e99278d9 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -6,6 +6,8 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.3.src.tar.xz 127843636 BLAKE2B 5331d9b545faab282a4caec9ee688d0f1e0615a56a26aa24d8f6fbbae10258e132d94634dab2f7bd69ada06bb28dc899730b9cd774a1086d7c03d5706de6d997 SHA512 44f37dea494a66a83c252e28d7d0517c3b2eed5b196565432dc663c7914bd66d665c8d13479e2776a14cac1905faf6972f986176722c053b58528570a6e68316
 DIST llvm-project-17.0.3.src.tar.xz.sig 438 BLAKE2B 045e7ca82c8d9b3f182e4fa331ec841b24777ac1888f10de435a389ae3a88172e0559a3fca0c2d37cc874464411ae50d7bc0d0829455149a8de8b953ef6c98c7 SHA512 95f9e6729074cfd71b0ffb21e423cd0fd87763268c24e0513f7afd6a85d08061658c44c03ea3ea3b6e3cc7051676d44c41a791e6905c8abb456d48a3762fc152
+DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
+DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-5d35273a32d239b7407338e13ed71b59174d6536.tar.gz 198787569 BLAKE2B 7f4f1eb490028e18826a6ebade649a682e433252ceab1f3dcd9e50c34f24e7ef108c3325ec209a4d4fa1ded8e09ebda4980cb9d8ddce8a0d517923d6c38b8f4a SHA512 4d263561fb12cc07a5e8f7ed2f8f22a3645aa959cf963a6a735a9bb93cfc2a51bf7e4d36b54e8425725029cfcfd868dfcc53af95d26d84be72be124d8c564271
 DIST llvm-project-a7700985577694d6cc2498833f27b4fb5eeaf252.tar.gz 199221825 BLAKE2B 047ab7c0e80e1dbbe61ebd9aaae17166665a33b5cb50beec6da2cc19bec9a16777b82c157e74f88b0678d843b200f292d696a964211a8e532f128491dc39a6e4 SHA512 b747210d53402ae01238fa82195fa5c1c8d1c832d976bcc996ef657ac54dacb2fb19521c6f080151e6b1af8a49ddfe58979afaa00b3f1f72dc664ac79b99a8bb
 DIST llvm-project-e6e90840708099425b7b69dd053634ff25d4907f.tar.gz 199022115 BLAKE2B 442aff8f561f7c5834a36b7eb217fd2b984e58af9cbcf3e6495305f386a7651e73345bbe65133af4bffaf8cb209cfb9a94fb28756ffaaaae8f7d28ec253ccb78 SHA512 fa9c180f36f4c782208ae7baff1683ee466c70f7d021b21b9cb8a8fd0f2005c0b47889d8bb37f5fb984f6b2ec26c74df60490c7b51ac3d080830e6844e33e300
@@ -16,6 +18,7 @@ EBUILD lldb-16.0.6.ebuild 2665 BLAKE2B 75e985037a61bfd49b00214e9d31377f6862fd4e5
 EBUILD lldb-17.0.3-r1.ebuild 2513 BLAKE2B fc9905594f61e88584d731ab2440c33382f141efb456c9f91067c57bd92f048e124cb2b5b7399d4b03129d01af1a203de29a70438c5b5b6185a74ddd59cb7ef3 SHA512 a20921e9d930994c366360dca3b35b580e9df83ccf9ba9562b7e609b1d658fbf4ceb3634e413bd74edf17f017a99829b83ee50c09f26483da9e5593c9f9a65a6
 EBUILD lldb-17.0.3.ebuild 2647 BLAKE2B 4a54e032b4f18fdaad612fd405336f4ee526a5cc7d62f441c8ec43dd97ac24784229f1c013861148989bd69fed80e22897e51812e2cc17c897568b3dd5fa8aca SHA512 bb1876624b17d9cbe095e677c7ed247597d7a502c6b494022f33e3306f49a163a3105cda8d2565aaf52e76cce7ea15dfe9b19e379841bc1155e7465a227340da
 EBUILD lldb-17.0.4.9999.ebuild 2472 BLAKE2B 6cd8aa56d402e01d75045359a0b2ef0720f91cf075f62bbd5637ec93ed90502562dc42f88e35e0a2f24cb41b02d06f70400fb13eb0b557bd1f28db21380ea856 SHA512 233a299ef56b96495f3b494fd64d0ec01831003e843cd3bc7fe49c2b2234109c32ddc66e73301368323b5b40a7a91f37c6b9729074111e283b9935ebe9ca0b35
+EBUILD lldb-17.0.4.ebuild 2647 BLAKE2B 4a54e032b4f18fdaad612fd405336f4ee526a5cc7d62f441c8ec43dd97ac24784229f1c013861148989bd69fed80e22897e51812e2cc17c897568b3dd5fa8aca SHA512 bb1876624b17d9cbe095e677c7ed247597d7a502c6b494022f33e3306f49a163a3105cda8d2565aaf52e76cce7ea15dfe9b19e379841bc1155e7465a227340da
 EBUILD lldb-18.0.0.9999.ebuild 2472 BLAKE2B 6cd8aa56d402e01d75045359a0b2ef0720f91cf075f62bbd5637ec93ed90502562dc42f88e35e0a2f24cb41b02d06f70400fb13eb0b557bd1f28db21380ea856 SHA512 233a299ef56b96495f3b494fd64d0ec01831003e843cd3bc7fe49c2b2234109c32ddc66e73301368323b5b40a7a91f37c6b9729074111e283b9935ebe9ca0b35
 EBUILD lldb-18.0.0_pre20231013.ebuild 2606 BLAKE2B a5467c2d552c1966169490a48e2aa37bc4211735b79b0e94fb91e185c325e598df9cd93b9eb722dfd550fa56b82e762da803d0e6839b0a4b2f66d768844460de SHA512 1b2af73228333953fe6de0e855fecc751bcf3e4e22974ef77a5a69ab6b9aba218a7723215429ce1dbb3ecf46b2066523e7174495a25a1b79ab5ba7eb1828af40
 EBUILD lldb-18.0.0_pre20231019.ebuild 2472 BLAKE2B 6cd8aa56d402e01d75045359a0b2ef0720f91cf075f62bbd5637ec93ed90502562dc42f88e35e0a2f24cb41b02d06f70400fb13eb0b557bd1f28db21380ea856 SHA512 233a299ef56b96495f3b494fd64d0ec01831003e843cd3bc7fe49c2b2234109c32ddc66e73301368323b5b40a7a91f37c6b9729074111e283b9935ebe9ca0b35
diff --git a/dev-util/lldb/lldb-17.0.4.ebuild b/dev-util/lldb/lldb-17.0.4.ebuild
new file mode 100644
index 000000000000..2fb5872a822f
--- /dev/null
+++ b/dev-util/lldb/lldb-17.0.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index d5c9f23ee3c1..e7d4e4984492 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -5,10 +5,12 @@ DIST strace-6.2.tar.xz 2364280 BLAKE2B 8e51cb3e426e9b99d598b4fcece21ba7873e81468
 DIST strace-6.3.tar.xz 2382284 BLAKE2B 7373ebddd6f23713b752ed91598e536d61e08865907c7825dd3492574c7feb0ad6d56bea0e144e1082ac1882d68bb5f160f25e70bfc6e2fd47571ef2c40403fb SHA512 2b0a57e3ee8a23eb3882123149cd732c568322614bf8fde69fabcea64d0d4e3c46c71d63183e0e8d9f8744a7b1cebc823cc67023660c37547f5b854fcc1ca9df
 DIST strace-6.4.tar.xz 2391828 BLAKE2B a9d359679bc5cc61061eb9f19a6156637f12509cb1045462b1547cba8a1218a9b2a4d3b87cf4a33856500515cc0bd457c1374b0ed349293821d80e3cc0de0452 SHA512 29f47195b2766dc0d2907aba2d561e87ec87939251d07fd82d22ffdd3c864944ab0c47eabd7b13272345dfc5dfae7ca435c94fd5ccc297dd46e0747c6d463e01
 DIST strace-6.5.tar.xz 2412228 BLAKE2B f5ce212baf6513432ff55e9afaa41eba2dbda6acb1d3cad7f42d44519b37f5b239c949e2e7ea6504a4c26e811ef8c7f082c9cec0756318fab8403b389afaada7 SHA512 7edf7b00b5ad91be2df4e44b63df7f88376f3e6a8f078dfccf307a6a5003ad25d9cf233f2a32139e00fe399494ce6a8f67728bf9dfeb9bb5958ed08ce25e9e01
+DIST strace-6.6.tar.xz 2420364 BLAKE2B f1465fec58ac20ccce6a88441a34b1402e5c51f0bb4b7963f69b5ab5019a8c8722e3406c6f93c10c1eea11d17de7f9874895d6f4df24cf9ec42a18f36267687b SHA512 77ea45c72e513f6c07026cd9b2cc1a84696a5a35cdd3b06dd4a360fb9f9196958e3f6133b4a9c91e091c24066ba29e0330b6459d18a9c390caae2dba97ab399b
 EBUILD strace-6.2.ebuild 2490 BLAKE2B 7c9d96c1ec695a5ddc58491f3db68abcfeb6066986fe11853aa465a1c18dde977c7e87c58dfda78095ba4b6ddf05aae8b4cfa25fc7dc453955e823080cd6b3f5 SHA512 f2d6e2cd22968812c13f2ae6a09a15d0cb52cbb8211738d9b88be1830deef544442a62e92c69d23cb2e7a3565e3a489f529bef77cad646d51d6da384c4c34ec6
 EBUILD strace-6.3.ebuild 2489 BLAKE2B a42aad4a728fa646bbc3f06d39e0a4bf6d602ad4e5472303f6b450ad9ce0f0134f2df5302457892b01104e10a939717711e195df6847cacbf6b3d12849729d28 SHA512 123cd965bd7b7ff9fb0269e3753552c56c5d7433f821cdbcbe5c380ac2c387509fb0ae2a190d1d036057fc071686877acf27fb693979071dafd59a61349735e7
 EBUILD strace-6.4-r1.ebuild 2532 BLAKE2B d454b274a9955e69d16e39a115b9f331c00cfca3d2a81a9b7bda31cf9cc76a1ca110504f96823aa6b4417225ad1069343580dc3b9f537dfba57ebd915c16d77e SHA512 05ed7d3452edd829df84902ea6447c4b64abae2137431f29f7ca939d026b24af00855f6cc2203945a6cedf48c72cd259325e1ad7fb689780a82cb9f9b2dde4a1
 EBUILD strace-6.4.ebuild 2495 BLAKE2B f33a7cc134b8b70b3e844e1f552eadcb6fdc9ee9216d5aaaef6a0a5e8165cc89ad3081c12bf438643b55a2d65c68e23df317f647566ff5a87d550ae517a486e4 SHA512 33a738435ca711e0c16a37576b71bae119b35a07b98ad41216c400c85cd5a4e6364e94d619e92a294798c392e00584dc47b273e28476bddb38ed4b4cb872ddb8
 EBUILD strace-6.5.ebuild 2494 BLAKE2B 6462701a3ea6d3b563024d900d26f1017bc7c8628880bc430ab7931588c41b67eef71b85534033154387c2dcf1f6a0c4c513ee67fdf9f207d6d1d7749689aaf2 SHA512 a0a39b27a4e18867167907cec62232fdba25f5466fd81d76f2053f383f6a6ce5603b0e3a0e6c4ebeb268a262a6743675eb91cd63a7da4dd4b34d0c983a2fae7f
+EBUILD strace-6.6.ebuild 2494 BLAKE2B 6462701a3ea6d3b563024d900d26f1017bc7c8628880bc430ab7931588c41b67eef71b85534033154387c2dcf1f6a0c4c513ee67fdf9f207d6d1d7749689aaf2 SHA512 a0a39b27a4e18867167907cec62232fdba25f5466fd81d76f2053f383f6a6ce5603b0e3a0e6c4ebeb268a262a6743675eb91cd63a7da4dd4b34d0c983a2fae7f
 EBUILD strace-9999.ebuild 2495 BLAKE2B f33a7cc134b8b70b3e844e1f552eadcb6fdc9ee9216d5aaaef6a0a5e8165cc89ad3081c12bf438643b55a2d65c68e23df317f647566ff5a87d550ae517a486e4 SHA512 33a738435ca711e0c16a37576b71bae119b35a07b98ad41216c400c85cd5a4e6364e94d619e92a294798c392e00584dc47b273e28476bddb38ed4b4cb872ddb8
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-6.6.ebuild b/dev-util/strace/strace-6.6.ebuild
new file mode 100644
index 000000000000..1907bffd5d1e
--- /dev/null
+++ b/dev-util/strace/strace-6.6.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo flag-o-matic toolchain-funcs
+
+DESCRIPTION="Useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1+ test? ( GPL-2+ )"
+SLOT="0"
+IUSE="aio perl selinux static test unwind elfutils"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.5-static.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		edo ./bootstrap
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	eautoreconf
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+
+	dodoc CREDITS
+}
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 2249ded9ada5..6275a74ad956 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -10,14 +10,11 @@ DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260
 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
 DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd4a7213b96a2e4ecb9990a755e8c233b0e9d190c0f807019bde669f44a631c8dafe9eb521d739561e6f889f7bdaca5c SHA512 3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd
 DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba
-DIST valgrind-3.22.0.RC1.tar.bz2 16414739 BLAKE2B 21b59e3c749c9a4fdab91568c942bd8a2c21ecadb053c88aa11563c739f8c87f403cd2a2bf03a3c6556c750a0190f2a1c4ff445355991f16d6f6a58b0be50fa1 SHA512 0aa9e98a959808d20cce53575433f81973ef3de3acc313ef2700f58cf9b2b7ee951b5bc701ef8508f5c136cb14239bbe7d81ae4208679ba55150b3edfd6078f0
-DIST valgrind-3.22.0.RC1.tar.bz2.asc 488 BLAKE2B 938e032fc51e40c816fa6cec4fd95c6f183692d4d30988355bbb217984245fc7a0e6f70314f998511ab081bd2c5feeb217b025dcc84173afe7db7c04a9ebc063 SHA512 6b6518c633d40431bcf6836b0f0b67b44d7bf04a7b598dcd9707f479607a8cf9f6ca9320ddbf0d972db084c7e5bb5a02f866f5dc95c06e973d35597bf2f65695
-DIST valgrind-3.22.0.RC2.tar.bz2 17316447 BLAKE2B c0f70549d760ad599dff7d8a045e74441f42e77c7c208e19c5cec7599036dad683ef22bfd3a82f1f200a0acfbed616c33501264ff37cea773e99a31553658c03 SHA512 6a15101f4b92454856850fc35b9c38fd7fb294bee422274a803331465f347a732dc71e52c28e2d489c8d08ec7c677c1041bd32aeb4f43dd91ee404d4f6fa1208
-DIST valgrind-3.22.0.RC2.tar.bz2.asc 488 BLAKE2B 18a09f1edcaa1e26b821e30cb2cde962e3391c06bba1cac9dc72f304fd6e28d3f7586f0158b0429c792ea70ab3d9785b3e575bb1d700d4086f2a8279d35ae299 SHA512 117af5bb6758aab5a2bf2d18623254ce430399aea12c1943ee3c985ae1f0e579221144e9a0bf50ed03954f356264964c4d8f183b097739d810427bf876a212dd
-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-3.21.0-r2.ebuild 4459 BLAKE2B a7fa39fdcd43d30a396101eb073b05ba7e3c92c6f04eae0c63f9d2782742e3929d80aa77aceb7d887a862dc0f0491f0d8e671996270a371a1b40b414ee123e7d SHA512 5814b127f0a5870297056f07914a74dec21a50892ede7be5a730f255394578a15a99b888d053981277e2bc04b39ac92ec1467146fd729f77c6735f69358e74ae
-EBUILD valgrind-3.22.0_rc1.ebuild 4853 BLAKE2B 44a6a82ff77d5a056661140a86fa6a42f3e321d565e5c4cbd80a0f029af9a6e403eb35db0f952452862d8abda01b7dcc670a8cc88da12a99b929c3ba550fb2e0 SHA512 0eb413c30240e8169504dc51d7461779979d33d84a8666c0b3ba99ec5dc8760718e6f048230d0a20e324baf3b76ea2e6c45d5e734635c33b320ae52f14b86bf9
-EBUILD valgrind-3.22.0_rc2.ebuild 4853 BLAKE2B 44a6a82ff77d5a056661140a86fa6a42f3e321d565e5c4cbd80a0f029af9a6e403eb35db0f952452862d8abda01b7dcc670a8cc88da12a99b929c3ba550fb2e0 SHA512 0eb413c30240e8169504dc51d7461779979d33d84a8666c0b3ba99ec5dc8760718e6f048230d0a20e324baf3b76ea2e6c45d5e734635c33b320ae52f14b86bf9
-EBUILD valgrind-9999.ebuild 4853 BLAKE2B 44a6a82ff77d5a056661140a86fa6a42f3e321d565e5c4cbd80a0f029af9a6e403eb35db0f952452862d8abda01b7dcc670a8cc88da12a99b929c3ba550fb2e0 SHA512 0eb413c30240e8169504dc51d7461779979d33d84a8666c0b3ba99ec5dc8760718e6f048230d0a20e324baf3b76ea2e6c45d5e734635c33b320ae52f14b86bf9
+DIST valgrind-3.22.0.tar.bz2 16565502 BLAKE2B 80024371b3e70521996077fba24e233097a6190477ced1b311cd41fead687dcc2511ac0ef723792488f4af08867dff3e1f474816fda09c1604b89059e31c2514 SHA512 2904c13f68245bbafcea70998c6bd20725271300a7e94b6751ca00916943595fc3fac8557da7ea8db31b54a43f092823a0a947bc142829da811d074e1fe49777
+DIST valgrind-3.22.0.tar.bz2.asc 488 BLAKE2B 9e4d4cfac4dcc09bb62beeaa7b9f78bfafd0a6ae8d63e423ff81b7b8f5444a301e4c3030a241644c8070c36ee040832ce99f444678f22611457e325ceae18dd1 SHA512 c2317db564ef816d2b5d1a7f2f680dc1c6ea05abbffde660587946c986af179ea7ca2314d94c792f63f3043b6a44819ddf5661fd60ec2454a2c562e7d2711b36
+EBUILD valgrind-3.20.0-r2.ebuild 4290 BLAKE2B 05b5383ec2b1f8db878575fa64946d58c584991909ff164240e5511899f6db83233ab28a0513dc2c61b32302a4707261cf256f77afee09da534a23888b1ccacb SHA512 1ae8b9e5c8cebe0aabc0c73f32b2b75e54052323a0c222bf1bfde63776744d07984835be409f1111253814984bdae026231169556bafff1cb588167665bcad21
+EBUILD valgrind-3.21.0-r1.ebuild 4077 BLAKE2B 95e606463e7b28052371f64fe66809abae55313b0d248ffb3ef6ccfeb3eba3d2d19384bd878cae037307d5a98e2a2a12920dbd236b973881dbfb6b5682e6a8fe SHA512 0102ef6a71a4b190a40442a7b51134ab72b58c4be24bd98e6883a6d31b638ac2a17a91bff8c3da91628eeef0cece4e287c9f5b9f41b03879ab784c9cac2eee63
+EBUILD valgrind-3.21.0-r2.ebuild 4449 BLAKE2B 464adde42c9ed8b8bf2081b216cacff02058799de7ffb8f58bb024a5625da7510e9a9e0dc3b2739ffd9a41b940600d6114e74faeda848a3ec1ea2440fe2a7d7e SHA512 69cfd15bb6f3a4a7d24e136f81839b4dfe91928c7f39dbb771937d7b1ba28f412120cf12b2dbaf071e255cd01a88b85b093e1fa1f224dea7482b47432e810d4b
+EBUILD valgrind-3.22.0.ebuild 4787 BLAKE2B bcd9649b097558af58249da81923d84d58b13b1f4c0f0db166e10981b1910db6133f68d656bfb920d72282afd85cac474cc397be99280c48aa2ecffa8b1f2019 SHA512 1f7f48483368baacf8541641079341dfa84dd29a6cfa1c4e41bb9f3c098d14fc6944b5bed6bfc691a91ca7ec5ba0bc5b70a173351ee40f73d2a2902f10cea22a
+EBUILD valgrind-9999.ebuild 4843 BLAKE2B 92cd4c673394c8d6a1254020c7e4fb0e4a51b1ca2ed2fc7146861987e526eac7ebdccb8fc3d868c9c358aae536ab80da22bff8c1522e6276fc81a711031811c7 SHA512 8c76e857547d9c72b937042dcf0415e40eebd7d1a4e21650e3724855fe68f34c75501d763a616bbabdb4e26dbc00878ad6905efea7459bdb60be082c3229e42a
 MISC metadata.xml 1037 BLAKE2B b39708a006ad3ff24b100c702382ec8c45f6e300f3497ccd06199a6195abfa936c8f71ebd3223e0f7299e6644e378ef1d8d2c95a23059b66757d8a91bcbfce15 SHA512 4398f60fdacedbd92881dea016e60c5def5abe8989b56fc450b71b5c65b0d9c26a44b8ee89d0dcb71ab376d987c8e22d12031e9fb2a17b126e3223adb12e0f2f
diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 4c4874401db0..4d57872a0984 100644
--- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -11,7 +11,7 @@ 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
+	VERIFY_SIG_OPENPGP_KEY_PATH=/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 )"
diff --git a/dev-util/valgrind/valgrind-3.21.0-r1.ebuild b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
index 95826a18f9c7..a7b14f025de9 100644
--- a/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
+++ b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
@@ -11,7 +11,7 @@ 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
+	VERIFY_SIG_OPENPGP_KEY_PATH=/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 )"
diff --git a/dev-util/valgrind/valgrind-3.21.0-r2.ebuild b/dev-util/valgrind/valgrind-3.21.0-r2.ebuild
index 59d9e5a4d678..63fc631ce1d1 100644
--- a/dev-util/valgrind/valgrind-3.21.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.21.0-r2.ebuild
@@ -16,7 +16,7 @@ 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
+	VERIFY_SIG_OPENPGP_KEY_PATH=/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 )"
diff --git a/dev-util/valgrind/valgrind-3.22.0_rc1.ebuild b/dev-util/valgrind/valgrind-3.22.0.ebuild
index 88c666067ac9..08632de09fad 100644
--- a/dev-util/valgrind/valgrind-3.22.0_rc1.ebuild
+++ b/dev-util/valgrind/valgrind-3.22.0.ebuild
@@ -16,7 +16,7 @@ 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
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/valgrind.gpg
 	inherit verify-sig
 
 	MY_P="${P/_rc/.RC}"
@@ -44,7 +44,6 @@ PATCHES=(
 	"${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() {
diff --git a/dev-util/valgrind/valgrind-3.22.0_rc2.ebuild b/dev-util/valgrind/valgrind-3.22.0_rc2.ebuild
deleted file mode 100644
index 88c666067ac9..000000000000
--- a/dev-util/valgrind/valgrind-3.22.0_rc2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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
-
-	MY_P="${P/_rc/.RC}"
-	SRC_URI="https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2"
-	SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc )"
-	S="${WORKDIR}"/${MY_P}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	fi
-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=(
-		--with-gdbscripts-dir="${EPREFIX}"/usr/share/gdb/auto-load
-	)
-
-	# 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
-	# -fharden-control-flow-redundancy: breaks runtime ('jump to the invalid address stated on the next line')
-	# -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=*
-	filter-flags -fharden-control-flow-redundancy
-	append-cflags $(test-flags-CC -fno-harden-control-flow-redundancy)
-	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_test() {
-	# fxsave.o, tronical.o have textrels
-	emake LDFLAGS="${LDFLAGS} -Wl,-z,notext" check
-}
-
-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 88c666067ac9..db1e7651ad3e 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -16,7 +16,7 @@ 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
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/valgrind.gpg
 	inherit verify-sig
 
 	MY_P="${P/_rc/.RC}"