gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /dev-util
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
148 files changed, 1804 insertions, 1363 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3b8a7cc3627e..79e187f862d0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 5148fecda258..26f0aac4a517 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -4,6 +4,7 @@ AUX Tensile-4.3.0-gfx1031.patch 7037 BLAKE2B ea2e5dec9d5f6749a78cae4d1659a08b712
 AUX Tensile-4.3.0-hsaco-compile-specified-arch.patch 3859 BLAKE2B 4590978cff0fdb0501ba2405615775cb3f8900ce164c3d57cc59dfe82e1adc25376b6463855a045f5e0652cc985b0015566b95ff28327c59f2db875a84cb49b3 SHA512 57520f1d46f46c7cfd5b8c3ae307da07695c19479b687ce994ad9fba2e755ed7c776c3d8bee8e0642c7613a5d53d8469f329b1eb07563c13d2f7bda8b3d36687
 AUX Tensile-4.3.0-output-commands.patch 1629 BLAKE2B c43395d8e8aeb956d5eb84c8a34ad4b995ed32499ceababeb22d5ca3ac5ee6e8ef353a1467a77943a441f0840b9a6ad1f53202ec8673ef3753aa2bec1395fec4 SHA512 45bdae1d87f6e31d337b22f146b9dee25f4f87357c6ac52bd843556dd742431db10efb55fb8ef815cc9941b5b9f05970d43a6fec0f2d9195c30c633e33d138bf
 AUX Tensile-4.3.0-use-ninja.patch 957 BLAKE2B cb919b224aaeb3b9d65a755ff0688aa823b70361d2ee940d62f33828c118a60c88cd0f108b6e34b22097d9c4c5122a4db2808332a97cd6e7685a4447570b7552 SHA512 3d206a093e870fc95f0ed42e08691144589112d4581f73ba1c4c74ed9bdad0812ec4f67a6076a8a3ac9ab89c61c70f1baaedb774e0908177473be2d206858bf4
+AUX Tensile-5.0.2-adjust-parallel.patch 2936 BLAKE2B faca0234d615e4451b83b53a23147eb441e7929a3ef7542bef3ac5d0a383a6d1aa966373a012cc40bcbd1137a16a80a9c88b4d5459552b6b04c4819cb325e8d9 SHA512 d32f358133e0727b9ea66300f680451222190c0b7c9d91a9e0364fb2589b0ae12d69facb5872a81bd36a770ad649a22120649e6d3550b02bc6365706392caf57
 AUX Tensile-5.0.2-fix-arch-parse.patch 424 BLAKE2B 43e716ccc9256c2f98cc1d2807e776599b384875161233d4a010a53f11a5764fd7a5b4c50ded1762737e9fbe7923b64e9353ee4590fd1b6b9b03ac621af35c9b SHA512 5913e7fc42bc5b43e1dcca531e4ef88b524325b497601171a9844013906c2ffc87469a4c55037c721ace5757c6aaf4d8bf8ca683f659f9d8988555c90425802a
 AUX Tensile-5.0.2-gentoopath.patch 3410 BLAKE2B bbf2c406bbcf2c34efd04667788719f6f10aebda3f9d9096e6798c1a8924768df4fed30223e2f4675af88c41841d148e43e3cd63edc7523dab4618ae245b0339 SHA512 c7b99eab1f0c979f54fcac3b2dcb4a2094b9a536bb392fcf4fb62050b1dc6e61f5280d3d1c7e3ed21617ebe693a17eb2bb7535a93f700123fe6aa6f28f256514
 AUX Tensile-5.0.2-gfx1031.patch 5561 BLAKE2B 244bb644a90ba34f500f4d0cc634acf041cce42f9a5a9f10ee7bd1feff3b78b626b56f3b8cfa4005cc422ef643cd60a7da954618ff9f8f460568ff4b011136bc SHA512 1cd1dd95e481a76fde21dd09aac1ac02f1372e552eeb45eb100dc970639e28f52a709735aca6480d2286b8c747a75435aa7f2e2a288ffe2a596d6f75e4bd17ec
@@ -12,5 +13,5 @@ DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
 DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3
 EBUILD Tensile-4.3.0-r1.ebuild 2764 BLAKE2B e24ddb516d8dfd9e5e691f567f5b97b279e518b38be49a2cc69e8eae100d4d2ce7dc1432247c0bd5c94656ff1a7faf88a8e8f2e8df3dbbbc491eb4323cc20706 SHA512 79859e7dd5647bc4c1eb766faa9b3116994ed74aeb900caaf1b524a1216dcadd8d0c608d097a0c4c1d51b3117b75ccf7a061b7624cad6390fd5ce37494d67987
-EBUILD Tensile-5.0.2.ebuild 2588 BLAKE2B 6c96777b8e08bf2cc70ec1d4bc77a97ea311dd3612d21ae3c8ea364d14287e982f0d2efe0c41b14e1108f64842c56f7ea202cddbb89cceaa57a8990d866ca6cb SHA512 606b503214c13747877380b6b91f80e780d83e9ade7ae983a4e350bf485b7bb5f90deaf9bc2844b4f94afb8c5d155103c2147ac402a0503edbafa0cbbf4ac11d
+EBUILD Tensile-5.0.2-r1.ebuild 2640 BLAKE2B a09e82c0d91aebdc308c58a5e1b09a6cbc998a6cb67dde419949532a39c915396d46c4e87d824ed8c8bc735c31c6cad9b9bc7a3aee96063203f8364f50d1c686 SHA512 0218b8b1276ab0f9038a02d0d0f94c169dd8da9a2f694ac097bb894298b04bf7e5fc87b66d7761cacc0415980dbca4f5c3a3f38fb044db4433ee071e4a49c64d
 MISC metadata.xml 350 BLAKE2B f621bb03aafc000672f022db9cad9a1fed65b912129d26ed7e717ba8e5cfb11f0d6b309905b6e12b07993a7aa0cbebf18aeaf92d643eff5419d765e31b3c52a7 SHA512 99b497edddaaf6d84159df959fb8b0a5d18ea0ecc879d600a2a1fc004554612e1422b258a2f7c5f73148caca93f9283481b53669f7247d62782401fdb112f69e
diff --git a/dev-util/Tensile/Tensile-5.0.2.ebuild b/dev-util/Tensile/Tensile-5.0.2-r1.ebuild
index c9240e233281..5bb9a3f21927 100644
--- a/dev-util/Tensile/Tensile-5.0.2.ebuild
+++ b/dev-util/Tensile/Tensile-5.0.2-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
 		  "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch
 		  "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch
 		  "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch
+		  "${FILESDIR}"/${PN}-5.0.2-adjust-parallel.patch
 		  "${WORKDIR}"/${PN}-5.0.2-PR1419.patch
 	  )
 
diff --git a/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch b/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch
new file mode 100644
index 000000000000..b96429232c78
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch
@@ -0,0 +1,65 @@
+From 25b1621549f9b120462988913e657684645be79d Mon Sep 17 00:00:00 2001
+From: Lee Ringham <lringham@amd.com>
+Date: Tue, 2 Nov 2021 14:43:07 -0600
+Subject: [PATCH] Added better control of parallelism to control memory usage
+
+---
+ Tensile/Source/TensileCreateLibrary.cmake | 7 +++++--
+ Tensile/cmake/TensileConfig.cmake         | 5 +++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/Tensile/Source/TensileCreateLibrary.cmake b/Tensile/Source/TensileCreateLibrary.cmake
+index 1dbacf41df..996f365bcf 100644
+--- a/Tensile/Source/TensileCreateLibrary.cmake
++++ b/Tensile/Source/TensileCreateLibrary.cmake
+@@ -33,7 +33,8 @@ function(TensileCreateLibraryCmake
+     Tensile_LIBRARY_FORMAT
+     Tensile_MERGE_FILES
+     Tensile_SHORT_FILE_NAMES
+-    Tensile_LIBRARY_PRINT_DEBUG )
++    Tensile_LIBRARY_PRINT_DEBUG
++    Tensile_CPU_THREADS )
+ 
+ # make Tensile_PACKAGE_LIBRARY and optional parameter
+ # to avoid breaking applications which us this
+@@ -51,6 +52,7 @@ function(TensileCreateLibraryCmake
+   message(STATUS "Tensile_COMPILER            from TensileCreateLibraryCmake : ${Tensile_COMPILER}")
+   message(STATUS "Tensile_ARCHITECTURE        from TensileCreateLibraryCmake : ${Tensile_ARCHITECTURE}")
+   message(STATUS "Tensile_LIBRARY_FORMAT      from TensileCreateLibraryCmake : ${Tensile_LIBRARY_FORMAT}")
++  message(STATUS "Tensile_CPU_THREADS         from TensileCreateLibraryCmake : ${Tensile_CPU_THREADS}")
+ 
+   #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/TensileCreateLibrary)
+   #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/Tensile)
+@@ -89,7 +91,8 @@ function(TensileCreateLibraryCmake
+   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--code-object-version=${Tensile_CODE_OBJECT_VERSION}")
+   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--cxx-compiler=${Tensile_COMPILER}")
+   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--library-format=${Tensile_LIBRARY_FORMAT}")
+-
++  set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--jobs=${Tensile_CPU_THREADS}")
++  
+   # TensileLibraryWriter positional arguments
+   set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND}
+     ${Tensile_LOGIC_PATH}
+diff --git a/Tensile/cmake/TensileConfig.cmake b/Tensile/cmake/TensileConfig.cmake
+index 0ac8517c2c..fa8cb96305 100644
+--- a/Tensile/cmake/TensileConfig.cmake
++++ b/Tensile/cmake/TensileConfig.cmake
+@@ -112,6 +112,7 @@ function(TensileCreateLibraryFiles
+        LIBRARY_FORMAT
+        TENSILE_ROOT
+        VAR_PREFIX
++       CPU_THREADS
+        )
+ 
+   # Multi value settings
+@@ -184,6 +185,10 @@ function(TensileCreateLibraryFiles
+     set(Options ${Options} "--cmake-cxx-compiler=${Tensile_COMPILER_PATH}")
+   endif()
+ 
++  if(Tensile_CPU_THREADS)
++    set(Options ${Options} "--jobs=${Tensile_CPU_THREADS}")
++  endif()
++
+   if(Tensile_LIBRARY_FORMAT)
+     set(Options ${Options} "--library-format=${Tensile_LIBRARY_FORMAT}")
+     if(Tensile_LIBRARY_FORMAT MATCHES "yaml")
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 620f8dc3377b..8e95cffcbb3b 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,8 +1,8 @@
 AUX 3.0.17-gcc11.patch 1934 BLAKE2B a51dcf079322144ee84ae41dddfccc08dd878a0b04f0a97dab9ea9d5c3a54ecd035c28cb9fb19402cd2d8c2b2af678b65246fd53515c6d20427f4ead12b7bc86 SHA512 645e87cf4afd0f0c91b62c1bd8257e3eba08d4a5d177d7748ce1be936185618a90c5be4775256cf0dbc8bb2c207caa7871d35e170cdd1d6805ad84a0c3f4287a
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
-DIST bear-3.0.16.tar.gz 122948 BLAKE2B bb720170488968e79d26b7022859a3a55f191661a65d8c5c1ce6120911919ffcd74a32035eebb419e4fe9a616f6dec1c66804445d9e8b243c7d26a87284f7776 SHA512 3906011aa01f42c7841046614e9f1972a39288749cbdeab4b55e517d48a05cb02a48be2b055b4ce65300ffa0a940609e713f55bd1a47ce4fc9a8cb2702487f07
 DIST bear-3.0.17.tar.gz 123861 BLAKE2B 9dea85c7c0ec5ec4954d08147cdac31e0b28c9780281a544687340e6e226e5403ad82f74db0fb9edd3f65c9a982531afb612e1c744430735e6de97d8d29a2189 SHA512 08e50b04c87745ae60623c32de07e710ffb4e78d9978f13cca9d51929b45477c780f1fe47178569310dca20dab5fef49dbffdf17a087c388f111eb11ffadf5b1
+DIST bear-3.0.19.tar.gz 125086 BLAKE2B 0c6a27359e8c88ab0dbaa3f5442a87efeaba4f6a9b8d0912ad026231421e2555a524b194a19972f549600951bc1f6620398c48338f7eac8850ba6c3969f2e6ac SHA512 688766a76cc3bee1dc82478d29d6e8754618f92633c842586fce95f2f1096764902ffd64a6f2f59101e58eba5472bf39ddb178c3dfcd48491fa4eb63d111585c
 EBUILD bear-2.4.4-r1.ebuild 1829 BLAKE2B 0f87691b8ee68c1176236f4cf1608892941195893b4a1ebdf5872333b05196f81f1b98469bd90534f7de062bb613dbc649ccc2e99ccc739501d4d57b57d48a61 SHA512 be4c5dee00262ac6681cc2486965732ba5f196e70e7cbf21424e96d3154f3171d1db68b7493f802ba359699999664f92bc64488f3922cbf9ac34d785dc61dd8e
-EBUILD bear-3.0.16-r2.ebuild 2095 BLAKE2B 515d7147414212b1edba08ef6a63c58f2e85de1908103b4308d6eaa13ca23c4e058025181f3a5ee0fa0c25712950f6130513d47bd073abbfd03343903eac8985 SHA512 480fa8af0fde9f09bb70a14021fad6d0766c9831590c2c46db6e6a1331f3d24dc0b3a6202051fe9975567047c86dddc2f89e3324113586c6c84042659d69b81e
-EBUILD bear-3.0.17.ebuild 2160 BLAKE2B 9fac64f316be4108616bce784e2efa4c32fdd379f06ba21de0f3c378611244088ac99d7358593a6a7d75871dea5b846e1774e5268ddef6e68a39da7492d15fcf SHA512 21f420ed9cf827bbee97d8d587228374594ebc467996e96aa5e6a4d0ef169444e01dc9111bacbb66ad033ed7bcb3adfd1c990da5ecb3146107ae8a0931bacf94
+EBUILD bear-3.0.17.ebuild 2161 BLAKE2B bfa03fe21a8766e0d3442c9917d6c06b83fe4151cb7f4202dcdbdff2b73d0d05b50fbaac03566e83a78b6429253118e32f683a396e74943be8d100cbda8e623c SHA512 8591d782a5c82d10fc728809d5f6b78edc4f49ccad68b8f12430329c602c0ff0c14ee35987d9d51c8dd3777c79a8f6ba4a64d4cb8587bd593fd17acb4dc0939e
+EBUILD bear-3.0.19.ebuild 2144 BLAKE2B 70ba36731e4019a544e4f7ee9a608897638b0d2c1157f83fb02b8f1aa7ab5505d639cd4e1c187f724a8796ef6c9ba4fda3c5e6e1aff9efdc1d48e211d2c41f61 SHA512 3949a9ce20f9c5a9b8ca56e821ead32e5791ded100eabe0e2a54eb1d43d4059f01c1fbde9f4a09ccf83201877741bc856ea522fdfbdf7f0e71c5515d493e29eb
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.0.17.ebuild b/dev-util/bear/bear-3.0.17.ebuild
index a4051dc0e04c..b31cd181b486 100644
--- a/dev-util/bear/bear-3.0.17.ebuild
+++ b/dev-util/bear/bear-3.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ IUSE="test"
 RDEPEND="
 	>=dev-cpp/nlohmann_json-3.7:=
 	>=dev-db/sqlite-3.14:=
-	>=dev-libs/libfmt-6.2:=
+	<dev-libs/libfmt-9.0.0:=
 	dev-libs/protobuf:=
 	>=dev-libs/spdlog-1.5
 	>=net-libs/grpc-1.26:=
diff --git a/dev-util/bear/bear-3.0.16-r2.ebuild b/dev-util/bear/bear-3.0.19.ebuild
index ce27dec8b196..71c521da77db 100644
--- a/dev-util/bear/bear-3.0.16-r2.ebuild
+++ b/dev-util/bear/bear-3.0.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-any-r1
 
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	>=dev-cpp/nlohmann_json-3.7:=
+	>=dev-cpp/nlohmann_json-3.7.3:=
 	>=dev-db/sqlite-3.14:=
-	>=dev-libs/libfmt-6.2:=
+	<dev-libs/libfmt-9.0.0:=
 	dev-libs/protobuf:=
 	>=dev-libs/spdlog-1.5
 	>=net-libs/grpc-1.26:=
@@ -31,11 +31,15 @@ DEPEND="${RDEPEND}
 	)
 "
 
-BDEPEND="test? (
-	$(python_gen_any_dep '
-		dev-python/lit[${PYTHON_USEDEP}]
-	')
-)"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		sys-devel/libtool
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+	)
+"
 
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index f9ec3fd018e0..4fe9b67dfdca 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -3,11 +3,8 @@ AUX boost-build-1.71.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4
 AUX boost-build-1.73.0-add-none-feature-options.patch 475 BLAKE2B 5211dbc9188056bea09c4d9d5073cb772ff876b6ed7a05c18db34b2b86b85301d092c6dfd5698aec9ad93a828aeef8283d005136cfb4eb10ab2001f50f41b51a SHA512 0ba75a1e46a58dcc6a332ef8cc8a688f1219619cf84b681233e044da1fda754b7f8dc5ecc903776674729275d7a39a571803022cd66b99e9e335e6ba5bbc5501
 AUX boost-build-1.76.0-respect-user-flags.patch 456 BLAKE2B 02a383d7a969220da3a40bfe822a807c67734a286f65c3d1dbda18c263593cc6940f5ed260bea1d1ccc20c0726b04859ce2d97c151d10b067206f79d417af237 SHA512 06df6dbf1bc48f224a77ccef202f0cde61c594e6be23418196fbc274bb8e1b6e16a8f2ef9fd45d112cb57af8987df23282e0b1bd4bf4ca6603127b573f54810b
 AUX boost-build-1.78.0-darwin-gentoo-toolchain.patch 399 BLAKE2B 213ddbeac6be079df8383ac51c1935c21c7c4e9c2fad2dc71cc0e6317d1bcb282d7fa26997eb677408a5b5fdf2809062c54be18265dd618ec01cc771d99fdff1 SHA512 9d69ecab3cdd58915269491ed98824c554a5291820b8c3116d3aa36acee69edca4eb1528baeece513d290c20fcedabd342d426aa2c153f7ad5f08e0815357868
-AUX boost-build-1.78.0-fix-python-bindings-build.patch 599 BLAKE2B a457af724b4cc885b4efb57951a8da4c8c0be63cff9cc4e488b5611f9da8e36c6f5e0aa3f54e8ccf37f74b4e8065a8e25688e41a80506412362d280bdcdaefca SHA512 5c596ee7e2b194baf5f4198e5c3a5726b2cf84fab0f3dac08901d1b837c3c83565a3bb159193b88a8cd02414773e18049374e77baf7c70aa197bc19563b2868f
 AUX boost-build-1.78.0-no-implicit-march-flags.patch 17236 BLAKE2B c8c068f48de2d14307c74c64db63ad5f74b9913650f807a53f8e837a8f4b67ba3484bdd6dc9b25cd297e94d5344208e4df6950e2827893bb58ed0ce518bfe66f SHA512 73589b6e88c26a89b874f251f53ec36a08f8709f2a2be7cde876347213c49e87800f9917b529d7f843b3ce4c0ef126ab67b919089be481955a39294a0a8d84a6
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
-DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
-EBUILD boost-build-1.78.0-r1.ebuild 2166 BLAKE2B e65979c0a57bc8d4c30514f51be2051ed73b33221d69fccc429dacf699c8ce9fb2e65c39cd6c04a511ab1c33ccbcc73bdeac9e3de8a1de3a8994678e3e6fa561 SHA512 7f3c708126c863f3cc052f16442bc360dcdff51be044b1f820820a5d70a7404e4e104d75556cd7e487e31f6c16cd095ffa05b495b60cdc04cd0332d3183c3fbe
-EBUILD boost-build-1.79.0.ebuild 2122 BLAKE2B bae45d87af3255fcf84b8e3d8e92850724e4f72a1c856687ea965d55d3217102f18f7ac4446c3f72fb31ee07e27489d28d7c6d64abb04724514dd512854d55de SHA512 b2afdd4edaed646ac12f0784c23688fc70b4ba215450710455913817ec2e60a013c53fb3b34abb25c8676eb8e4cdf306f33cc81af6ca874b5946a542f26ff7cd
+EBUILD boost-build-1.79.0.ebuild 2121 BLAKE2B 26af62750e19a7bce5abd5b5c004d66591d5ef6e8c0161903dde740ba6758d8657daac1b98a78ead85c47fece46c2c954797cfcc9c200757f51b03060e0a9be8 SHA512 b361c10f4ca1733774d8d98fbeb52551eafbab8e7d99a488a4d60bb5edbef82aef15f3b36235f200d194f6a9089c46465f61516b492e100fa2644db0ed6a5c0f
 MISC metadata.xml 320 BLAKE2B b8916adb7b84ead3feef70414578019e07de58086e6954cf2a26a77368a99bc75bf99ca18f111a67531d318863fab700083ebcd7612e7d40ece89086d9d4974c SHA512 7c2c8fa591a6c3d05b5d4808077b890d5757bbb4c12a9fe7ed7b4ebc738244266196baba07da434ac3609c0d00aed4ef9c2346524f141e679b94376f804c508b
diff --git a/dev-util/boost-build/boost-build-1.78.0-r1.ebuild b/dev-util/boost-build/boost-build-1.78.0-r1.ebuild
deleted file mode 100644
index 334acbcf9d5c..000000000000
--- a/dev-util/boost-build/boost-build-1.78.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="$(ver_rs 1- _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://www.boost.org/build/"
-SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
-	"${FILESDIR}"/${PN}-1.78.0-darwin-gentoo-toolchain.patch
-	"${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch
-	"${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch
-	"${FILESDIR}"/${PN}-1.78.0-no-implicit-march-flags.patch
-	"${FILESDIR}"/${P}-fix-python-bindings-build.patch
-)
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd .. >/dev/null || die
-	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
-	popd >/dev/null || die
-}
-
-src_configure() {
-	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
-	append-lfs-flags
-}
-
-src_compile() {
-	cd engine || die
-	${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed"
-}
-
-src_test() {
-	# Forget tests, bjam is a lost cause
-	:
-}
-
-src_install() {
-	dobin engine/{bjam,b2}
-
-	insinto /usr/share/boost-build/src
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.79.0.ebuild b/dev-util/boost-build/boost-build-1.79.0.ebuild
index 6012d16a983d..f17231c6f894 100644
--- a/dev-util/boost-build/boost-build-1.79.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.79.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/boost-build/files/boost-build-1.78.0-fix-python-bindings-build.patch b/dev-util/boost-build/files/boost-build-1.78.0-fix-python-bindings-build.patch
deleted file mode 100644
index ddcdf0850031..000000000000
--- a/dev-util/boost-build/files/boost-build-1.78.0-fix-python-bindings-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/829031
-https://github.com/bfgroup/b2/pull/113
-
-From: Dmitry Arkhipov <grisumbras@gmail.com>
-Date: Thu, 9 Dec 2021 08:11:57 +0300
-Subject: [PATCH] Don't skip install targets if there's <build>no in ureqs
-
---- a/tools/stage.jam
-+++ b/tools/stage.jam
-@@ -478,6 +478,10 @@ class install-target-class : basic-target
-         return [ sequence.unique $(result2) ] ;
-     }
- 
-+    rule skip-from-usage-requirements ( )
-+    {
-+    }
-+
-     # Returns true iff 'type' is subtype of some element of 'types-to-include'.
-     #
-     local rule include-type ( type : types-to-include * )
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 54778f24a947..023560cc39be 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,6 +2,8 @@ DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c3695441549
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.17.7.xz 668120 BLAKE2B ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb SHA512 b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
 DIST patch-5.18.4.xz 424880 BLAKE2B 6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756 SHA512 4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949
+DIST patch-5.18.6.xz 486212 BLAKE2B 59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15 SHA512 c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38
 EBUILD bpftool-5.17.7.ebuild 2830 BLAKE2B db113b1e8e9b42204215e0d0a6b1ff21b7ca929401f4e63b33e1fc0da8baa837be38349171ff19c2f7460b63062b72423e0524df6180c118ff10e1b110d90bac SHA512 139015d99cf70a7bcf9558f316a214e4c8cb0b9c162c6936df785702b94f02ee5abfccb64e5f6beebef4badebe6182045917cb3fb45a4edf0ccee108c00f7385
 EBUILD bpftool-5.18.4.ebuild 2838 BLAKE2B db68f909f5b00257ff8c7516f170eb751abede56e45b908982048be66d488b04839ca9fd5ee1edf961730fa749b01628c1fd6b0ceb3b6410db51dd9151d935f3 SHA512 bf28c750ec794ee6e980cf464e5b23705198bcb35403d183625ea650760a5f9b61da2f0d528f0061f6912d82fe37bb8a7cd2afe73501e5cffa525d33ff66506c
+EBUILD bpftool-5.18.6.ebuild 2838 BLAKE2B db68f909f5b00257ff8c7516f170eb751abede56e45b908982048be66d488b04839ca9fd5ee1edf961730fa749b01628c1fd6b0ceb3b6410db51dd9151d935f3 SHA512 bf28c750ec794ee6e980cf464e5b23705198bcb35403d183625ea650760a5f9b61da2f0d528f0061f6912d82fe37bb8a7cd2afe73501e5cffa525d33ff66506c
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.18.6.ebuild b/dev-util/bpftool/bpftool-5.18.6.ebuild
new file mode 100644
index 000000000000..6833c60b6e2a
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.18.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-r1 toolchain-funcs
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
+HOMEPAGE="https://kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2)
+LINUX_PATCH=patch-${PV}.xz
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/bpf/bpftool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	sys-libs/zlib:=
+	virtual/libelf:=
+	caps? ( sys-libs/libcap:= )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-5.8
+"
+BDEPEND="
+	${LINUX_PATCH+dev-util/patchutils}
+	${PYTHON_DEPS}
+	dev-python/docutils
+"
+
+CONFIG_CHECK="~DEBUG_INFO_BTF"
+
+# src_unpack and src_prepare are copied from dev-util/perf since
+# it's building from the same tarball, please keep it in sync with perf
+src_unpack() {
+	local paths=(
+		tools/bpf kernel/bpf
+		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
+	)
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+			> ${P}.patch
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		pushd "${S_K}" >/dev/null || die
+		eapply "${WORKDIR}"/${P}.patch
+		popd || die
+	fi
+
+	# dev-python/docutils installs rst2man.py, not rst2man
+	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
+}
+
+bpftool_make() {
+	local arch=$(tc-arch-kernel)
+	tc-export AR CC LD
+
+	emake V=1 VF=1 \
+		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
+		prefix="${EPREFIX}"/usr \
+		feature-libcap="$(usex caps 1 0)" \
+		"$@"
+}
+
+src_compile() {
+	bpftool_make
+	bpftool_make -C Documentation
+}
+
+src_install() {
+	bpftool_make DESTDIR="${D}" install
+	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
+}
+
+pkg_postinst() {
+	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
+}
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 3868e755197a..893db0e4ee62 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -5,7 +5,7 @@ AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b63
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
 DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
-EBUILD buildbot-3.4.0.ebuild 6566 BLAKE2B be9edf41162c3d9e0e78d3a80aef9efac6e208cb4862ecab62dd3c6f447ecda995b25b70b1c639c137a5ab96c09aa85d48523da1ac7b8f0013c0ea12401ffc29 SHA512 4d0d86a7ffa33937ddacccfe7f9bca35f03c0c39b5bb080ed576aeec93dad58155c42429474b59b2076d7972f79a6724bc63dd7937910f4dc7dc4c926f0b56fb
-EBUILD buildbot-3.5.0.ebuild 6566 BLAKE2B a39542ace97fc4324b0bde9151b61046bf62c900a5b09fffa1f1a633273a29d145a816738b7c74d057f7fc7d1e43b10e659defd5dfb33a8a66a94b64813480f3 SHA512 683ba1890dc5c99d0d78fff18c690edc835af7c3d57d226b91bb12fed9c493ecd5e59a160919c42ac90f53aab7648c871aa348d64cf4583a4066b5be2e284c9a
-EBUILD buildbot-9999.ebuild 6445 BLAKE2B bd10410044ae6dd5769e78e7c8046d40ff6db777459db60d1683668fc5a4fbf774ecd7208d072cf8a9fe7564e56231b63e654b4c22ae2b227a1b42373d79220b SHA512 da2d4a6481725df2e9307e3a6dd5241827fe0e7b449ae93c5c11e43f6521530842d775ae7ba7c0a147b21ca32dd48e2064b4a3b765a9415702fe29e85f24dd24
+EBUILD buildbot-3.4.0-r1.ebuild 6684 BLAKE2B 6aa2c72d62cbcd3f33ef9cdffa26762aa6a1600b3747f9e0070b9f3f098143ee32083a528a4b9331c866ecca36297d591019ac8d02718588a328eeeb567430e5 SHA512 033dd139371dc1ac260f71ce54a01dd9d59a085011b4ff6b9bc08d8bc60fd9af34aeb636b966e6cdce8104c70af03b85769b626464da0632046f2b15f1b7ccd6
+EBUILD buildbot-3.5.0-r1.ebuild 6684 BLAKE2B 96a17e28885f24c6270c39e01eeba4c5b06bef0ad9a5f0cfed6296dcd567f9a62ea624ee23ed511b933f6aac5471ffff12f8c2a44433aaa9415465080485bc07 SHA512 3d1a89cb2cd325d8e01fcf62358bf70c47bf2188f856dfc007c92c8e804f149da2b0265213a6fdb8c37b71439f960205deb904486cfe0cd1e40e8d2230a5ab17
+EBUILD buildbot-9999.ebuild 6563 BLAKE2B fe2a4112637a6b633bd20ff4971f9d0755e60c369c0ff4a52edad6cda54dd4286a73e2e9e3383b1b074b9199fc587434ec33f5eb3441725c8fcaca293023aa2c SHA512 903bd9ff7cd3a949701a3f719645e8d86114c8c441e6e1f869941be3e7ea18fd4c282ef36ad268df3ecc2d8ebea048ebd86367813b9cd01d968d0e99972c5f6d
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.4.0.ebuild b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
index da16ccd719c4..48e0f782f784 100644
--- a/dev-util/buildbot/buildbot-3.4.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
@@ -42,6 +42,10 @@ RDEPEND="
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
 	irc? (
diff --git a/dev-util/buildbot/buildbot-3.5.0.ebuild b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
index eb038ad1f925..e6a1f69bd613 100644
--- a/dev-util/buildbot/buildbot-3.5.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
@@ -42,6 +42,10 @@ RDEPEND="
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
 	irc? (
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 4b1b1de3957d..2f299e4c1c37 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
@@ -37,6 +37,10 @@ RDEPEND="
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
 	irc? (
diff --git a/dev-util/cdecl/Manifest b/dev-util/cdecl/Manifest
index fbfc2a550189..f0e3a546802b 100644
--- a/dev-util/cdecl/Manifest
+++ b/dev-util/cdecl/Manifest
@@ -1,5 +1,5 @@
 DIST cdecl-11.14.tar.gz 772235 BLAKE2B 665ac2ab9efb0bb356eb96265e56cc8592534aafe1ada2d6129704b221aed71063645eba8ca9d792b5785127f1e9d4b341157245291f8c1792d04747b8b80043 SHA512 c96f4cd29a8a1e632990dfe13db5a8bd9f0705e1d6899eea5b1b4aa59be7451c1878e1f0a7c618cb051b67f5b99f6ee3ed5c49679cfbd7e723bdece2355f1bf1
 DIST cdecl-11.15.tar.gz 779251 BLAKE2B 38dbefeb65b19960d9a761f63318525c5f446536a1195258ad6bc0214f07e9b24aaba09d50bfa8486315ec9514f5727abf5150d243c0123c5d8d74cb97e53327 SHA512 e9142eaf59fed2722756408e2c7be38ebe5d6975baab46eceb79ef70462ac106d49328e14177a18a576a68c08fa8c8fecd6ed7f0c2b9ba7b219727ca4a1546db
 EBUILD cdecl-11.14.ebuild 656 BLAKE2B a7f70644931a6427c829a604c380b4759db1f81ac86feea822ebe804fc5832220be2bbcf820b28d14f37e97f27717e543b175022293e2911aef032015a633aca SHA512 59705762b80401b1b39b890c3cce2d592eb1eadcaa712a18f11f21c2fbd8288cf6585849b10b173ff7b4cd33862017b2eecc97eb9b8c9399a5481f36266e2c0d
-EBUILD cdecl-11.15.ebuild 657 BLAKE2B d82294e5f0a189b09d98b16bd6d2b25ff2a28cc86b92547c545d417b51002c4ef13bdb9f28981ed59a3cf25800b119973e1fe1197f5aa8731d38ba549998c2b7 SHA512 3c5af8de3f740b969f4ccec9bbc9caff44f6fe3a831bb21e6333e685752816552c6343e9804afe2afcf498ba7f057478488eb72c7e22a84f54b09c7351960a79
+EBUILD cdecl-11.15.ebuild 656 BLAKE2B a7f70644931a6427c829a604c380b4759db1f81ac86feea822ebe804fc5832220be2bbcf820b28d14f37e97f27717e543b175022293e2911aef032015a633aca SHA512 59705762b80401b1b39b890c3cce2d592eb1eadcaa712a18f11f21c2fbd8288cf6585849b10b173ff7b4cd33862017b2eecc97eb9b8c9399a5481f36266e2c0d
 MISC metadata.xml 468 BLAKE2B b883da549653ee0df224561567b7fcad423674260ccce2f5f2af6487927ad4e7fc81171582274af55d5f0d1733b92617424b39a5193a46f27bffab9a9422afe5 SHA512 7e77833fa924f265031e1d6db658147fc179767c3150cb3f80f0c145a2514da108e684ae136848928a56495e1a1d794ea35217e7fc407c0394b2514f889b75a0
diff --git a/dev-util/cdecl/cdecl-11.15.ebuild b/dev-util/cdecl/cdecl-11.15.ebuild
index 7e715e918523..e11e661104b3 100644
--- a/dev-util/cdecl/cdecl-11.15.ebuild
+++ b/dev-util/cdecl/cdecl-11.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/paul-j-lucas/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+readline"
 
 DEPEND="
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 3d98d904bfdd..7a65ca411d93 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST CLion-2022.1.1.tar.gz 785792506 BLAKE2B 9665bf3fe08aebb00b8bb1a26a0537c520444f66da679d01b9aab2230583abc0ecdf5b4510e7d6b39437ed6c9dc58939d5f9d1dab2568ea0c60438ad2c76e07d SHA512 bad80efeb9bcf88e31aa845605fb903dcc7deebe783100a40d0c5548c5f9ab3580804a2a924a511be007a94bc642df1c16bfd3477630719a0965ca075fdb72fb
-EBUILD clion-2022.1.1-r1.ebuild 2909 BLAKE2B 7d076bd82e60471ee0a191a813e5ada30e8d7d3bf2cb528ea25a89435190e5f878df8a7f0b93bf61c0907e36a6208e02672d06182d52baa20e936739fc5294a2 SHA512 47c52f6acfd230c5b7f348a5ae5795e54ab42dce4ca9c215028ec72dcaa91b4e4fc9dc9b9081fe103bd0b7de4f6775955da61ce5aefa7485b1672490750a54de
+DIST CLion-2022.1.3.tar.gz 785987464 BLAKE2B 5b23d54f260a8e6023cce936ba50320c9c815d7024495d4a28a6fe9fa795d9944cce36fedd7b619ccf8188750708eb3bca887f9fc856d2d4defe096505742852 SHA512 5caabc409e9e22e59a26886cb5a5785cc0f2c193e7548a9757d11b4e2b7dad5af7545f3c71b83e3111deb0e0c90507eb5ee6020dcba40e413c0882f2743ac49d
+EBUILD clion-2022.1.3.ebuild 2941 BLAKE2B 5f903ef1c2c15357fd0cc234d452f66424c69a773b0f960d27f38eeb06c6fcbe78b770a10b026698886d2c82b6adc3f29f317fd00818ff82169adceffb83c80a SHA512 7b5095bf9e4f04931e61567610b7e51e1e89237996a7c9be843c10c1dba00b2db78a0caee2d4c6ac119aac2e359057c1ab90c15c9c080cc962a3d64134030a05
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.1.1-r1.ebuild b/dev-util/clion/clion-2022.1.3.ebuild
index c6fcdf218e77..977084632a53 100644
--- a/dev-util/clion/clion-2022.1.1-r1.ebuild
+++ b/dev-util/clion/clion-2022.1.3.ebuild
@@ -37,6 +37,8 @@ RDEPEND="
 	net-print/cups
 	sys-apps/dbus
 	sys-devel/gdb
+	x11-libs/cairo
+	x11-libs/pango
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXcomposite
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 1087567290d9..012451bd2883 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -4,6 +4,6 @@ AUX colm-0.14.7-solaris.patch 659 BLAKE2B f7e8b4781ffc7a63fa63ee83f69e115ea14609
 DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
 DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
-EBUILD colm-0.14.7-r1.ebuild 1471 BLAKE2B 42782595e7696cceb1fa894287a31936b19ba6b7dce0a0e7ee996d2a98faefd7bf5d326d29b0f251b97a39cc1c9395b385708d4e33a2b94891fea7a7db06c163 SHA512 8ed5e69698945e86924cc0a79c19cc3903e079cde8f706b8522d2cdffec935500bc3811d5c05fabad7790ed372f8569b0bd3c29e92b2dec51f671c1d1e0a00a0
-EBUILD colm-0.14.7.ebuild 1366 BLAKE2B 443e26f0bad0e8805d20ce2a69cb829d28e5558fedeee3e3a76b74e1c73bf4dea37ec391f9e2615c91581576297cfc37865cdd4cc9dab8870bf4a4634da50b9f SHA512 58af643e63bdb8261b36c4141b9b680f3d27647394b40c0fbfcf1c5f9c261f44277d17dd98e58db7aa697cfe6d5ea66260e1adbfced1c45e35fb7b7335dd4b83
+EBUILD colm-0.14.7-r1.ebuild 1487 BLAKE2B bc56737a509b517d3a9022f3c93a5928ffb1400d3cdde7dbe8b697ef407573dd6f1579458c0b2e703aa84958762888bbae4fc5cd69a9ed73230728a6ea547a75 SHA512 2af6a5debbd7eb35bdedba42694eddfabb1cd43d00f8038d276ef356a0bd3bf6dbd12c6b8950e159292db81474841d0143d680e468b6bdfa63a6bcb38831c946
+EBUILD colm-0.14.7.ebuild 1382 BLAKE2B a040745057dc087cca435929c57c7cb09ba76156fddce29a3e8e50bda6e100c550bab847a66a24947bb089566992596d83b69c9f0260287894355a11e9f37284 SHA512 026aa8dcbf7c827840179d3d336bf6ed006732a2b69688df307183ccc6d622eacdf4581510b8499c7cce9904b1028dc6e664af6b71f027dca9dba2f592d1e627
 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7
diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
index eda6d30f5d36..59000e4847fa 100644
--- a/dev-util/colm/colm-0.14.7-r1.ebuild
+++ b/dev-util/colm/colm-0.14.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="COmputer Language Manipulation"
 HOMEPAGE="https://www.colm.net/open-source/colm/"
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
index 8a4cbf114356..774e9dd3a369 100644
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="COmputer Language Manipulation"
 HOMEPAGE="https://www.colm.net/open-source/colm/"
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index e4830d0b94e9..2228c4b5c3d4 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1,5 @@
 DIST cppcheck-2.6.3.tar.gz 3880340 BLAKE2B ef83538a0aa867dd0c0bd6165b41921335256ed0372a4990ad85151ab5e87a79bde7958be43887f07a4bbf372b9992339b75ddeae7ed8ea767b83c028dfc56db SHA512 e59b4b4659c2b4fa2c16dcb548f7ee3027555dddc289ef8b54fe186af0396b6f7caa23d91bf1142ece62908b56fe9f5ba013191817322815681994093310fb37
+DIST cppcheck-2.8.1.tar.gz 3921391 BLAKE2B d61c4a8a3e88441f0a65090eddacaa34bda91ba50ce92e79c122525524368ade49d24f13f343a5a856a3014e904495e87db2d774146e871af1738d55f1a52728 SHA512 ff5a9955498101a2d061a431d0f8ed42267627b3cd029302871ee781a0e4039aa531dd47c2d44d1f3952b5e5bd3b65c9b32a10a9b1922ef466f440f8c4417e28
 EBUILD cppcheck-2.6.3.ebuild 2001 BLAKE2B 6229fe97e051df083a748c36d2bc606060763d9a678008c87ebcb523acc24d76a822d14e2eee7dc81d9d6e1cb10940f6a684be8fec93b01f81e49a1dcf898763 SHA512 6203a4611ce362e6e115f97c19865a24d0bc9e019e739bd01fb211b4b7457ac6a0720ff5d2b28a4accf2297767659b80e5f0d617551baea81a0ba730b6ef8869
+EBUILD cppcheck-2.8.1.ebuild 1949 BLAKE2B 7ddf762a66c157345bcf4c78bacde9544e6de357591efceb4a47b505c19dbe54b43a3b11bd7d8e0f0d7d38773c6ede9af580c64e5e2541d4c3643c133e7baa0d SHA512 5c3da10d069a6ac582ea92b6b5a37f651e8c3ee961969d85ad0d79608b859e6e6238c295c42d920a0ba25d69fd8bbfd5ada9099a6855a38ad1ae5d9fe0d7496e
 MISC metadata.xml 491 BLAKE2B 614ff2cfa86224be3c758dc12d61d6bd7b6609652eee3917a97fe0ee54accee769d0c5227458e38152083d1b8f555bda2f3d23cd918eda59bd28b7c24ae07dd3 SHA512 3f4519bcce00dd2d9a05c05959db1a961d44fb899bf083600d9ba4a3af24fd9e52da4a8a6127fc1597103fe10427eeb2dcee5e227307cb564fe3fd14b33f3a07
diff --git a/dev-util/cppcheck/cppcheck-2.8.1.ebuild b/dev-util/cppcheck/cppcheck-2.8.1.ebuild
new file mode 100644
index 000000000000..03159a548722
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-2.8.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 cmake
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/danmar/cppcheck"
+SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/tinyxml2:=
+	htmlreport? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp
+		dev-qt/qtprintsupport:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	test? (
+		htmlreport? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_RULES="$(usex pcre)"
+		-DBUILD_GUI="$(usex qt5)"
+		-DFILESDIR="${EPREFIX}/usr/share/${PN}/"
+		-DENABLE_OSS_FUZZ=OFF
+		-DUSE_BUNDLED_TINYXML2=OFF
+		-DBUILD_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+src_test() {
+	cmake_src_test
+
+	# TODO: Needs some hackery to find the right binary
+	#if use htmlreport ; then
+	#	distutils-r1_src_test
+	#fi
+}
+
+python_test() {
+	pushd htmlreport || die
+	eunittest
+	popd || die
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+
+	if use qt5 ; then
+		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_install
+		popd || die
+	fi
+
+	dodoc -r tools/triage
+}
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index d51b57d66116..d75402ca2e02 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,7 +1,5 @@
 DIST cucumber-core-10.1.1.tar.gz 202764 BLAKE2B c5704ed4821d056aea7bf537c7193bb8965be5a6d0effad0f85f76c18e62acf7a2de981da05826fbd27c1e55122ba3ca9873729332a9840280d1638838af27c9 SHA512 c7c4de1c53a58b74e632019a9a69b3bac164da72ee3cef839d19c9548707c06ddac5e562013ca86992ca3d78ad96f23521ff69de83b3e9e614a336cc3d6ba9a6
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
-DIST cucumber-core-9.0.1.tar.gz 47009 BLAKE2B 2c78956643dfb08319732af24c08d5df811574891b582ba7ab51281c9a5299a3063c6c607af5cd9659aa0e160c0f3cab1d54b9cbd57d3dbf2768e97bb8f79e8e SHA512 0ac61797cda1d62d2b452d3d843be855f84b12fc9c435e8b5261700a981d94c9c88e36e309d8c2dc637ff195032768d363ffd9e7424c842d5b0ba98c3c678752
 EBUILD cucumber-core-10.1.1.ebuild 965 BLAKE2B 589c45d5dfad2f50c4d948c4cafd529b74efd3860c296dfe2c9e9da7e8e4e8d7aa6437350b2623748e5811bc11e4d709f4046523377be186b7ae0a27d0b4086a SHA512 09d741ea5c891b9428a3f5f6b22847c52e075a1fda813b60612182317edc7612a67b76c99cec3fd2e6056a854df4d1841a40843e7009572e3501e313d19ea7fe
 EBUILD cucumber-core-3.2.1.ebuild 1036 BLAKE2B 5974f4b5f2e4b10fc89b934e92917e95f500c07334d2d25ff06000f7cb626ff5412446765dee220def380ba8c17beede6778feff8471d80a70af0ded394a5110 SHA512 0063cd60aff9789447e75df8af18e6c1f736505aa124489617811f57a1dbd96387ade525d3273da06987e5596e5ca917e75dc5ed5e28d3a3953da02ac077475f
-EBUILD cucumber-core-9.0.1.ebuild 1135 BLAKE2B d4fc3b08fcceee5282c01140c01c6649a050c19edf10c5b3784995770066581f8a473ea50c3c7c3288071857cfc4bf5ef8a735266aa1086ac5a63ca59915782a SHA512 3e667a53637d636223bead410d40f38e183b3f430278974551ee78e7b235b91fb92486245835419058d2aecb65d689f1f115f7da19f720b9c2f4a78371c1e2de
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
deleted file mode 100644
index 340d8aa6ad8f..000000000000
--- a/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-core-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/unindent-1.0
-	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-gherkin-18.1.0:18
-	>=dev-util/cucumber-tag-expressions-3.0.1:3
-	>=dev-util/cucumber-messages-15.0.0:15
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
-	rm -f spec/readme_spec.rb || die
-
-	# Ensure the correct version of cucumber-messages is used
-	sed -i -e '1igem "cucumber-messages", "~> 15.0" ; gem "cucumber-gherkin", "~> 18.0"' $(find spec -name '*_spec.rb') || die
-}
diff --git a/dev-util/cucumber-create-meta/Manifest b/dev-util/cucumber-create-meta/Manifest
index a0f96b2c722b..bd18cae3055a 100644
--- a/dev-util/cucumber-create-meta/Manifest
+++ b/dev-util/cucumber-create-meta/Manifest
@@ -1,5 +1,3 @@
-DIST cucumber-create-meta-4.0.0.gem 8192 BLAKE2B 4809b0f9ec7f922af374ac46bd9d0cb9797f48738596f00c08bf3d861a19141160032421715d4d141b1b1854e77f3798d09308f626188c3ef6b30a491fadcd29 SHA512 0103b8277741d4eb2e590e1d7f9231187482d32f9a2c19c837baab759b3c48c11a39ac7af686d56fefb7b79120110e930c9af25fb895294529a3b5b0612a5b63
 DIST cucumber-create-meta-6.0.2.gem 8704 BLAKE2B c7c2d64937da00c6d9cd7161eba3d86089900d348fa8c3b3ee9c25912b09045d20e14f0e0d941a6dabb80cec1f69df0601993e90e575526737dd2159a75e73b2 SHA512 aaf61052475c855cf837b87d845e5b03686e1dba0fae3a83028ab89f434116d948d2d235c502310c14315446a9dadb1eb86dcf6441419e5983430192a9c6d448
-EBUILD cucumber-create-meta-4.0.0.ebuild 589 BLAKE2B 2e05857b82d8da2ee294f22420e313fe8e8ad777bd32d763048c101dd94dcfcc78336d2e3aa1c600cd0c0c78d748529761ee9a51c1c882a6aac68cadc15c4d9e SHA512 b352c1d64555823c3fa5947060a30c5919a476eef30c581b6c3a409d04e3022332639f452665ae7c336426a8a3edc09579d7495eb3dbb10d8f416fa21580a31c
 EBUILD cucumber-create-meta-6.0.2.ebuild 610 BLAKE2B 04692187021a094feb3d4f53f6c87ca4149cccd3a29ac6fb3023478f8e934b5182b2d991a9bddb873098a7a7fcce2fc247c242903406c0313440a7498880e649 SHA512 72215c26e4f72afdd1e25342fc8f01638b9032f57084ec9b1ee10dc890c2ed528674a7d3065b492a7c8eda4f6c6bf60f2f37e66852e97144804d06cee79abb84
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild b/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild
deleted file mode 100644
index a50871e45915..000000000000
--- a/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-messages-15.0.0:15
-	>=dev-ruby/sys-uname-1.2.2:1
-"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~>15.0"' spec/cucumber/create_meta_spec.rb || die
-}
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index 008ded0abae9..29efc8733491 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,8 +1,6 @@
-DIST cucumber-cucumber-expressions-10.3.0.gem 23552 BLAKE2B 6aab081690081e991a1c1dfdaac93e114165dc1b2a39a1825e6424304765c96836cec9dcb8635e9f97ef0c07a6b58cfe7fc587c651dc73bab0670f4230828640 SHA512 d560c62f625f6b284a94974cef5227a3623fead9c8c4f45ea9fed2300b37c405ba69161d6c6f5e159b2a36be5eeb05b122789cafcafec0dc84efbb366bd0166f
 DIST cucumber-cucumber-expressions-12.1.3.gem 32768 BLAKE2B e873ba0ac58982c2a975935351bdbaa0e2d5fac5128386cbab347330d5ee920eb7c90d7670e9cd68a9294eb09828d7640e6fcdc69da6d819935f8faec9bce2e4 SHA512 57e8b322b7451967d177e291e9649cb7d9e2668dcdfc2453b9b2ed9c8f84f4c3c5b7905d246dbfc5382a8c515a3d031acfcec93e5ce568da23dd1d42e6d31fb1
 DIST cucumber-cucumber-expressions-14.0.0.gem 24064 BLAKE2B 45b811bb1c1fba8fb2b4819998b92b827ef80c7bb654d899b717f2438b5c6485447ce5e25e5d97e7d7d323fbc576d98334cefb825687b3791387df0cbc7669d6 SHA512 c5b3b840e04722b516a8cf57ce8f55f835f84efd73b133f9d6f842d1ae5612108e1100dd970d52cd349bf4c606ed1922b4730a0b2e4a2d31abdf2f6f51768a80
 DIST cucumber-cucumber-expressions-15.1.1.gem 25088 BLAKE2B bc9990d11994a5c094b23a2d8bccf283d0c035507d7140128acae674faa70d1b8927bce6069b82bc530b28b4867ae6be3f168847e0d6db036211a5fd13defb06 SHA512 ceda830ca22e388169db41c85343f9adbe918ac76a5cfaefd55ca3d2815ec826eb592ba70771f0cf41bfefe8e42d9afbcfeb8c384cfa30687e9c0c023164fbe3
-EBUILD cucumber-cucumber-expressions-10.3.0.ebuild 435 BLAKE2B a3fb096924926c58f912bd465834ecf529e8808f1d33d8dc39028f76c3d634a01bce87c3c89bac7cf1252359f41c01e41c01fa10a38e90fd260ebd1157b35391 SHA512 ebb5527b73b4d7d90f0e1746d116f409480bb1cd2035e749086df000705b1c97f91d7d83c87fc04f3326357e22370bf99c063d0bf7271c91d24abd262c392e09
 EBUILD cucumber-cucumber-expressions-12.1.3.ebuild 442 BLAKE2B 4f1d7e7900a38a912a4ae1d1e42236b9ee854a81fb55d0a4873cc24c1c8d6dca90882ebd017a1eb31995dd0abad261883891f16e793dca83d69c30e85b08b3f5 SHA512 9bcd00b42922069b814dbcfad4bf40d8c5003f38f9f0c2b884e60921ab3313f00ab8c891f737816e1e04c1e3acb65d5507ab67140e2fe17a5c8c61f6853050c2
 EBUILD cucumber-cucumber-expressions-14.0.0.ebuild 449 BLAKE2B 2b06313cb60c12c6ae6dba6ebc4c3189fbe73ec331ebb6cc05c984a702f700ea2064e1a5b8173b46f0e3f7c3c89f785d1bf2b1a470f58c4c3c953f2dd477840a SHA512 8f197d4cdbb687523f357690ef2ec5b82c4ac3e5443a9afeae3f8841e0b4dde3c35db0fe8755f46ea7d4bb3ca788ae20dacf8eb1d9c9224b4f1b0906909fb24d
 EBUILD cucumber-cucumber-expressions-15.1.1.ebuild 456 BLAKE2B 6a702ecdc78b58b661829d41ea3dcec3c6b3ac52a8f9b3e95a6a789b2abcf022aa5697830e39db61711732dcb50ecf0ca8bdd2ebae05544a9c9d809145795ba6 SHA512 d3a6e75cfbaa5fe1b408c498e06d24330d6431c3a8b1bbcf9032cdaf146446df1affbc81ce15b6910a4f574aa2e6f55d56b9c180083aad192f4ff07cfb0b1f4c
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild
deleted file mode 100644
index 25b24f1a86fc..000000000000
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
index 32d8b2f3d7f0..2cf89c21f4b0 100644
--- a/dev-util/cucumber-gherkin/Manifest
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -1,9 +1,5 @@
-DIST cucumber-gherkin-18.1.1.tar.gz 12436812 BLAKE2B 5434d3133f35156d131283dff7cbdebb6523911ffca481ec61b6cb7fc41288e8deaa9afadfb4f34afc57729e92212c513fa203b279a54e5f09a389fe9bdef1dd SHA512 c6f329ea2f46e224b802a1a4062b8d66314c2ee124fd261cfeed390775acf184e1098879c17cae4838ef361ffcd0cf43b1eb77978da7376a87afc09576d25085
-DIST cucumber-gherkin-20.0.1.tar.gz 9410066 BLAKE2B 2c34b1eec9d74b96bbf21ea20b479d9a1ab42669bce08eeac9c9f0c97b86c64e9119423eb8ed3c42897c8730d1dae9c0a75e32e407a63b6c1955e773d35fa16f SHA512 0a53a7110fde39ed921c3a883b2aa00f8599e7dda87cdf1766d606a696ba6f9e350d176edb9cf849567a9f4733d5e0653944d738fe9a9451ecf0763b8687706b
 DIST cucumber-gherkin-22.0.0.tar.gz 9601890 BLAKE2B 71ad3b4c9917cb6c9e4e8d7769bc76f49f1e33d5aa46ad835eea01297d9e69c60c1249075aabfb529daa10996703e45dbb8dec4eebd149ae8637708f666a00f5 SHA512 ef5aca1bd0e30aac850c2e93fd6d30bb5e7a9504f4d1ad1f4072001abeb16aa7cbbc0bb2200dd9001080ed8d89a3f91eb5206874cf535e3ea4756e6e809a6c20
 DIST cucumber-gherkin-23.0.1.tar.gz 8404612 BLAKE2B 4a444afdf70804be9d97cf87c32960cbee705c97c90e4ef2d34479c1499a0fd1d97fa11114cc6354a765be667e542ec1a6b9f596778a954f4e1d9df80157f4df SHA512 fa968e92cb4617791d7df4e1d2a152b04ccd0b2aa0785e26264fa00ce722b026b0dc4b428acc0caf75d24196ba9689d85bbbc7f34c2a5c3dafecf84ab996383e
-EBUILD cucumber-gherkin-18.1.1.ebuild 965 BLAKE2B b728923cb88866e5430a045c2a9c07d2a770bcc7f3bffc1a00d2e64dce0dd833dd0a80311f0f9cf17a3e91d088cab18a1b5928bee6e1871821a0a87cbeebd1e8 SHA512 576f7d7227e2233f220cae4f4b9d2c9855badd30c824ec3cd27c0676825578473f95fc298f797818d26db711cfb364b4a36f5eaa36f2f010cb6513dd00f4bdab
-EBUILD cucumber-gherkin-20.0.1.ebuild 752 BLAKE2B 97d59d4f98c55ff939692b6ab67e34de85f1c3dccf39daac69a922e77524d5d58f9ecf339356e4a60919d0468c06e0dbece663b865be8fc7ba1d8160126852ff SHA512 da97d7cd58d83bb8af86bda2ba0679c33bf031709fffeb177499b14ea3bbcc35f60b6d939b39ac8be3a04171da7cf586bfdef9d4c7da5000d68980ef56c3683f
 EBUILD cucumber-gherkin-22.0.0.ebuild 788 BLAKE2B 5f2cced56ee2a198d603004c6effbf0085486ace6e05d73815fea836a0d4824a8813f1f3f16331e382a64d64e9348cb6f5053b9a399cd1befbe35220a694fe41 SHA512 b30df86e53f0098865754dada59accee9078d88d609a862ccd3f2dabbd9284a83ea1617101163e643eb807cc364f87ad5c19fdc5b990fd8c5765d794f08d4594
 EBUILD cucumber-gherkin-23.0.1.ebuild 795 BLAKE2B 6cf4bd6151577644d2930f1ce763ce7fd968ef8012529d0a9acc949de4c7f22adcf5c1ac4bcd1c390ca33283b2ba5d315a85667c2a3af96e89053d66329b3d13 SHA512 964d26dfb5111ac9eaae6a0c4ac58fd12ac5f46bdf866e93b4e98d63f1b71312184b85daaf96018567a843be09373a7758bc90ec7f21711f57b3b9321c04b96f
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
deleted file mode 100644
index 171ada7559b4..000000000000
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-# Don't install support scripts to avoid slot collisions.
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend ">=dev-util/cucumber-messages-15.0.0:15"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~> 15.0"' spec/gherkin/*_spec.rb spec/gherkin/*/*_spec.rb || die
-	sed -i -e '5igem "cucumber-messages", "~> 15.0"' bin/gherkin || die
-}
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
deleted file mode 100644
index 8ceb52961796..000000000000
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-# Don't install support scripts to avoid slot collisions.
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend ">=dev-util/cucumber-messages-17.0.1:17"
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index dac6aef2726d..d67f746a10a1 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -1,8 +1,3 @@
-DIST cucumber-html-formatter-13.0.0.gem 436224 BLAKE2B ce3f58995560f6d78e855e95af83128e426817c749f64de8c8b2c475893a0da02ee72ea00ccf2d5d5745d94f93924ef52e9a1c01bebaca9cde889cba49f32270 SHA512 687ccb9245213ff9e59b85cf729fad05de385c94a31ae70cb770ba515c57309107fea16756853d93b1af39c68c3f936f7975540070b4b45bbdd79baf94513dc4
-DIST cucumber-html-formatter-16.0.1.gem 432128 BLAKE2B b1b53566d15573f6f4fa87a9a87ce5c1844d9bd6f43715aee1a08ab45d66baa211631a612aedd59f97c24364ce9b6b607697763744906ec78f96adf0c5ca260d SHA512 2bcdd55e0d3dfebc60c25e2a64a0d2b132e561fdb0f77ca0a491464c9b338cffad5a436123d3ed5e85816d509caa60badda958d7b435a42d89ed27a17f97edbc
 DIST cucumber-html-formatter-17.0.0.gem 434176 BLAKE2B 9bab7b11d2a17b6bb7fb1a81275a7db9221c5848779e870e95b9fee939d93d8df43faa29b1b85a3ac170763ffd8bb75abef8bdcfa2a7392cbfa7ae96737a0fdd SHA512 7be1e8805f45ab78a80997ff556856289f715d59f6ee4f01ccc95452b0cc898bcd0b97d029a70cfaa1f292069f913b99517aa1cd7f2cf45f7cdc9152520ae670
-EBUILD cucumber-html-formatter-13.0.0-r2.ebuild 614 BLAKE2B 6b2c8448bdcdcacb257f7cb269ec4cf138436ba7e513c45843f0281d9a9b1cdd692926cee214cacb24dafbcff78f807fc714024d68c1b07a3dd185a1cb96f6d8 SHA512 f36d02372af5bcd8b4dd800547ff3ad0d3a8b5972151d922eeae6df47b208d2978d0480cb587b2fedadf3f1eca73909324a088bafb85511a222a7021c813e3c0
-EBUILD cucumber-html-formatter-16.0.1-r1.ebuild 620 BLAKE2B de7237cfad709d374815a67f1ecf2a05e0a7def0033b395ad4096ec931f2bffaf62d86bedcc2e40431ae76eaca9b5ae83f819f1b4e9cdf8208048f2ec5cf98be SHA512 aea00c0116db5074f833694b32d1f3786fc5ac1a240dd2df1c753c16bc7c4c25d95761578f2e2fa02601326bde75b3b58be249ad5a3649b13e0c46b5cc4eabdd
-EBUILD cucumber-html-formatter-16.0.1-r2.ebuild 645 BLAKE2B 8f5285a93fa7476ec120179507704fcafdc79944365d7c92a3223b27952c0eebf2347ea41dd643de2684e6d6b2761097632b5dfb4c6e6972cbfb61ad3cdc7a75 SHA512 0222ed1b2f80b274a6d1bc100b9e187ff53f74047515d9a963be2a1614fbd36ecddcc67fdaa00e2c38e7adade1536ad7984768d6fc470b00d8fd6aec8fd17399
 EBUILD cucumber-html-formatter-17.0.0.ebuild 704 BLAKE2B 29616fce3908431d835aa648a448c50bd5d199e5bbb5a4e8fc7efeca21a5a443d143eec2d674fd7407d261e03d5df342030dd8e391104a75ab68f588db1d046b SHA512 a7b8cb61f15d74b69599fcacbc833fda58a5043b1b22b8accdbe8d38512c0e1942f7001d459179c9a10942c43e385cd3ca2c4a5662fef2a15ff3cb2c8a0da498
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild
deleted file mode 100644
index da066defb460..000000000000
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-messages-15.0.0:15
-"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~>15.0"' spec/html_formatter_spec.rb || die
-}
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild
deleted file mode 100644
index 7bb9afe0e9c5..000000000000
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-messages-17.0.1:17
-	!<dev-util/cucumber-html-formatter-13.0.0-r2
-"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~>17.0"' spec/html_formatter_spec.rb || die
-}
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r2.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r2.ebuild
deleted file mode 100644
index 9d9cc748042e..000000000000
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-messages-17.0.1:17
-	!<dev-util/cucumber-html-formatter-13.0.0-r2
-"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~>17.0"' spec/html_formatter_spec.rb || die
-}
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index b87f911111b4..949f84319f02 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -1,11 +1,5 @@
-DIST cucumber-messages-13.2.1.gem 11264 BLAKE2B ed5fdd87a5e9bbeaee2bf39779f24841ea9a40568d6b3d9a7a7146f7d25efb92b3a8700f8573bd5f11f26958b4d6d7975b332fb7499c40220ac6e87a3f434d72 SHA512 449e01ee0704513e430d8f4c33cb7e363b7f15d70e7a6525adc703beaabd6a207a35bac16384577d0d0534c1c33f08ebfc8bead121c196b2bbc709a7d0ec210a
-DIST cucumber-messages-14.0.1.gem 11264 BLAKE2B aff0eac711df831708126bedccec15f945933df9345924a27398508194849a4a9a0155d20249dbdf2ddc68886affd22f8cc450f87696f4f81049219a7212e107 SHA512 fee0fe8fb0efb3b1bf4b9f2f56e3e2f305ff727767500fa869198b668bcb63e8af80898afc106242724c5aa1c94ff5511be7c3ce0e433be9be03dd66d8e2e09d
-DIST cucumber-messages-15.0.0.gem 11264 BLAKE2B 41586a540fd4b092a25b3516419e912900f229f43ba3f8699733bdb67a2783d4e83c50df3b0605abb511894c6a466aa7cae7ee82bae8f48a2cab878349a54a63 SHA512 906a09517dfa6b44519b24ad9dbe5092d1ee24f0fa0e08291206f9b81e1611d988074b063f493ddc2034e05429b7c218380fe0412184c07ba8b2f7af2e3c9ead
 DIST cucumber-messages-17.1.1.gem 21504 BLAKE2B 343bdb916c1e1a8cfa0aaaa4837d11064d51268a283b9c79b0ff249abe8066ef6a3d56d021d3b9d9b1d8a2dfc1495b08263dc325f6ac8a0e2dbd46281089cee7 SHA512 32d4740bd6aae8bf4273aac9974e181d32c4bd0be5883722ea38aa62df8b915504fd21a655111c03527d3fe1f31f0ec41ac637cb7293b753c7ec4eb6a97e7db9
 DIST cucumber-messages-18.0.0.gem 20992 BLAKE2B 292de17ef1b73ea2f35f3994bfbab14f206d8152fd885a7e6d351eaf67bb7ecfbbf8fd1a24ea1fc2cd42bbcde5290ec69c227db273193e897c5e4aebc555aa99 SHA512 52a7c3d8105a8b7abfd2914088ea2c9caa794451a53a50c8c6b98f36ad73947dd2e2f0925a06f2eae4019bd6e22b206670d51557149e50532580377c95a904be
-EBUILD cucumber-messages-13.2.1.ebuild 498 BLAKE2B 5f1b07a54fd92218910d0dc08591979bd9b868b482ae678c2c6e34691ee9516b6c7afafcef9bae31ecd654905bb28e581adff9bd270eda52ab4e92e4fa09f050 SHA512 c4ef586d85ae9d0f38dd751bfbd2093cb61119dcb4d4030bc24404f3320d5d09666ce0e2358083cb0ad70440c237007f5730fac1038a1e01a2db675f5599aaa7
-EBUILD cucumber-messages-14.0.1.ebuild 498 BLAKE2B 5f1b07a54fd92218910d0dc08591979bd9b868b482ae678c2c6e34691ee9516b6c7afafcef9bae31ecd654905bb28e581adff9bd270eda52ab4e92e4fa09f050 SHA512 c4ef586d85ae9d0f38dd751bfbd2093cb61119dcb4d4030bc24404f3320d5d09666ce0e2358083cb0ad70440c237007f5730fac1038a1e01a2db675f5599aaa7
-EBUILD cucumber-messages-15.0.0.ebuild 539 BLAKE2B 1ca0b3eb4d294f815ce0e642951eb3b9f51e921a9e6c2a84a6ff5826a436925e9f243d005a865e1330becef08753326a90d882affffea988f7aa0c49ee107e26 SHA512 26db7d8bad7d4ed5efd893224ea3ab3d2cfea153c729b4ecfc545390a3216d93ed5ecd0df241d02b17514c9ac26f2f908ae1bf76c14f12b9e6a9e2d09d0b2436
 EBUILD cucumber-messages-17.1.1.ebuild 502 BLAKE2B 298baf86aedbddfe035060dff3caeeb7fba9152a667aeb0993e4e42affc66148d23227980972967d4d4d146259d873286e8d835b942da41faaa52b821ce1b275 SHA512 e9aa63e3022a19f354f595bc4969ce9dea26ae0003f77e6afed6f8e59bb7c4f59dca27574a26b130690e54d75d90155f2d096f69b38f7947edbee249bf5510fd
 EBUILD cucumber-messages-18.0.0.ebuild 509 BLAKE2B 724e11932dd6fa71052098d51f6037a420b7b8e6e5928cac8be8118c574d76d1e714ad7c9edc65ff1f77ab1bc6f946e46993596bc563c6b5499e176d819b1c3f SHA512 455e7d732e32e66bd98aa06652ecb085b61aa5b06798d67262e53866daed5caf141ac87d79c972681da0b094a9f6c3b241d02106f12f17a6017d1b972857dee5
 MISC metadata.xml 314 BLAKE2B b2b942eaa58ed22776f566b9e50e04e6ab0802ceb3b8a71f916d7899fc117ebf00cbc12775ea29661f6591c5e8bfae21cce49e89acb9a6a11e8c71679503b619 SHA512 99b7fcdcbbf0f360790757d2d004cd9ea981d344d092dd54c50b6658625021c8074044143680d3836392c6f53e64fb7dd3dd95c10b452f97c53e5f14b822d3b7
diff --git a/dev-util/cucumber-messages/cucumber-messages-13.2.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-13.2.1.ebuild
deleted file mode 100644
index 593adcf6f130..000000000000
--- a/dev-util/cucumber-messages/cucumber-messages-13.2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-
-ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cucumber-messages/cucumber-messages-14.0.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-14.0.1.ebuild
deleted file mode 100644
index 593adcf6f130..000000000000
--- a/dev-util/cucumber-messages/cucumber-messages-14.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-
-ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
deleted file mode 100644
index 1c5411e37b5b..000000000000
--- a/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-
-ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cucumber-tag-expressions/Manifest b/dev-util/cucumber-tag-expressions/Manifest
index b435529eb761..9c5705ac3d4c 100644
--- a/dev-util/cucumber-tag-expressions/Manifest
+++ b/dev-util/cucumber-tag-expressions/Manifest
@@ -1,7 +1,3 @@
-DIST cucumber-tag-expressions-2.0.4.gem 8192 BLAKE2B 1ca07c8b1c018aa0011e6b31fd2b1a6085f5de9aa5a9abd4cfcc2bf0feb9fd3018a1fd07b7a3026e62b32aa629718ca1acb7c4b2e9d19a118ed500e2d60d0c87 SHA512 d52d07f4415c69db54e3d37e5627e8587386aa777e1816b8c8d6dd284388a5ebfe48f7ab3c8f8ff3f4c3e6b3dfa6a1136460f501504b1dc71554f2878e81756e
-DIST cucumber-tag-expressions-3.0.1.gem 7680 BLAKE2B 83d89259c5451886e9d699a3a7bfe4b0d09ae6164fe2b3d271e62cc8185876cdd1173cf1223b8eb07f898ae43bd599efddc7e589eb353342548b376ed7aa670c SHA512 699cac80ec0fa41d55f5600e84772d471e9268cc46382813ccdf1aae99f2d50c9e89b7b60baf79c9dc9d5d17189056212726aeb7dec3a4e18c2e982191078fb5
 DIST cucumber-tag-expressions-4.1.0.gem 8192 BLAKE2B f4ce3377f3d67be1d58fee6f082ac8b25a301ae2aea2f862cc8faa0b7b36daba9754512cfb046c932c93ef6d10b50ff8a4cd2187b4a3516f740b9d9db865b95b SHA512 15704a604496a26fa87775cf05b6998236e7903e0770782804ce8bb9e3093178d686e1bba146d1453b853f529f30220054ac33ef18ba1d45894fb1aac7fc3dab
-EBUILD cucumber-tag-expressions-2.0.4.ebuild 431 BLAKE2B 3173cb5f7660f88f4d2a26f941657216f33e9efe352acf845e9947dfe715a877aff8ff116d03e8460ba46be60e4b1f45c81833e56b3c6a7e1ad194431d8fa3fa SHA512 cc8c92daf0004a23e854a8272140f53f6dbf3be7dac9aab2114915161bbcc13d200de1c71d85860e61090d97b444a4d0dfdc9f5a637219486882bc1a7ffc08ef
-EBUILD cucumber-tag-expressions-3.0.1.ebuild 431 BLAKE2B 352ecb5dba6965e52a9b4b07958b16095c75dc4a6402424722d177ff26ecb576fbe8cb89a484c3221ae7f0273d1da8cd69832e374e7003f1924703ac8982ef54 SHA512 3a52a049567f3373f679b54b3c076cbc281cbf71e026cfa35666d7f61d374882ac225aca9515bd95103fa0d04e6a2b962ba3b09347806d8ca0963d9432a9ee77
 EBUILD cucumber-tag-expressions-4.1.0.ebuild 438 BLAKE2B 544649e20b49fc7fd6f171cde351d496aaf7c1a4969ae394003d79f8ddd3e3bcb6df7bc1bac5e8665d4b6aa3f1e8f0740101b626716251fffab0ec021af52a43 SHA512 9ff5040304c573d1f67606cd632c91404bf75383c37e69e06cfa929620a9bd96d431354641c376942ff0d0fe7020b6464fd79cf1463e46a77db4529a39c016ec
 MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-2.0.4.ebuild b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-2.0.4.ebuild
deleted file mode 100644
index 76c765a1a5f6..000000000000
--- a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-2.0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
deleted file mode 100644
index b947e508dd07..000000000000
--- a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index c18a1d208b74..3a69e9197f79 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,11 +1,5 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-DIST cucumber-wire-5.0.1.gem 12288 BLAKE2B cbbf593d43cbbc003ea247d41db2cebaed14d232ae2bc52eebe34c8316c58b679be7c6802c7ffae7dd3e8c14d367803e3baba7b2f79326434821693e71fbd9f5 SHA512 deda0bb93b51b9d27074242bd0c371b7465c06e302d2aa608201898a1eb3b1736c9955baa9360f047a29793871fedc9feb25bf3430020e5b1f5630a2c982da73
-DIST cucumber-wire-6.1.1.gem 12800 BLAKE2B 7e32aeae15bbc02884100f58eab9eb39df2ecb2d7a8fe58dd81c17eefcdb8d080dba6ca84dafcf2584351ce88132d73479a1dd48bec7ad53be7806019940106d SHA512 2f08d14170707930c2b6321232fe9398350ec1cc9e9a00ee174db058053fef4ec568f8a04247bf753c89d1e3430474a7ff25f84472d2dcd1ba3084f88c59d555
-DIST cucumber-wire-6.2.0.gem 12800 BLAKE2B 783e434a747a70e338a10f7a505d6f2d9f65cc76e574f6e29d3822090446e041dcda34ed2dbccc0659a4048dcc9208b468919458f9dcf285006428717ee9eac0 SHA512 ae2dd0652705a900de0d873c492b255bae7dd89a3c8da610890e73f69e714d3112f023bb988a1621cc7c0c1b2d2607385bc7673ec57678c032c32bcef604f8b5
 DIST cucumber-wire-6.2.1.gem 12800 BLAKE2B 2a34fa803748499b2bceb270cd1532ce3373f416a8c6d7039b0f55b1f2bc94e9fdd8ce12f8d5f23d4d172ba70cd00b43bbc0629b72e5d5bd1dc55861cf732bb2 SHA512 b32d0f72a31b400ca1596b126d8566aae2ea49514ecd292c621d0d1624f66465dfcac1a6d80293dd15829a00f4080d54190680ede60d7c1c23d2cfec450d1cf3
 EBUILD cucumber-wire-0.0.1-r1.ebuild 493 BLAKE2B 3b26c3323530d510aec5a5071a20fd5e379f63c998f5a3fb608832c2fda89910e07b77f5f7e690954b3600d314e1a238073d123aabcc2248e91b4d64dee431e0 SHA512 2867c63cf53b26a4b6644bbaf6437f351efe4c9b6309353e502cf615fdac732bf9d39d8e216cd12fe664c38a65ea34b466922ca639d389a2f110610f3ed38d0f
-EBUILD cucumber-wire-5.0.1.ebuild 566 BLAKE2B bab0818811b89cd77efdb8e96976679c9d92ab49ddf5c39f0622645071a1b296c14d9c3822728876e1dbef91cfbd1938cb8fae8c02151cd1443d3221b942aa99 SHA512 f56a3682baaaf732de6fa2f073398b38e223c2360a351cf92dc15670bd82775a761d49e11cd9fccec9f9e321cfa626402f9a0fd891f7a1f9d8de9eeb54430a60
-EBUILD cucumber-wire-6.1.1.ebuild 594 BLAKE2B 7caaad08bf11594af90ffa5472662414a7196accddda25f53fd2914264752f11209190d4e603dd2d46e405ad7c3593600abf24c760589d3f41419354e9da5643 SHA512 60ace6d7cd19d6835df4e629a5a308259084d04855f847e85e83110c601b8d70f65b7befe2045ed040c478db71dabb568909b3f63a039b4927c5a3eaab63c12b
-EBUILD cucumber-wire-6.2.0.ebuild 623 BLAKE2B 6c02946627fc44e8ed17c8105978e3fdb1e1389bd25ed9a3e1c72e584fc544976221d217bf5d307cd26575dac7c2b110db85c6f1510587b1162d9e14edc51988 SHA512 9b586a8ddde50c92469cfb571defb9119c0b45f3fe60dce541425c50f4385d2df81e5db99ddd86fcbe3baa820b6b5fcaab5b34f0ea52f32e14fbafaade9f1546
 EBUILD cucumber-wire-6.2.1.ebuild 630 BLAKE2B 2938ef4a589ffb09aeb335e3d943078995cbca1eb75a50e03b9ba157342cc5ef41fd68fb678422dba8f0212a85485bbfb5ef31011220cdfb52f8ae2dedd4e2b8 SHA512 520a58a0e874fb9830d0df470d47cf3e5fbdcdaedfff6d72911c01718c6fa4701d7d0608eed9f4ac640c3e4d26b3037935db89864f2e3ac724006dfdca04e7fe
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
deleted file mode 100644
index c0af915f3515..000000000000
--- a/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-core-9.0.1:9
-	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
-	>=dev-util/cucumber-messages-15.0.0:15
-"
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.1.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.1.1.ebuild
deleted file mode 100644
index ec6f09281efd..000000000000
--- a/dev-util/cucumber-wire/cucumber-wire-6.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-core-10.0.1:10
-	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
-	>=dev-util/cucumber-messages-17.0.1:17
-"
-
-ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.2.0.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.2.0.ebuild
deleted file mode 100644
index f51e28ab8fbd..000000000000
--- a/dev-util/cucumber-wire/cucumber-wire-6.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-core-10.1.0:10
-	>=dev-util/cucumber-cucumber-expressions-14.0.0:14
-	>=dev-util/cucumber-messages-17.1.1:17
-"
-
-ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index a4b1dd7ade27..51b34dc312e2 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,4 +1,4 @@
-DIST cutter-2.0.5.tar.gz 2724670 BLAKE2B 67352247dd4f16c916a669f72b3fd432c9fd122df39be3af5b08d288fab1b83876dbc891df8cfcebe211a9815930855add0ede7cd86667636ebcba1a43065957 SHA512 96badcd2ea00c2b50417b7019933443831fec3a4769cf7ab66505e898d3f2c693f24bbe994ad70f66a456908e621f053a96b21a2999290dc47c4219b6c639bfd
-DIST cutter-translations-67f5c654523d22c7843811e5aa852a01742f6f12.tar.gz 719126 BLAKE2B 24c518c26a47e5eeb9d01ddbe835f9864588954e96820d562afb09f5da3352f807b7c3642d589a9ec81faaefd93fdbdf9c9f7cfc56cfd51ffe6aeaa920385913 SHA512 c2caa0e5d6cfa807cbe9117eb84b2931715e303a7d9902a6aaa58ec71b764d2ae9f0836981bd8eb9c91469b9776d93ab12b986ee068922559b5deaab28f54598
-EBUILD cutter-2.0.5.ebuild 1603 BLAKE2B 3f35843817e23c4588493d51186bdfd1a5307ebcc14639395bc820d600c6db51d68ce479d5a11794b337828048c85d9eb41012fac14946b40a2e7d77fe8619a2 SHA512 00badb445381e0180c694b9a795580ced10a3e203f55e6bb1173bc77955fa70a1a9de66d6143b7afa2c127ee9473c3a1731d9c3a6815d5f75ff547e341697d91
+DIST cutter-2.1.0.tar.gz 2732264 BLAKE2B 463e0f8968c61c7d3b7e3c7a570c9f7c625e4c024306c0284665d39de460bc6780eedd114f51ec722bec6ab7d43077362b676562d0a89665886fbabc3240def1 SHA512 444e27005b9348397097c0c2fd047a557dfd5e8d5d43df6a2ab345da48e26537025ce6f81b256fe765dc59bf5944952965637b84e96136b3025c3dc5bca3f2d6
+DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 595073 BLAKE2B 4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd SHA512 11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2
+EBUILD cutter-2.1.0.ebuild 1604 BLAKE2B 42bf18f1b71b956a2e389af08aa4fe5dd3de41cb1271c42b7a7fefe2b9a22d33ca4e5e70f9d6a620fbae800ca45ac85566fff087ce34bafdda97287eaea2745d SHA512 0411c7eb4e02ace56bd5808f7ed0287233abb8a52708f7acba3322241c059cfc4983f05c313c311b4d1885c963036109f147e3d76a97ad21f52c36da66f37f81
 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb
diff --git a/dev-util/cutter/cutter-2.0.5.ebuild b/dev-util/cutter/cutter-2.1.0.ebuild
index 34ad3bc1089c..4c7fdfec26b1 100644
--- a/dev-util/cutter/cutter-2.0.5.ebuild
+++ b/dev-util/cutter/cutter-2.1.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
-TRANS_COMMIT="67f5c654523d22c7843811e5aa852a01742f6f12"
+PYTHON_COMPAT=( python3_{9..11} )
+TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
 
 inherit cmake toolchain-funcs xdg-utils python-single-r1
 
@@ -25,7 +25,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	>=dev-util/rizin-0.3.1:=
+	>=dev-util/rizin-0.4.0:=
 	graphviz? ( media-gfx/graphviz )"
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 91a00a67f908..3947acf2a81a 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,8 +1,5 @@
-DIST diffoscope-207.tar.gz 2707223 BLAKE2B e20f21c9e0acc78cadfce082f874b3e3cbbbd26cfa5041012eb07a347f177724506d1263b6636c71c5304993e52b81e8ac1fa82ee7231d892346ede2d00de37f SHA512 ebbcf3e7e41f042626f2d175cea027392fc52f65dd11ded8e2a65ed3d58129fe4948e6129c2aec74d58d8f6b58855ada23be8231b426a9473b165eba0f182955
 DIST diffoscope-214.tar.gz 2710707 BLAKE2B 6acd7fa9c69ad831c6d362b805c2094b2f55d57fa87f69e9e153a99a71c90a67884796696df0d24d6b3c94c0b9a41736292d44208f4d8de4262eaa5f2eec6c90 SHA512 67a9b68ce5f7934747e30e41506d7e30f018673314b777ab86af89e3dd56212c442abe6e246741f7b842b5c58f14006442167cf9089823ba4ef1ba07e78eaaa7
-DIST diffoscope-216.tar.gz 2711117 BLAKE2B d4818fc89a511c2387c486a38df0b925a78b4676c0351c2cb3d81ee91856bb48a396e4f09d70d3ec7a67a302f11f94977f015fcf71d2865caea95f01aa80a23f SHA512 ba8ee78516770b623756dea8c48999cc1e4c731a0ac16a4ad38ed2d534ff867534bb31162c10664eda07ab22332e4dae5438a7d33de69c63c2cf25ba7c34a6be
-EBUILD diffoscope-207.ebuild 3297 BLAKE2B 38b17dc44cf8feccd717f69ae028dbada341c4b0dae653cc00fa4032da7c26a9d9026b5d8d29f6dc6f4cda42ee66ffb0d25f63c6dc253dbd0320e1848d01dfc7 SHA512 b97eb645cf2fcd16d472c265913373247d1b923586955860008ce2325369d10b6616704b88001e6260dc39bf409f2d4b5645ee4efec9c9e81f59731cce67ed74
-EBUILD diffoscope-214-r1.ebuild 3314 BLAKE2B 4249250c8390bc42972a495b2df794abf1818873c7223153758995e56d151e8cd901832f6c755e8f3e5f89663e1ccb4a8f417fb3b9f45e462cf98bc958775367 SHA512 2e53328aae5099f552df69f22bfd458109a3668885feeab4022effdf02686d001140006aa556e5b49f1e7080fe8bf91155d8fb6741c3d484992331d5d6c0432f
+DIST diffoscope-217.tar.gz 2711094 BLAKE2B 93bb0f5e7967337a3b5f8a951f8d1bdbb6583b33d0a676fbad8ef7102f920ca9efa653a7a563adba7f151641fddc8b0271a8fe7377df000f6873f319959bad92 SHA512 5b55b04abad2c8bef71125eb4266b6f397fa61d6369a0ab83d15d948c3e558f39a10f4378e7a8e461a56dc1b0a442ef72790012f4ce9d6c5b5f179002143158a
 EBUILD diffoscope-214.ebuild 3296 BLAKE2B 0d6f5c5ffa8be6470d622af2cf72181d283ece6bad089459d6ca12847df804b1174e104d74d39c447e632c6be4c182b56de8fb484c41e6afad9cbd0991ea98b9 SHA512 b8d9e8d6fdc0ab77d79d5f78a3718a6cf90c23afda16a37cad7fb70209f936eca1236f7b3058c89d14e36c1ffe645a81cc08963b2c25ec4c78b39320af30db37
-EBUILD diffoscope-216.ebuild 3326 BLAKE2B ef5314ab8e78b5e93dbdd56dae8bb48df59eeefc8d42d918c29ff87189ee5fe2df07879b2abe04893557265417050c39e68b265fd9c21ecc7e546ab4b15fe21b SHA512 3a73dec69cdef67b5cf7439f5263158c37e5a868376c185da25a447305a25da3b992ad2c0f81469ca5e4a182f85c709a5fd899a84162dd55e7154e948d15ee84
+EBUILD diffoscope-217.ebuild 3326 BLAKE2B ef5314ab8e78b5e93dbdd56dae8bb48df59eeefc8d42d918c29ff87189ee5fe2df07879b2abe04893557265417050c39e68b265fd9c21ecc7e546ab4b15fe21b SHA512 3a73dec69cdef67b5cf7439f5263158c37e5a868376c185da25a447305a25da3b992ad2c0f81469ca5e4a182f85c709a5fd899a84162dd55e7154e948d15ee84
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-207.ebuild b/dev-util/diffoscope/diffoscope-207.ebuild
deleted file mode 100644
index 304d6efd1313..000000000000
--- a/dev-util/diffoscope/diffoscope-207.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-214-r1.ebuild b/dev-util/diffoscope/diffoscope-214-r1.ebuild
deleted file mode 100644
index d3cec4443ea4..000000000000
--- a/dev-util/diffoscope/diffoscope-214-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-216.ebuild b/dev-util/diffoscope/diffoscope-217.ebuild
index 177ba73b1c19..177ba73b1c19 100644
--- a/dev-util/diffoscope/diffoscope-216.ebuild
+++ b/dev-util/diffoscope/diffoscope-217.ebuild
diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index 9da97900fc3a..08f0ed57e51f 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -1,9 +1,7 @@
-AUX difftastic-0.28.0-regex-dep.patch 790 BLAKE2B e61c7a34a0a57bd5acabb265ec55755bab63b6cb66392e1aff25fbb0a5a24d02e021c1cb4f13ffc674767a73362dddfdb50b672990e2ec7837c86c841830761f SHA512 0d29454beb22d61e8ccc1a83295cc1393d1b3dac2295e53794f3d2139a7e8ea24e60a63055b10fbb7472568c0313673c872205baf3c07c9187f2c1d426ee17ee
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST archery-0.4.0.crate 21265 BLAKE2B d5e98cd65b7ae426affc3cd905d7cc4b4296c059a305ae5bb3cfcb206f0bffb6dc4aaf24c820d855ca8acd1be1bd80e2bd8c2e172af5824bcd9b300224d8159b SHA512 4726598957f2fda480fe4fb28b518307030dc032b1b79a9ce83a5e58872e57517a632e205cb83870f48937c3090956045faa066171248d615cb6b029127ee693
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
@@ -11,23 +9,17 @@ DIST bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
-DIST clap-3.1.8.crate 206494 BLAKE2B efead669adb2f2acd231f8161da79022768d2438bd73a3f8d4e0edec91a3a7f9220b90b5993501749dc350fa09b46e24fdab3a33b7c9a78213dfe8671ac4dba8 SHA512 74787dd0a8cd25952a0019c7ec6bce454de2b3b9ce452d2f736b52bdac668d16abe00c08ca42439805296af8bcbc69bbe7f9110baead1296b93abad6b5f84271
 DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
-DIST const_format-0.2.22.crate 72234 BLAKE2B 89d6f58458777d10e21bcf960e57d24069bf2325fd63904dddef10b6186570bf937fb1dc99d5302a1184d2946c35175d92970db583288bf5af45139aa8ac6e7f SHA512 3ed65106b3fa49fe7cbc0592a8a5b0fc9b99d9d44cb51c1fbdb2fb2eb916d801aa19d9ec568560d6df33373324ea226de3db6e82cbeb9a850426589472a1ec9c
 DIST const_format-0.2.23.crate 72319 BLAKE2B 3cb7a72e52709989207d84387cd5c7bb9681d76c9b12834843dd299a75ad8deb49d0d744837a7000d6b5ec799b69fb5f7e9ed0c4bcb7a41c98e27e0ae941330a SHA512 cc6b3254d82be2285e240b86e90593c971bf122ce576a6943281df660a6febecf5b69d7a4512a3c0f3f4759cb2314ce1acd49063a492821a0a957433744b30ac
 DIST const_format_proc_macros-0.2.22.crate 24274 BLAKE2B 61a41f89bb1302cd8a9b2b5b2bb6a90eea2aa6e331840c2b0033acdaef5ddb9cb7a63df028db9e6065a4883aa53002330c6af0bc0b8b3479ef8260c5d088cd71 SHA512 a0382a50502cff46c966fca1518ae1102cc749a9fff142a7fc29c3f3dce4b947ef05576e27248ed682aa9db2e1c0af149f41981d02d8415b63734a0ceccb68f4
-DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
-DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
 DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
-DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
-DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
 DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda40c01add4bdb7a81e9136acb1208c79763cd612160bf39b342460fecc334c6e421e7f7ff610c4bc44e2f SHA512 cd7c60dae8fb19c3b10e0bf1ffbcedac90cbbd147d564335e4da2d5483f64ea3dc10ad17d7573b00958db0a72cce45f8b7bc10c32864dd943fe64df8d22aaaab
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST difftastic-0.28.0.tar.gz 15829294 BLAKE2B aa83cb671b2f8a4abaec319916f5ddb4378bf35bf97847d04199ebaf0c0af6a6f63aa69eba3c291b964bbffa79161ffbc9b570590cc97362ff12a92467f2411c SHA512 47cdbc30abe71dac6ef84efdb934d87d5527fc8822e696bcf20424d07529cecea9e67b4d62e45e81a567064909923de2d8f09f12f1a120fbb43ec911e254521e
 DIST difftastic-0.29.1.tar.gz 15891069 BLAKE2B ceffafa32e600dbf51c4864c386a92620ff1e5b877cb8a5b00443636e13cd383293ce249c52543ca23e01ee93fe08f3b61c13508ff3d00a85670b8d0c9d17b29 SHA512 d9dee1d4d5e165693353c29442b90438b14832545790495616cbbd14c449fecbca73e3e4c5743d86bc9c23f5534a4f361fb596d0ee38ef67f6ddc4bdf20f55c1
+DIST difftastic-0.30.0.gh.tar.gz 23071446 BLAKE2B b20738aa91fa4bb879081b4e38d9b060f8dcbc8dfc2191d047f8cf36cd7dfaa0c78e4899feca205c683edbeee1d4a1d5067705047fde04853b6bf7613cc49afa SHA512 795debca1d4d605ab5e84294457ac59641d59a5494207f64ca443d68561b560245d5c8d68524890876190e459bf372e9b16049d862711ee005e72547a0bfc4ad
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST fixedbitset-0.4.1.crate 15551 BLAKE2B bcebd833a45215566a565bcc8cc3440c5bacbced810d2658048da7050808b56c13951bacdd3930f85530129a118bdc23c42381206b63265da7d6846085937536 SHA512 8c53515f1a372a2626e83bc6999adaa00be6451f68627a63e0207ce6a8967e9cab6061adde3e33305c700c472be750903eb36b6f5ce071248db461c0af450b33
@@ -36,15 +28,11 @@ DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db86
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
-DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libmimalloc-sys-0.1.24.crate 1119801 BLAKE2B a7ac3bfb48805c85566916b4ad7aa14434d21d7758d1c2f96a8b4889cdc1950ef27661223166fb2671040788e8f6a6fdfed3a0a42e5dc38b525e6100d1d9b6de SHA512 b35b72948581ec3505f569af21a1e55cab9024d3f2fe543972863e74e2c1620fc295a3632122e5548b01dbafc6230a1e2a39456070cbc9d3aadafa10fe166900
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
-DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mimalloc-0.1.28.crate 4987 BLAKE2B 01c419515664332335f4f017c2a651ad84607230640921d9d3cfd8c95d319473e1892dc64da1333132b9b7e0bc3641eab1e558258f3b87eff2b05eab20069229 SHA512 07725666f13c3681c58dc646aae9cd916459932140fed34a41eb651d1a5b03b36e48e8bb3fb470d95923140c9c1368c0ee6e526d5ffcc7df2242aabc71918a39
@@ -52,29 +40,19 @@ DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43
 DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
-DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 DIST os_str_bytes-6.0.1.crate 21079 BLAKE2B 85c4a5f450d74bae23e2d2ad1c20cc944ff93fee1ab2fb700692645586acb388d552dca2b326f7df2cc4d07f6a3bdf7aa6704833be211f392250a56786519224 SHA512 16035d3032d499575faf5e8114868d57826acf2b4a54e848f9101713b7965a2fecd6c486945b1c8ccc3ddacdbb95a1c6f8a74ca4fcdee24729648edc817c4472
-DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
 DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d70376be6e438ee1a4de83a8c3c535d4cc866849aed91df74aa9b22d41d428b1142cefe035dab7404ec89af9efaa832 SHA512 ccca3b4c582e860b0643dea78302fbcb96f8f86b356041ae9c685e7c48f1721fd3366dd1bea39afc1bcef03b298d0f6c87918a1ba92a56e6b06bc8b4123c0d89
-DIST owo-colors-3.3.0.crate 27287 BLAKE2B 7b557c7bf358797bf259d520f6bde27b9fc1322e5dcea2934e4c71c89e549509f295aee9c8704f32bb6375fc70311a1dbd887426c8a6dca3cfaa4116e35e9359 SHA512 177b23fe7c665da52b489f274d013b3d52cf126af6cf185cd842658ac3dbf1bcbe9a9b341870e3f7ad978270fb78cb302f7e7a28e83be84105e76b6d357234fe
 DIST owo-colors-3.4.0.crate 30305 BLAKE2B 5e8605592f91e081ffa883b8373d0dbcb4651ab2284e9507bf55ed97860e472916cc1f9bab7edf5198c08935df253d858b9662cc19908325929626bd7e9de6ba SHA512 7c8720a6f142f9f728f98e3a7415b980b4fda7ce3c225e07569b3c9547bd7109c2cbf68659813bdd58a4b7063cd422b2476f8cb485bb2348e37fb705a009d199
 DIST petgraph-0.6.1.crate 184340 BLAKE2B 2e83013cac75f00b231b952067956320485d75951ea197cae191646ea35f2acc79e274e8060066cb7f006a888504bf30c56ccdb97a5ac2fbeae837e125b6b80f SHA512 4f1a9402190e70a63f138f0248248038986bbc4edaa85d4a101f85b006fd33e3ffbbdeb2deb66f303d12f9216f8cb1af88d363fa0dafc3700aa20d546811f88d
-DIST pretty_assertions-1.0.0.crate 73836 BLAKE2B bfe519373be45508354c160acde346c17bea9c1d6b1b3c8e1b96025a6d690e42759cbc54369b458308fab3db1df734d6d6640b8d3c544d0dd696ec83290a4f35 SHA512 65065b7efc5e7003499063464e4b996c84f22637143a01f8857552369960425156e0ce0571a62e876df3a8ac9d1361548bf5d4676749b0baf5bdd3a22f66b1a5
 DIST pretty_assertions-1.2.1.crate 79474 BLAKE2B fbdc7c7ddc40aedaaa845f9096d52eeadd9772f64fda71eb2a2ecfd40745ae6a7ed8baa2a83c909f2a01bfaad31c00aa7c24af6d449022486dac204a3671dd55 SHA512 6e6cb21bf03f34effe3c38ab9b31d768c7a7c02dfb385efb5c1dade7547a367276c5b00c4eae11aa85d90b6f2dbe5033acdf109200196e225e335e73bf5e0ad4
 DIST pretty_env_logger-0.4.0.crate 8690 BLAKE2B bd6cff07f3a9ad860378cd0bc7d44c1fe9ea346aba2970adfc1f23e6fbd3613f11cf8fb19a401f006ea69e8f05f687636d0ef870c25ccdc97c8b60505e2e0447 SHA512 770de8e256cedfb21fc89cc1ecc564ae1a8e67263705b4234b91867996c4db77ec703b70a46aef6b018c6ce09aab6a232fd1eedf8324c39f119a6807daa534f9
-DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
-DIST quote-1.0.13.crate 28042 BLAKE2B fd0e1674c073e26732270591a79744daae7d129976dd35586a8e37d607eaab7e4c2d8f466f80646d3669f874bf4fbb648bc75a0e9f1d07c98394f178d55e7609 SHA512 a0a67ce4ff5e7cfc97467505cbdcf8880cd9be40fac8cb7e5bd57ef398fa1201854ec96a51dc4b163552c237ba19300253c8d87bed777d7eecc7e21a36a6ba06
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST radix-heap-0.4.2.crate 9323 BLAKE2B 5d891bd823cd4a564f139457f01a8fe59256f51516265398586ace2077aab9e2ef19d303a8efeebc8849c2255383154d97ab3c5eedacd72dc91945e4012aa04b SHA512 ce80f6abe1d631374aa814830b4e354e4604d8a29b70e3fdc0544d7441fbda9ef3311f5ae55b671c26e543aa54548764c95675b638a8aa060f9047eb077fc715
-DIST rayon-1.5.2.crate 165456 BLAKE2B 0a08064df966422d32f582f44570504bb405c59f35f20fcd792f4aa980b62fbd8797e8e01f01a9c3ec4f87eb3a1557f485a16ca2191749759beb31f4d704f082 SHA512 3c11bd89692af7e245be2c0b26d96e864a6353eb901706fe6394e3ff8bba13a829609d2a086aa69fbf716ca4286a1977123a950080d673814edf6bd55d29d459
 DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82
-DIST rayon-core-1.9.2.crate 65221 BLAKE2B 44b1bcf748e0bf19e7341c032eed6ea348f284ff9f834af628baa2484d3b468d6c8c31ed0309e226def441ee7a94e2ad0b9a2adf107493bef1ae27882d93a7ed SHA512 83c17e71e3da636d97ad77b64d988bfaa78addfd0c512f0fc09b1755614dab2a35532a4dcb126fa15da4e62461e59f5683b922a1fb4a5381a629992617d0383f
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
-DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
-DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST rpds-0.10.0.crate 67570 BLAKE2B 6728d606f1795668a5aceb44c63f5480d4fa3c5dbd7c84da59138117b240d7fbe7cf050573037b3fd095f9073f4c6db89660b7633fd85238d7c9b8ae76d77f4e SHA512 6f0edf48240be43f373e9f329baa42d32e09ae434e1d6982a5f1ddbd92cc89dae7413877c0e9a53662a6ce6431702dc5ed8bd587fbde711ac413af9fb8253bea
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
@@ -82,10 +60,8 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST syn-1.0.84.crate 235025 BLAKE2B 98fb0ff91c6b103588a12b718445d9cfefced59b2e66fbfff75d44b65f8c411cebb70eaa1bb0e19fbae076c87f179e8ba6231f696ad97a687b58b394c2eaca7c SHA512 c1bfbe6896e8b7e414b2241462aefe9552a5292ba58214e5ee3c70ea54f9cb5d4c77dfc3ebf3b2809bf6fbf297222b4570f2e6e3eb91931cc686d28a58c7dffb
 DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
-DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
@@ -93,7 +69,7 @@ DIST tree-sitter-0.20.6.crate 130955 BLAKE2B e925baa4fb92627b8fecaa9076fac741752
 DIST tree_magic_mini-3.0.3.crate 15406 BLAKE2B 84b8761c1496e1d771bb7d884a0afd48d1a457b87db26edc23f0db63aeb5780966f330662e9725570bffb0122b8544a4e0828e48cdf7ebb892d70f43aaa1145f SHA512 6299f42c3286a9a4b38a1503810b0eee302e99cfd386256dde275bd5df402ba6800cf94b4bb94444b011898657d687f89642634d20f6f07e2a7719c27188d684
 DIST typed-arena-2.0.1.crate 11439 BLAKE2B b5bd230a22894c5545966279b40a8493940719fdf79bed144ad41c363e7f73bfd40e1492efa8d96fb9b5b32e3a31405ef9dbddd55d10bb900ac082d41a034b03 SHA512 182fdac0ef9b494fc2966005ece2107a3c53b6eafe4eebe9be3d552aebe143e05f3db2b51693c253831744fc265ec2a557d31ee42cf0ba5991b38d075278415d
 DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
-DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -101,6 +77,6 @@ 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
 DIST wu-diff-0.1.2.crate 33439 BLAKE2B 78b90ed8a42b3a7a1697f92227edb9f0cb8e74583edf8079b8f85110f6fc049eb68370e93ead3940ae222d108c2f18b7f301e9285968e046d362669a79bbb3ca SHA512 6d93c8854dba66f48f736db3f9e997d11d07a0fef3e13219716e553c0f5936f1d00468b88d9164329cfd195271aa242ec7dfd58560074f1a41e8558719ba5af0
-EBUILD difftastic-0.28.0.ebuild 2148 BLAKE2B a44f10bf53c917b81e755d27b1c804f4790be22f1b52c0d1f9dda127a96c406e4e40596ca1df31875c869a710d776e4ac7f31befea318e1499975294cbc7f01e SHA512 ab85edbd33b1e0af4eec9e5ec8738a2a24e02af51cd2ddcfabe36a088c9b4c22e15ba2432acbf02ebec612962bcb035bf1db964a543cc6dc5e50f9ac6d8064c7
 EBUILD difftastic-0.29.1.ebuild 2288 BLAKE2B 6e8775b5d597500fbed5c72719d2bf8fbe30657df6bb43b27e20afe1a8699a1ef41338201700a5d95506b55d62e38d06acce5c4b8e7073b1428f37c0fc99827d SHA512 1487d5b518cafbf7dcd1ab8aefc664361bb4baea3c7aa0af8254a70d2f4de806cdee9d3cdcc101a6741f1a77da85e983d3719d8c7fb8603ad9b4a7c191b6b495
+EBUILD difftastic-0.30.0.ebuild 2313 BLAKE2B bf57e684cd5a5e8d0f3f95ee97879c3fa3584a7f4b45c412b8690a4f2ca48ee78b4987de0291c7052c1c7322b6048b3c8e1f60a24fea7056c8b6e242d02ca012 SHA512 cdc8b87101ab07a6ff3ea171b2b908e1bdfc2d571fba8489b3b05af400e7bd25440f8b772291046eefb328244df03e4ce4b589f4f13f9f840978ab0386f1faaa
 MISC metadata.xml 333 BLAKE2B 3ba43124273c8969651c7ff68c86718cf0484850e98b2e5de2b4aaacea67e95609b286c6156dc74cb1fa1201e198f0cb685b9cb1f80a6c81cfb8b712dec96a05 SHA512 0726b7ca030ff47d0a304f30f97671e7274905c9c5187edd61eba9224207430ad1cd98d76ecb4120f8b9d722e628834f7bc3d0a3734ef22f0df48fcb44c6c2b3
diff --git a/dev-util/difftastic/difftastic-0.28.0.ebuild b/dev-util/difftastic/difftastic-0.30.0.ebuild
index e8b92f5ade33..3e049575a92d 100644
--- a/dev-util/difftastic/difftastic-0.28.0.ebuild
+++ b/dev-util/difftastic/difftastic-0.30.0.ebuild
@@ -10,61 +10,73 @@ CRATES="
 	ansi_term-0.12.1
 	archery-0.4.0
 	atty-0.2.14
-	autocfg-1.0.1
+	autocfg-1.1.0
 	bitflags-1.3.2
+	bumpalo-3.9.1
+	bytecount-0.6.2
 	cc-1.0.73
 	cfg-if-1.0.0
-	clap-3.1.8
-	const_format-0.2.22
+	clap-3.1.18
+	clap_lex-0.2.0
+	const_format-0.2.23
 	const_format_proc_macros-0.2.22
-	crossbeam-channel-0.5.1
+	crossbeam-channel-0.5.4
 	crossbeam-deque-0.8.1
-	crossbeam-epoch-0.9.5
-	crossbeam-utils-0.8.7
-	ctor-0.1.21
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	ctor-0.1.22
 	diff-0.1.12
 	either-1.6.1
 	env_logger-0.7.1
+	fixedbitset-0.4.1
+	fnv-1.0.7
 	hashbrown-0.11.2
 	hermit-abi-0.1.19
 	humantime-1.3.0
-	indexmap-1.8.0
+	indexmap-1.7.0
 	itertools-0.10.3
 	lazy_static-1.4.0
-	libc-0.2.112
+	libc-0.2.126
 	libmimalloc-sys-0.1.24
-	log-0.4.14
-	memchr-2.4.1
+	log-0.4.17
+	memchr-2.5.0
 	memoffset-0.6.5
 	mimalloc-0.1.28
+	minimal-lexical-0.2.1
+	nom-7.1.1
 	num_cpus-1.13.1
-	os_str_bytes-6.0.0
-	output_vt100-0.1.2
-	owo-colors-3.3.0
-	pretty_assertions-1.0.0
+	once_cell-1.12.0
+	os_str_bytes-6.0.1
+	output_vt100-0.1.3
+	owo-colors-3.4.0
+	petgraph-0.6.1
+	pretty_assertions-1.2.1
 	pretty_env_logger-0.4.0
-	proc-macro2-1.0.36
+	proc-macro2-1.0.39
 	quick-error-1.2.3
-	quote-1.0.13
+	quote-1.0.18
 	radix-heap-0.4.2
-	rayon-1.5.2
-	rayon-core-1.9.2
-	regex-1.5.5
-	regex-syntax-0.6.25
+	rayon-1.5.3
+	rayon-core-1.9.3
+	regex-1.5.6
+	regex-syntax-0.6.26
 	rpds-0.10.0
 	rustc-hash-1.1.0
 	same-file-1.0.6
 	scopeguard-1.1.0
 	static_assertions-1.1.0
 	strsim-0.10.0
-	syn-1.0.84
+	syn-1.0.95
 	term_size-0.3.2
-	termcolor-1.1.2
+	termcolor-1.1.3
 	terminal_size-0.1.17
 	textwrap-0.15.0
 	tree-sitter-0.20.6
+	tree_magic_mini-3.0.3
 	typed-arena-2.0.1
-	unicode-xid-0.2.2
+	unicode-ident-1.0.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
 	walkdir-2.3.2
 	winapi-0.3.9
 	winapi-i686-pc-windows-gnu-0.4.0
@@ -75,13 +87,13 @@ CRATES="
 
 inherit cargo
 
-DESCRIPTION="A diff that understands syntax"
+DESCRIPTION="A structural diff that understands syntax."
 # Double check the homepage as the cargo_metadata crate
 # does not provide this value so instead repository is used
 HOMEPAGE="https://github.com/wilfred/difftastic"
 SRC_URI="
 	$(cargo_crate_uris ${CRATES})
-	https://github.com/Wilfred/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/Wilfred/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
 "
 
 # License set may be more restrictive as OR is not respected
@@ -92,10 +104,6 @@ KEYWORDS="~amd64"
 
 QA_FLAGS_IGNORED="usr/bin/difft"
 
-PATCHES=(
-	"${FILESDIR}/difftastic-0.28.0-regex-dep.patch"
-)
-
 DOCS=(
 	CHANGELOG.md
 	README.md
diff --git a/dev-util/difftastic/files/difftastic-0.28.0-regex-dep.patch b/dev-util/difftastic/files/difftastic-0.28.0-regex-dep.patch
deleted file mode 100644
index 70c3cea7e514..000000000000
--- a/dev-util/difftastic/files/difftastic-0.28.0-regex-dep.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index bb94d832d..e769f61fa 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -418,9 +418,9 @@ dependencies = [
- 
- [[package]]
- name = "regex"
--version = "1.5.4"
-+version = "1.5.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
-+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-diff --git a/Cargo.toml b/Cargo.toml
-index 426c91660..6dd6c2e46 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ include = [
- ]
- 
- [dependencies]
--regex = "1.5.4"
-+regex = "1.5.5"
- clap = { version = "3.1.8", features = ["cargo", "env", "wrap_help"] }
- itertools = "0.10.1"
- typed-arena = "2.0.1"
diff --git a/dev-util/distro-info-data/Manifest b/dev-util/distro-info-data/Manifest
deleted file mode 100644
index bd2989c6b3ec..000000000000
--- a/dev-util/distro-info-data/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST distro-info-data_0.29.tar.xz 6004 BLAKE2B 5b59d444fac259634c9ca7349a8b93c7167fe839971d4761bf133ae8adbd866a41c14af79ee2f149259da8b8ee5e193a2b1b09165b6ad29cafea31c968470e4f SHA512 1c06ce8e0fef12a499623a0c48147c9e99352946c9bdc89a810b413179cff0df43bcd87f839dc200277f3ef8498a34077987121093390551bcf2eb1822da9f2f
-DIST distro-info-data_0.42.tar.xz 6888 BLAKE2B 3f08700046149e7e1a4f94a06f6c8abb93c94a1c0c72bfced497801b2e8081ac14f39a889322b6f0e25e776b3cda36da9066723ca2963b588b588c20ff23bd6f SHA512 e49c54eaf2451f32124c5df6d2b49183bbdc5b9bdb958605e5e055138e0fa67c5033dfaab46620121e7e3d1cc5cbb807f9fed809a59c31cf3501c1ebc7131c8b
-DIST distro-info-data_0.46.tar.xz 8632 BLAKE2B 2f19c670afd37a02279b420f795dd5aefbe91abcf60509bb6fe95387f49b4977288c7f393f12b7a884aae40edc7cd6ddb94a7cf1fc38e7f38e2226b215289c05 SHA512 942d3580a7e3e05de03cf5921835c805faa69cf3b3ea2704b381b13fa708336a87a79cbbe03f5bc53ded8563d6b08eb439e75c3d938dba35f6f8b2f3094e6e31
-EBUILD distro-info-data-0.29.ebuild 429 BLAKE2B 4db3f1370a5e2b3f81a36f9f971d3ef0b3f8f63caa731e06d76321655ce28345cb087761b700c039fc4ae86fc683982dfd39e7c7ea341ba2cd3272b635a94e3e SHA512 afcfea1a2a5bfdf74dc35205a191a3bc634223083243a56cbb3857132dd93aefa4d35e4ba8a5d641f3448dae18bef4262d8c71a721cee8bcc155458ed8db5793
-EBUILD distro-info-data-0.42.ebuild 448 BLAKE2B 200eb6268d8b44263352a770c0bbf5a5409cafaf94e7400f32a7170393923a661c3445b0eef73bb015470a5918aed95ac4db90c13596a8760fbda84411a379e9 SHA512 b456a4737d63d51b37b16a97ab55e7390bcbb0bc8fa1c633d7f99e0b1cca3f9d2e376c8260fc4ab426a3afc99cf5bb2add8f7051126ef768f33edd5b68b2e53f
-EBUILD distro-info-data-0.46.ebuild 433 BLAKE2B ff778d61a406d05273e3efb729419112f59db73c0100a299c2285c4b65b01c371e50d850c56bc23f8a1b8003aac80a41d135dc262d85f5cac4ca216db4c54a39 SHA512 0639c527afa33f3c138639a1b48565e97f53febcb01be329915eb6fc8dfa4d72a5ca78b60c1fefb90ea1812478b6007b64dcc2009a55f56b07af5e5fb90f08bd
-MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/dev-util/distro-info-data/distro-info-data-0.29.ebuild b/dev-util/distro-info-data/distro-info-data-0.29.ebuild
deleted file mode 100644
index b47f4ef5ba60..000000000000
--- a/dev-util/distro-info-data/distro-info-data-0.29.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Information about the Debian distributions' releases (data files)"
-HOMEPAGE="https://debian.org/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-# Package provides only csv data and test script
-# written in python
-RESTRICT="test"
diff --git a/dev-util/distro-info-data/distro-info-data-0.42.ebuild b/dev-util/distro-info-data/distro-info-data-0.42.ebuild
deleted file mode 100644
index 8d2cb558c547..000000000000
--- a/dev-util/distro-info-data/distro-info-data-0.42.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Information about the Debian distributions' releases (data files)"
-HOMEPAGE="https://debian.org/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-# Package provides only csv data and test script
-# written in python
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-util/distro-info-data/distro-info-data-0.46.ebuild b/dev-util/distro-info-data/distro-info-data-0.46.ebuild
deleted file mode 100644
index 047c2953cad0..000000000000
--- a/dev-util/distro-info-data/distro-info-data-0.46.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Information about the Debian distributions' releases (data files)"
-HOMEPAGE="https://debian.org/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-
-KEYWORDS="amd64 ~riscv x86"
-IUSE=""
-# Package provides only csv data and test script
-# written in python
-RESTRICT="test"
diff --git a/dev-util/distro-info-data/metadata.xml b/dev-util/distro-info-data/metadata.xml
deleted file mode 100644
index c3bda71eefca..000000000000
--- a/dev-util/distro-info-data/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
deleted file mode 100644
index b0b133740f5f..000000000000
--- a/dev-util/distro-info/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST distro-info_1.0.tar.xz 30908 BLAKE2B 8355e54919d83d09d3eb7983a35151f0e4253c62eefeccf4d1e614cef0bb7cecf466007c7789749c145674aa30324423f9977a26695d5de537f80d5eb069f371 SHA512 2d84b5845ff4e7ce8059fe83e9d64a380d6732e0e85bc889c948068579d27a86fd31f8e6b7d8cc256f4ff4631cd0ffd480835bf290452d3bc28469f5b3be9ddb
-EBUILD distro-info-1.0.ebuild 1994 BLAKE2B 35d5dd2ff9369d4cf252bc5ef0be4e57597065299a298019e73002ded157a217a756395e2889e8d88eeccc77455f64acbd56036e91468d77f94f1fb5426ee7b0 SHA512 553d7635423c57307a0d8bc0b921e3cc266020ffd02d2165000cd8aed408ceb6bcfc7ce6fa5a068457db87219b95a66ba154e2d8a605e7e123ba8c1704ce9bcb
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/distro-info/distro-info-1.0.ebuild b/dev-util/distro-info/distro-info-1.0.ebuild
deleted file mode 100644
index 6c2ccc45598a..000000000000
--- a/dev-util/distro-info/distro-info-1.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=true
-
-inherit distutils-r1
-
-DESCRIPTION="Provides information about the Debian distributions' releases"
-HOMEPAGE="https://debian.org"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="dev-lang/perl:=
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${COMMON_DEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	test? (
-		dev-util/distro-info-data
-		dev-util/shunit2
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/distro-info-data"
-
-src_prepare() {
-	default
-
-	# 1. Gentoo do not provides dpkg vendor information
-	# 2. Strip *FLAGS
-	# 3. Strip predefined CFLAGS
-	# 4. Point to correct perl's vendorlib
-	# 5. Remove python tests - python eclass will be used instead
-	sed -e "/cd python && python/d" \
-		-e "/VENDOR/d" \
-		-e "/dpkg-buildflags/d" \
-		-e "s/-g -O2//g" \
-		-e "s:\$(PREFIX)/share/perl5/Debian:\$(PERL_VENDORLIB)/Debian:g" \
-		-e "/pyversions/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_configure() {
-	default
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake PERL_VENDORLIB=$(perl -e 'require Config; print "$Config::Config{'vendorlib'}\n";' || die) \
-		DESTDIR="${D}" install
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	TZ=UTC default
-
-	if use python; then
-		python_test() {
-			esetup.py test
-		}
-
-		pushd ./python > /dev/null || die
-		distutils-r1_src_test
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-util/distro-info/metadata.xml b/dev-util/distro-info/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/dev-util/distro-info/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
deleted file mode 100644
index c48b933d21b5..000000000000
--- a/dev-util/dput-ng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dput-ng_1.32.tar.xz 86280 BLAKE2B 7e195eab4f48d77968b866185e337f2b51113f7e11cfa4929d47e79082c2fa866af2c8394c50816b650f865db9ef244775618a05a6b398090366d342a45a3db7 SHA512 596247eecb2dce080cd6f3cd1ddb1364cfa00fc3048081149e4d6dc35822aee10fa10ec25ed91154b477a909cc29dcf17cb38ccefa649f40eb70c16e0a575b2e
-EBUILD dput-ng-1.32.ebuild 1849 BLAKE2B b950ff25f538eb4289c64ee8f3c4360e0635bbf6d052bcc6b2959030ab6ec21c421565e84145fc5669a52b3be6eaf9a9e4d0fbc9f20dd69e869a7b2620e739c9 SHA512 cfaaa3ac84f74f98f3af2aa0aeef40c4c3447706016f42c404f2ec4d50ffaffd4290e582c412b7df1fde13eacc75d06505ea82b38b3318ceafe3e956adf99910
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/dput-ng/dput-ng-1.32.ebuild b/dev-util/dput-ng/dput-ng-1.32.ebuild
deleted file mode 100644
index fac0bd787090..000000000000
--- a/dev-util/dput-ng/dput-ng-1.32.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_9 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Next generation Debian package upload tool"
-HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/python-debian[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-util/distro-info[python,${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/python-debian[${PYTHON_USEDEP}]
-		')
-		dev-util/debhelper
-	)"
-
-# Requires missing build-essential package
-RESTRICT="test"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	mkdir man || die
-	for file in docs/man/*.man; do
-		a2x --doctype manpage --format manpage -D man \
-			"${file}" || die
-	done
-}
-
-src_install() {
-	local DPUT_BINARIES=( dcut dirt dput )
-	local DPUT_ETC=( metas profiles )
-	local DPUT_SHARE=(
-		codenames
-		commands
-		hooks
-		interfaces
-		schemas
-		uploaders
-	)
-
-	distutils-r1_src_install
-
-	for binary in ${DPUT_BINARIES[@]}; do
-		dobin bin/"${binary}"
-	done
-	python_fix_shebang "${D}"/usr/bin
-
-	insinto /etc/dput.d
-	for dir in ${DPUT_ETC[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	insinto /usr/share/"${PN}"
-	for dir in ${DPUT_SHARE[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
-	doman -i18n="" man/*
-
-	newbashcomp debian/dcut-completion dcut
-	newbashcomp debian/dput-completion dput
-}
-
-python_test() {
-	# test_configs.py failing
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/dput-ng/metadata.xml b/dev-util/dput-ng/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/dev-util/dput-ng/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 622146d98cea..901fa47d25f8 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -2,6 +2,8 @@ AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f19
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
+DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 EBUILD gdbus-codegen-2.72.1.ebuild 2190 BLAKE2B c7f123aea978b73975e8ddc25a38d01c08109d2f0cf85528542370f5f1882fb8406511ccfe075b3e6ce6c5225f7fca30aa62562fcf929e64669236f03ee842d5 SHA512 610d8d0eae0eba5d2bef27b8b2e4d5dffaa00573ac8d1a5e887229b8dac2fdedd806b25b5a9fdef9b751be261d3c9dd9909c7b3018427cbc6ab78d15a3abde00
-EBUILD gdbus-codegen-2.72.2.ebuild 2200 BLAKE2B 8e7270f3d97e88d88367625b2b606b32ca0515f0b537cba4392c89864fcba9679f18fbd8528ff11f66ab92d2531f8be395e8d098f11bb7e82d2e3bbe4c5e5496 SHA512 a9db38c6bdd546aefbb729afe4200efeb8e8a3e298cdeba1d8ec220840a6190e663cd9d86f2d0b6f323fb2f21385b00ec4cb956199ddae5a2cf7fe12d6b29b59
+EBUILD gdbus-codegen-2.72.2.ebuild 2198 BLAKE2B 02106adc5dd7de39e2e95df115b1cbc7095eaf90604a86ea7af5f7c0e553e84b1bc7b1074f25be7da7cb76f11f30df439fa125f3a8fbe384bb8fc72aaa235471 SHA512 f1d952a0bf89df17fc50bdad4a0882fe0f841426f5b89120a0d420922abdf2da3fd5540c7b5b3c4e87969d9f8dc9f70547ab9869110ca78d93221c1a483699f4
+EBUILD gdbus-codegen-2.72.3.ebuild 2201 BLAKE2B cf9d3de985f048d31c837bfc32022e410b9c4fd9f3adcc9a18b2b4a404d25bae56718328168cf4c106bfadefc0cbb07e237b7d2f15ea54e04cff6d4be2f3ff1a SHA512 f50c39c3f5d2908f552d7877b83cc887ed9cc8f2418a13213ae9a2c8ff426922ad20f6f2d5f7478d7e21b99213b06df0eca20b6081ecc8505fa24314899f8ebc
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
index 7a6e729ff322..44495d16de37 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
new file mode 100644
index 000000000000..510504f71cc6
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 93fb9bd3b075..f9901605f950 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,7 @@
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
+DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 EBUILD glib-utils-2.72.1.ebuild 2332 BLAKE2B 7581ffec847cbcee17d538b17b01d97d00138e1fe29b2a43c2918c1e1a574c4b8ac2779974ec418e32a4ebd1c052c7e42a59f5fee3d0664e6cae37c3bf8496dd SHA512 96e4650a3d93ad5152784435bb10ae976e218d3415343a13fdafcc85b4551d5186650994b35017e1cae36d78ad034631d9050ae20f823f3f2309b48b354fc4eb
-EBUILD glib-utils-2.72.2.ebuild 2339 BLAKE2B cbce8b6c4ec7c21dfaf98d113fbc167aba15485d8a65ba1820b284c7239231e54651b03998da561451e35d572de8dd8334187800ffc949ae516d622803d82642 SHA512 8e39eb4bf965f13457390aca2a51c6a83849ca0e6e5142a54b60d59b6b2850dbb0f8558ad201252f60833ec7b10508fc29a172592c8271570e427a564f8099db
+EBUILD glib-utils-2.72.2.ebuild 2337 BLAKE2B b9e21ac76d6c1d3af47ae46b55048cde6e7958397abeb29136f143b947485e7409f78c2e8cd1de40c2df6aff56d3fe3df97d8a9fda4ea7d05044a59afe602d4b SHA512 3d860d37cfb81fa37403a7bc473209bd95dd28f192e580b569947a5fda4595181ac7114fc9b7c8e91028e91fcc9994762fd01dde6fbbc5344c2756a3628d418c
+EBUILD glib-utils-2.72.3.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.72.2.ebuild b/dev-util/glib-utils/glib-utils-2.72.2.ebuild
index c35f088bae7e..764522bf2aeb 100644
--- a/dev-util/glib-utils/glib-utils-2.72.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.72.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/glib-utils-2.72.3.ebuild b/dev-util/glib-utils/glib-utils-2.72.3.ebuild
new file mode 100644
index 000000000000..c715c1e6fd52
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.72.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 93f7c36f5807..f95389ebc0bd 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-builder-3.40.2.tar.xz 12083992 BLAKE2B 136c3e89378221116b5252a8472768888f11bd580cf9d1d524504f9000b8123ee479e19073630bb678cc7392b716e45d122b406dc7d44b13ba0ba77b435077e0 SHA512 e0d1f0f21fe0f681f87d1ad672cb5bf60df3ef16541fffd8ca62d447339371bdb5cbc10d8fc83496822d6eb35ad8078b095ff97d950d940d862d6fd7968147a4
 DIST gnome-builder-42.1.tar.xz 13276028 BLAKE2B 657e362ab9a2df1c70d9071ecc010747e5c73bbaa1c0d903778720e4fe874361013cfca3fe162328dfae180502c4fcc68ee01f04d1329add874b9e8db41abcd1 SHA512 a04a71efb163808ed4bfc446334b8f9cabe33cd33c977c9047e4fb00042b18cf7095217b2e287a45efda863ef479fce11435a2d24d489ba1816e3f36a561244e
 EBUILD gnome-builder-3.40.2.ebuild 7005 BLAKE2B 06a4fa62ad0417098178938189e193d178b9fff05857f8285c5b2417865b5152f9ec7b915695e5fab752f111a667d14906ef7b0ad982ab2fe61cd429c6ae5aeb SHA512 05d00f5e523f823c1bd51279496dc7487661edc45c2870b0325a0a726a47e905a76eb7e35c8eaf308bd89d07625834e5b7f52beae4dec943eefaeb4287a1475d
-EBUILD gnome-builder-42.1.ebuild 8927 BLAKE2B 2511dd6a118a6d99d5924c1166ee89a6fc65d70929446c1ca3d8b1087ec04cc5dd88b4404309492d40da2fc2953d9f1c18006a4b273094de19725cf2d8b1564c SHA512 9871408e8306ef300ac79b2776c711f5ef8b15f501e7d3d1895da34dbab87f7df2d6f125375e58d1137fb77cfee630a7130556b62a6d78869c4d1db2424a7f72
+EBUILD gnome-builder-42.1.ebuild 8925 BLAKE2B 9ddf57f6d9348f0fdc2182e4664d126cd36137a6dcbcfec3c074ef92770c00b26a455f4e4a1a8927e02d9b7c8dc326917b3f0a69aa3e4e58a36d4f66b78ce1c2 SHA512 47006a1f96c834ac6c6f6abd157819b9b9db6b7af2fbf7fc471cc058b5adb8c8e180909ca7ac042e6dae50f92b405c09755192c38445a353c08acd723841540e
 MISC metadata.xml 1080 BLAKE2B fc1276ee90bb69bfee8b33d648778c132d721bc294612e0b404216d65d934b441b168a8749c2271bea9d125233e4d7cbd7ff4fa66cc7d5a4f2bca1429b643307 SHA512 efb512e36bc8bd83a15d247a36a325fb579f9f6532d8df53c2067d830697308709df5610b7d445d761b29cf7236d17525e892278e6647b72b1bde7a7e1bb112c
diff --git a/dev-util/gnome-builder/gnome-builder-42.1.ebuild b/dev-util/gnome-builder/gnome-builder-42.1.ebuild
index 140a6077d367..d2c22a74b016 100644
--- a/dev-util/gnome-builder/gnome-builder-42.1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-42.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gno
 # FIXME: Review licenses at some point
 LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="clang +devhelp doc flatpak +git +glade gtk-doc spell +sysprof test +webkit"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index a85e685cf06e..1cbe026b76a3 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -10,6 +10,7 @@ AUX hip-4.2.0-config-cmake-in.patch 588 BLAKE2B 98081d4caa593756c966b8eff9e3a306
 AUX hip-4.3.0-hip_vector_types.patch 304 BLAKE2B 2821fb3bc7aa093a2f17fbb8baff8c5d68080f61a8636163d0c69463390f0ff553a0b67aa0a5879edbfd54a6afdae81325a8eaf58fb89cb6168cf6ccc5cc9208 SHA512 6d32cc886229d94b18b9779f30e81bb2e9cf51bd47385dc692ae49dd308de16e229a2fc560e5c40dad15f1c9c75038f13960754e0dbc57b3f281e5dfa6701f6c
 AUX hip-5.0.1-DisableTest.patch 1689 BLAKE2B dd25393370a594abd3cb6fe8abab6481c2c544edb3f84c7b6481501fd5c2cd33970245cb38d148c5218915a67a8c1d24fde14a5a5c47ed809c613ec78b6d25c7 SHA512 6932af7662b067766b6566f858dba9606818757070b642778d559b83052097ee2ecedb1ae0184ab000c7b068b5413201bb5521e0aa3bf090df369139f292306e
 AUX hip-5.0.1-hip_vector_types.patch 312 BLAKE2B fb5a61a73e741e2456c031adc9c2e96fdccb5b88a3d99e6b4d31a9b53897f6ccbb41c9535296b55512055f0581a394289bae31036d3b7c07a8081e88708b9a19 SHA512 2ab41b46baf0f8adcb82f55b7ebfcfa3097159b7317d2609b490c0406ba47728c37531c03b0a4e474d760776cf7b614e32ccab45c769ce2fb8e54fcdffa61f5a
+AUX hip-5.0.2-correct-ldflag.patch 1117 BLAKE2B 8d11bc278660fb7e14585822a462de96ebca78bf5cec026c8097fa2b9eef87f3d4fd21641d0cfe77f217067bc161b6ece94eb55de71611f106243c8bd41b157c SHA512 1d4b46f941f5b3115705a416822b2a7c034ca6611a7706bc126902e5130239dcf84624f35624f9c7b952314c1d76fcba3f17e40ceb2574b4b37bddada073f808
 AUX hip-5.0.2-set-build-id.patch 741 BLAKE2B 9d4668ab770fd1ebc93a19a3ddc2916e8feb69a95e54ceb5955c4a162733b8899d43f906c86b0b994add22ab46969ff18aad03035e6285a6492bc9c1405bce38 SHA512 714b2f8e791f0e30a7af567e430e2bba38473725e0d96e42de0c97a2ba939fd83b2f233eebf03cb8a6a82d10c46cfa5ea869af97f35c02da38924250a19e660a
 AUX hipvars-5.0.2.pm 590 BLAKE2B b67de8f86bc53d9fbcd50a9cfa9759feb0145f3b3e40360cc322676411e038ff21b8f81265ba27d099e51c3dc55230f87c477cbadfba2b48c08978216f2fbd81 SHA512 0becd625e6f34d687338e25ca4697e68a735a1df60a4c2c53f577e7999a34bc07041f513632f9534aa4b35da2cf50b02c96187f69fd183bff893343257aa85b9
 AUX hipvars.pm 598 BLAKE2B 1645b12179195b95757d207248c85b7c8d9eda0347caee5cb48bdc66e85fda517f607bcb69cdfc63657a0db04ad8e96494a0a80268df7c17d6bb0e689325c2e8 SHA512 6c4e71455341673a329b4b0163fefd7f2f4b7d62da3496643d0de096755899c99b3b5a80fffbdf29896c234cb4f617b368217f4eecfd005849b294ff434b79c6
@@ -32,5 +33,5 @@ EBUILD hip-4.2.0.ebuild 3634 BLAKE2B 6ab4a5d74b08a2dd765bae85bb91fa7174cb0fbe411
 EBUILD hip-4.3.0-r1.ebuild 3782 BLAKE2B b3f7e96b664662e9cdae955993251af254cd44f66e9a4306035875eaed8f507badca6c357bf4fa82e93e76eefdbdf7923de5f56a9eeee762c7ba364abff2b1e7 SHA512 97f34852764c8810eb093ee2aa09f3484382f5a0af5f21543020138bcd8cc40838480a03b1ea88be8044bca71500bf746ed768749e6c71e939b8438f569bd8cb
 EBUILD hip-4.3.0-r2.ebuild 3978 BLAKE2B 16ffbeddfdd5c6d0338e5be1fd609272bb4d00e1a5d1530a00a75d82a5882f52fc0bfd97b14bf9042affa4af4617507a5cd1b8d8f90a1f4c8744028ab63b7f38 SHA512 e664a11e69cc4a7629a8f088992d2e26517635d1f4e685d8dac69e74e6f94e8c1f782f09d0f54308b73c134021579a624bfa2ba8ecac3c470ab81cb317dcb67a
 EBUILD hip-4.3.0.ebuild 3761 BLAKE2B 7fdd7e65a7b1b246ad94a1e5ee37e7c3199f9dcc02df575e774fdbacf9690ac7609f53c122eff5dd87cddf9afd9c4f52d66a5502b3ec311fd6e9db5f3889a895 SHA512 07d8317cae9f7b2f4c179938477eb00ff8d0a136c730bd18582a835c23a8d9934d03824c2bb520c53cb1c2525e26618236b12dfcbfe520612a60c191a1d2947b
-EBUILD hip-5.0.2-r2.ebuild 4516 BLAKE2B 4d49a096527c27bd77365022a7dca407e6a4a10c6f04b294fd96c7910fd41aa10e3c14715ad5630b2f975a3622402449b8d7bf848eaeca17b54bdc221bf8b3d7 SHA512 0f2dba482017db043c56d25bbbafc9af1f58fc1d63cfcda9d8fce606699ba191b8d8f37f514e94130d1ee4846cac0d4fe86c089619d0d8a4e4f60fefb7affa8a
+EBUILD hip-5.0.2-r2.ebuild 4885 BLAKE2B a5b5c0cd40d1ae31d15ba4d774bfc6ce744b06025b08114976b6aa24758f5880eadf0cdd0b483d80469f6afd953beca56bf5dd6e8c79af111bbbe490baa876bb SHA512 00708d55c02c65cba95b009e3e14006901f92ea1ba8a08a32c25996e04613f4d6237c3b9ba0b1e2c237ad8269282fad39e17ef67b2319fb64bbe6ae9654f5748
 MISC metadata.xml 597 BLAKE2B cca1b105463e26741aa4bf95c9d85dd582df075795646f633ed5f0d39bace0b07be98f771aa8eb1b89984788249837303b67617e92c4076eb7601611cd2abf6d SHA512 42767156ae0e89b3ce438bfb163161b543e15114838a5c14b4b1c889fe799e44dd9bf9684ee685798a1fc5d2d4c520d3c42c9c74a88178a079ccb634148e0738
diff --git a/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch b/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch
new file mode 100644
index 000000000000..81d1bc3b8552
--- /dev/null
+++ b/dev-util/hip/files/hip-5.0.2-correct-ldflag.patch
@@ -0,0 +1,18 @@
+This removes ldflag -L"/usr/lib" and -Wl,-rpath=/usr/lib:/usr/lib which
+causes `ld: skipping incompatible /usr/lib/libm.so when searching for -lm`
+Reference: https://github.com/justxi/rocm/issues/8#issuecomment-1166193820
+===================================================================
+--- HIP-rocm-5.1.3.orig/bin/hipcc.pl
++++ HIP-rocm-5.1.3/bin/hipcc.pl
+@@ -703,9 +703,9 @@ if ($HIP_PLATFORM eq "amd") {
+ 
+     if (not $isWindows  and not $compileOnly) {
+       if ($linkType eq 0) {
+-        $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
++        $toolArgs = " -lamdhip64 -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
+       } else {
+-        $toolArgs = " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 " . ${toolArgs};
++        $toolArgs = " -Wl,--enable-new-dtags -lamdhip64 " . ${toolArgs};
+       }
+       # To support __fp16 and _Float16, explicitly link with compiler-rt
+       $HIP_CLANG_BUILTIN_LIB="/opt/gentoo/opt/gentoo/usr/lib/llvm/14/bin/../../../../lib/clang/14.0.6/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a";
diff --git a/dev-util/hip/hip-5.0.2-r2.ebuild b/dev-util/hip/hip-5.0.2-r2.ebuild
index 223386227084..fd069acfe4b4 100644
--- a/dev-util/hip/hip-5.0.2-r2.ebuild
+++ b/dev-util/hip/hip-5.0.2-r2.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit cmake prefix
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake prefix python-any-r1
 
 DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd"
@@ -29,6 +32,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 	dev-perl/URI-Encode
 	dev-libs/roct-thunk-interface:${SLOT}"
+BDEPEND="profile? ( $(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	') )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.1-DisableTest.patch"
@@ -38,6 +45,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.0.2-set-build-id.patch"
 )
 
+python_check_deps() {
+	if use profile; then
+		has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
+	fi
+}
+
 S="${WORKDIR}/hipamd-rocm-${PV}"
 HIP_S="${WORKDIR}"/HIP-rocm-${PV}
 OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}
@@ -65,11 +78,13 @@ src_prepare() {
 	sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die
 
 	cd ${HIP_S} || die
+	eapply "${FILESDIR}/${PN}-5.0.2-correct-ldflag.patch"
 	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
 	# which makes "stdlib.h" not found when using "#include_next" in header files;
 	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
 		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
 		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'/usr/$(get_libdir)':" \
 		-e "/rpath/s,--rpath=[^ ]*,," \
 		-i bin/hipcc.pl || die
 
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 7d87f64c98af..6d5d00c03b87 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,5 +1,5 @@
 DIST include-what-you-use-0.17.tar.gz 747385 BLAKE2B 0f584521b070eec6448d65d6dc4c4fe09110e85099d2696da82be800ee82522185f378c849559d899424a85864878d5b7b4790b900c438ef1f008262d6de6e28 SHA512 2439e3dd37163d3953fc1e45614fb4325be093a162f25d0f45fa8126b2313942a7c8d45ed12454dfbfeb4cb4fcf2f4e3eebdc0ec5da14dad23533f7a0bf58290
 DIST include-what-you-use-0.18.tar.gz 750341 BLAKE2B 6da65c3613abe36d09a07eb56cbc40054f9176771fea61fe9ad1b662abdb8b6d7e052f6c364d618856a5dbc54655157b2d023fa42cf7e7ddf9db8dc3e736cb67 SHA512 bfce2ff00b572961dcba83519959cbedaf1c2ec4bd4e0a2b8b6d12f440887ee64a1c9970fa1a80c7517898ce936219436ab709893cfed92891c5c2aa5d76770e
 EBUILD include-what-you-use-0.17.ebuild 1172 BLAKE2B 758c323e44dd94287cf1c124e8a9bc79826bce4de8c342b3d93ecc4ec1294e198904f55dfed08111268ff6836b37f47af3c9d32cb557f6174a6700b2ba9d9731 SHA512 44864473c3040630c1892e62e77ce064d48e1cc3abdf7eea78bab7337f1e87082cb102865dda4b230f74331725a62a1f680c39563f3121b0b93eda364bdfad1d
-EBUILD include-what-you-use-0.18.ebuild 1207 BLAKE2B c8ece8dd5b79e1ef94102aa8359c6bfbd6de355c5f1e74271e1a2945ab13ed2e49b7e0d3f508107d9f30620d47b014c19b94d0c778383972417c7d621f61442e SHA512 672512e904e2e534ae363709ba6d3db70a5c1b31e1dbe2ae6ed912c734623bdc8338f6b82098146fcc7368a4af5795fc015b4fd7e7361c49f2eef6b314dca353
+EBUILD include-what-you-use-0.18.ebuild 1206 BLAKE2B 9b932b6c0a18cf2057378e44ad11229627900ffa7ff7c9c87bb900402b2f8da753bc6d8c17d5b663fe57f253f10723abaa56654c0c3f1da0e5ce237f5398514e SHA512 277decc664cc30b64be6a02ae34d3e2fb3c6f7901122fe6648c7a73915b7f73054389df80527588b5072313182d6160537f3fb00aeef86701da37680e28f3a4e
 MISC metadata.xml 353 BLAKE2B 2d95f026ce60294177b001cddd8904988aeddb3fb257a73bcf1d028bebd747b0b9467322a0fb87a5de1f7074721ebc2b9931eaa1c519fcef0388a61a8924fea9 SHA512 88e999a1bb1d9993d150347db7b1ec340978594cd2543191646e54d8fb5e125a68063916f048cc1a7166ccd646d66ea33f7f37d94ff20ed21abc7b7c8413e222
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.18.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.18.ebuild
index 2afa1f67ebcc..f16ca796c0a5 100644
--- a/dev-util/include-what-you-use/include-what-you-use-0.18.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LLVM_MAX_SLOT=14
 
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 9d15038f3882..f9aa5368afbb 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,6 +1,12 @@
+AUX intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch 2303 BLAKE2B 3b1e50d823e7e6a95ec9b1dcdc0042a1890e9de1e7e2896ad8505d13fec301f62f7561d0556e5ae46361a0b81925f5fad95a40dfd72c847b9ff97e0e1c529906 SHA512 e9819bea36b88c6615ccc9eed1ff924afc0a7a560d7368a18f815f5dc02b60deced7536d4423bd02355d6e16ac2d91042c8662d8cabf8ed35ab6d099d3a4cc42
+AUX intel-graphics-compiler-1.0.11485-include-opencl-c.patch 507 BLAKE2B 1a777971e4db95a7ac719944f8533d7cb045e2092c452af35c2d5fd7e696ec848ed4777e9653f77627e4ca0fe36f4beffc9a39e3c7a13bda7973af6722238857 SHA512 8aaef1aaf0a6cedcd66e55ee8df0d89d40f3827b28243cc434dbbcadb568d8c1317a0968b57ad0b2a88de4479023a00b1b3b9a65fd34105cebe56fdeb3c30f1b
+AUX intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch 8551 BLAKE2B 378e3ffd95097be18b090da1eca2b01f0333e7818cdefd8fe66c92b210bf49c6c85eb5a1a2cfc5c3a76da098ce3cc215df2f0f6faee5c2057cc3912029f4aa12 SHA512 826804a622b29dbf04ba54ced86da7e09d130842975a4381d29261b450d2615de273e9648c289d200e03cd67f8781467b439a4b542dc26ae04120838e0dee790
+AUX intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch 1046 BLAKE2B 1452cb35b9b198e7f7425bc9eb98603173f2c0984ee6a27d32750341699103f15d289ceffcc6e48c9165575e9e1f8d019911555b1bbd16cf967491f637a44501 SHA512 9bdf30a3de62b3da217a76f0f2e25929a3db538851f6ae807a568ffd740a160cb8f8a908ad22d026662c41bffee5b5c418d5d2e3f8f46cb565fa529f9d5bbf7c
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.11378.tar.gz 8809420 BLAKE2B d503b962193daf3731864739bc0efb753baed3603795e04941d17dcdcaf9e971787ffa877e8295054de41d889a39e2bdbf8119fb7d60110580acea3c24cefc58 SHA512 f3daedfe36badfe07f187b38c9a4da98116533940f4d910fbbd060813aeb1e3ffaa627a72180e66736748830a80cfca4c2a6dc9c8e9507884629e3e55add1cbb
+DIST intel-graphics-compiler-1.0.11485.tar.gz 8831925 BLAKE2B 7e2bcb37b4c34bb01788a8d75fc42498223b6193421cb726c21ce7949181757a10d112ae151736cd9283ba6ed8f0625597fb1f2a61229a7352e7f1f5ec34d1d0 SHA512 03fb571fdd61daea3a5c61ff75a146bd98b9b92dfd8bc1957143fe127977f5111df680ac86769d3c1fa1801ba2012b600b1ff844b318ce64460f2d042c4ae65b
 EBUILD intel-graphics-compiler-1.0.11378.ebuild 2328 BLAKE2B 11f86a5068c3aee12e4eb5b2c9dce8a18a0bfc3e3b9d0ce6b1d40461a3f35ca76689e0ebc34587f9351b423ce2d889145c5d506280664eea2f58a74645c0ee29 SHA512 4206f6316d9b8cd34f2c790a94b2c2fc0210d9370f5145ff8a5f80b18209f1c393f6185cc5fa89877e9a51743d601db9d8d3a879d0b2f2ae74f168f3725dda30
+EBUILD intel-graphics-compiler-1.0.11485.ebuild 2636 BLAKE2B 46e80df315df3a06e54c9faa193418e3957f50fe2e5ad51e1bca714ec56a93d527eab9e02ac735515e4e7ee5f239a5b6018f56e2bffeb8ef838711607c6f2347 SHA512 9c9b88508d022ef7b9ba02081964fbededa9822d32f5a211c6fdfd70c064bce4233fd2d45ccaeb5c88e099f4877ac976ea355b7279034ad7dba538c1f55179f9
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch
new file mode 100644
index 000000000000..7ad261e0aa6c
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch
@@ -0,0 +1,49 @@
+From 12c99343388eba6e6275856b25e0fa8978585dfb Mon Sep 17 00:00:00 2001
+From: Marcin Naczk <marcin.naczk@intel.com>
+Date: Mon, 13 Jun 2022 08:28:24 +0000
+Subject: [PATCH]  Find OpenCl-c.h when clang is take from system.
+
+Find OpenCl-c.h when clang is take from system.
+---
+ IGC/cmake/igc_find_opencl_clang.cmake | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/IGC/cmake/igc_find_opencl_clang.cmake b/IGC/cmake/igc_find_opencl_clang.cmake
+index dc8924fb7ee..0a54ac68249 100644
+--- a/IGC/cmake/igc_find_opencl_clang.cmake
++++ b/IGC/cmake/igc_find_opencl_clang.cmake
+@@ -94,19 +94,25 @@ if(CCLANG_FROM_SYSTEM)
+   else()
+     set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_LOCATION" "${SYSTEM_COMMON_CLANG}")
+   endif()
+-  find_program(CLANG_GE7 clang-${LLVM_VERSION_MAJOR})
+-  if(CLANG_GE7)
+-    message(STATUS "[IGC] Found clang-${LLVM_VERSION_MAJOR} executable: ${CLANG_GE7}")
++  find_program(CLANG_EXE clang-${LLVM_VERSION_MAJOR})
++  if(CLANG_EXE)
++    message(STATUS "[IGC] Found clang-${LLVM_VERSION_MAJOR} executable: ${CLANG_EXE}")
+ 
+     add_executable(clang-tool IMPORTED GLOBAL)
+-    set_property(TARGET clang-tool PROPERTY "IMPORTED_LOCATION" "${CLANG_GE7}")
++    set_property(TARGET clang-tool PROPERTY "IMPORTED_LOCATION" "${CLANG_EXE}")
+     set(CL_OPTIONS "-finclude-default-header")
+-    if(LLVM_VERSION_MAJOR VERSION_EQUAL 7)
+-      message(WARNING "[IGC] : clang-7 should be patched with VME patch (https://reviews.llvm.org/D51484). Assuming that it is. If not, please add -DVME_TYPES_DEFINED=FALSE.")
+-    endif()
+-  else(CLANG_GE7)
++
++    # Get parent dir of the location of CLANG_EXE
++    get_filename_component(CLANG_EXE_PARENT_DIR ${CLANG_EXE} DIRECTORY)
++    file(GLOB_RECURSE opencl-header ${CLANG_EXE_PARENT_DIR}/../*opencl-c.h)
++    if(opencl-header)
++      message(STATUS "[IGC] Found opencl-c.h: ${opencl-header}")
++    else(opencl-header)
++      message(FATAL_ERROR "[IGC] : Couldn't find opencl-c.h, please provide it.")
++    endif(opencl-header)
++  else(CLANG_EXE)
+     message(FATAL_ERROR "[IGC] : Couldn't find clang-${LLVM_VERSION_MAJOR} executable, please install it.")
+-  endif(CLANG_GE7)
++  endif(CLANG_EXE)
+ ###
+ #2. CCLANG_BUILD_PREBUILDS - use prebuilt opencl-clang toolchain
+ elseif(${CCLANG_BUILD_PREBUILDS})
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch
new file mode 100644
index 000000000000..dbf4188ad0bc
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch
@@ -0,0 +1,11 @@
+--- a/IGC/cmake/igc_find_opencl_clang.cmake
++++ b/IGC/cmake/igc_find_opencl_clang.cmake
+@@ -104,7 +104,7 @@
+ 
+     # Get parent dir of the location of CLANG_EXE
+     get_filename_component(CLANG_EXE_PARENT_DIR ${CLANG_EXE} DIRECTORY)
+-    file(GLOB_RECURSE opencl-header ${CLANG_EXE_PARENT_DIR}/../*opencl-c.h)
++    file(GLOB_RECURSE opencl-header ${CCLANG_INCLUDE_PREBUILDS_DIR}/*opencl-c.h)
+     if(opencl-header)
+       message(STATUS "[IGC] Found opencl-c.h: ${opencl-header}")
+     else(opencl-header)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch
new file mode 100644
index 000000000000..248f8244e32f
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch
@@ -0,0 +1,186 @@
+From d9535cc5c3e54b21d56c492d4e21cb13c80b9b7a Mon Sep 17 00:00:00 2001
+From: Artem Gindinson <artem.gindinson@intel.com>
+Date: Wed, 22 Jun 2022 11:53:02 +0000
+Subject: [PATCH]  Update RayTracing for full LLVM 14 buildability
+
+- Address further casting issues
+- Use pre-existing LLVM wrappers for function argument manipulations
+- Create & use LLVM wrappers for `AAQueryInfo` and
+  `CallBase::getRetDereferenceableBytes()`
+---
+ IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp          | 3 ++-
+ IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp          | 3 ++-
+ IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp | 2 +-
+ IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp       | 4 ++--
+ IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp  | 4 ++--
+ IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp   | 3 ++-
+ IGC/AdaptorCommon/TypesLegalizationPass.cpp              | 2 +-
+ .../include/llvmWrapper/Analysis/AliasAnalysis.h         | 7 +++++++
+ IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h      | 9 +++++++++
+ 9 files changed, 28 insertions(+), 9 deletions(-)
+
+diff --git a/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp b/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
+index b5ad27e32ca..67cf302495c 100644
+--- a/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
++++ b/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
+@@ -19,6 +19,7 @@ SPDX-License-Identifier: MIT
+ #include "common/LLVMWarningsPush.hpp"
+ #include <llvm/IR/Instruction.h>
+ #include <llvm/IR/IntrinsicInst.h>
++#include <llvmWrapper/IR/Instructions.h>
+ #include "common/LLVMWarningsPop.hpp"
+ 
+ using namespace llvm;
+@@ -129,7 +130,7 @@ void rewriteTypes(
+             "Only handles void right now!");
+ 
+         SmallVector<Type*, 4> Tys;
+-        for (auto &Op : II->arg_operands())
++        for (auto &Op : IGCLLVM::args(II))
+             Tys.push_back(Op->getType());
+ 
+         auto* NewFTy = FunctionType::get(
+diff --git a/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp b/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
+index 5e4df4e1a86..9433340d259 100644
+--- a/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
++++ b/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
+@@ -46,6 +46,7 @@ SPDX-License-Identifier: MIT
+ #include <vector>
+ #include "common/LLVMWarningsPush.hpp"
+ #include <llvm/IR/InstIterator.h>
++#include <llvmWrapper/IR/InstrTypes.h>
+ #include "common/LLVMWarningsPop.hpp"
+ 
+ using namespace llvm;
+@@ -155,7 +156,7 @@ bool BindlessInlineDataPass::runOnModule(Module &M)
+                 // the size of the Shader Identifier + the size of the Local arguments
+                 const uint64_t dereferenceable_size =
+                     sizeof(ShaderIdentifier) +
+-                    local_buffer_ptr->getDereferenceableBytes(AttributeList::ReturnIndex);
++                    IGCLLVM::getRetDereferenceableBytes(local_buffer_ptr);
+ 
+                 // Return a CallInst* representing the InlinedData intrinsic call
+                 // In the shader dumps,
+diff --git a/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp b/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
+index 8b6bba69f23..2c3a98d04e3 100644
+--- a/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
++++ b/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
+@@ -449,7 +449,7 @@ CallInst* LowerIntersectionAnyHit::codeGenReportHit(
+                 CustomHitAttrPtr,
+                 4,
+                 Attrs,
+-                std::min(4U, DL.getABITypeAlignment(AttrTy->getPointerElementType())),
++                std::min(4U, (unsigned)DL.getABITypeAlignment(AttrTy->getPointerElementType())),
+                 IRB.getInt64(DL.getTypeAllocSize(AttrTy->getPointerElementType())));
+         }
+ 
+diff --git a/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp b/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
+index 4d42b32af36..d8d7ac3c54f 100644
+--- a/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
++++ b/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
+@@ -61,9 +61,9 @@ class RTSpillShrinkPass : public FunctionPass
+ 
+     unsigned getAlignment(const DataLayout& DL, StoreInst* ST) const
+     {
+-        unsigned Align = ST->getAlignment();
++        unsigned Align = (unsigned)ST->getAlignment();
+         if (Align == 0)
+-            Align = DL.getABITypeAlignment(ST->getType());
++            Align = (unsigned)DL.getABITypeAlignment(ST->getType());
+         return Align;
+     }
+ 
+diff --git a/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp b/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
+index 87549a6ce85..797e77a548d 100644
+--- a/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
++++ b/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
+@@ -114,7 +114,7 @@ bool RayTracingFinalizePass::runOnModule(Module &M)
+             {
+                 // Temporary WA to ensure we don't page fault on unaligned
+                 // acceses.
+-                uint32_t Align = LI->getAlignment();
++                uint32_t Align = (uint32_t)LI->getAlignment();
+                 if (Align == 0)
+                     Align = (uint32_t)DL.getTypeAllocSize(LI->getType());
+ 
+@@ -125,7 +125,7 @@ bool RayTracingFinalizePass::runOnModule(Module &M)
+             {
+                 // Temporary WA to ensure we don't page fault on unaligned
+                 // acceses.
+-                uint32_t Align = SI->getAlignment();
++                uint32_t Align = (uint32_t)SI->getAlignment();
+                 if (Align == 0)
+                     Align = (uint32_t)DL.getTypeAllocSize(
+                         SI->getValueOperand()->getType());
+diff --git a/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp b/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
+index db5490267fd..d352b67a50f 100644
+--- a/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
++++ b/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
+@@ -49,6 +49,7 @@ SPDX-License-Identifier: MIT
+ #include <llvm/IR/Dominators.h>
+ #include <llvm/Analysis/PostDominators.h>
+ #include <llvm/Analysis/LoopInfo.h>
++#include "llvmWrapper/Analysis/AliasAnalysis.h"
+ #include "llvmWrapper/Analysis/MemoryLocation.h"
+ #include "common/LLVMWarningsPop.hpp"
+ 
+@@ -175,7 +176,7 @@ BasicBlock* StackIDSchedulingPass::schedule(
+ ModRefInfo StackIDSchedulingPass::getModRefInfo(
+     const CallBase* Call, const MemoryLocation& Loc)
+ {
+-    AAQueryInfo AAQIP;
++    AAQueryInfo AAQIP = IGCLLVM::makeAAQueryInfo();
+     return AA->getModRefInfo(Call, Loc, AAQIP);
+ }
+ 
+diff --git a/IGC/AdaptorCommon/TypesLegalizationPass.cpp b/IGC/AdaptorCommon/TypesLegalizationPass.cpp
+index c3570f39d31..10da29ee242 100644
+--- a/IGC/AdaptorCommon/TypesLegalizationPass.cpp
++++ b/IGC/AdaptorCommon/TypesLegalizationPass.cpp
+@@ -207,7 +207,7 @@ TypesLegalizationPass::ResolveValue( Instruction *ip,Value *val,SmallVector<unsi
+   {
+     IGCLLVM::IRBuilder<> builder( ld );
+     Value* gep = CreateGEP( builder,ld->getOperand( 0 ),indices );
+-    unsigned alignment = ld->getAlignment();
++    unsigned alignment = (unsigned)ld->getAlignment();
+     unsigned pointerTypeSize = gep->getType()->getPointerElementType()->getScalarSizeInBits() / 8;
+     if ( alignment && pointerTypeSize == alignment )
+       return builder.CreateAlignedLoad( gep, IGCLLVM::getAlign(alignment) );
+diff --git a/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h b/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
+index 873886cc860..385c04db970 100644
+--- a/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
++++ b/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
+@@ -19,6 +19,13 @@ namespace IGCLLVM
+ #else
+   using AliasResultEnum = llvm::AliasResult::Kind;
+ #endif
++inline llvm::AAQueryInfo makeAAQueryInfo() {
++#if LLVM_VERSION_MAJOR >= 14
++  return llvm::AAQueryInfo(new llvm::SimpleCaptureInfo());
++#else
++  return llvm::AAQueryInfo();
++#endif
++}
+ }
+ 
+ #endif
+diff --git a/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h b/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
+index 569eece3fb5..1050c842271 100644
+--- a/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
++++ b/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
+@@ -50,6 +50,15 @@ namespace IGCLLVM
+         CI->addFnAttr(Kind);
+ #else
+         CI->addAttribute(llvm::AttributeList::FunctionIndex, Kind);
++#endif
++    }
++
++    inline uint64_t getRetDereferenceableBytes(llvm::CallBase* Call)
++    {
++#if LLVM_VERSION_MAJOR >= 14
++        return Call->getRetDereferenceableBytes();
++#else
++        return Call->getDereferenceableBytes(llvm::AttributeList::ReturnIndex);
+ #endif
+     }
+ }
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch
new file mode 100644
index 000000000000..23754ccb6b4b
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch
@@ -0,0 +1,24 @@
+From 1d5ceafdbc005f3adc58be5af1dc92f068908e16 Mon Sep 17 00:00:00 2001
+From: Artem Gindinson <artem.gindinson@intel.com>
+Date: Mon, 20 Jun 2022 12:38:04 +0000
+Subject: [PATCH]  Wrap CallInst::getNumArgOperands calls for LLVM 14
+
+Rework all remaining call sites to rely on the already-existing wrapper
+function.
+---
+ IGC/Compiler/CISACodeGen/HFpackingOpt.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp b/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
+index 69d6151f8bf..e24362d7791 100644
+--- a/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
++++ b/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
+@@ -825,7 +825,7 @@ bool HFpackingOpt::findStoreSequence(std::vector<Instruction*>& path, std::vecto
+         uint srciCount = inst->getNumOperands();
+         if (CallInst* cinst = dyn_cast<CallInst>(inst))
+         {
+-            srciCount = cinst->getNumArgOperands();
++            srciCount = IGCLLVM::getNumArgOperands(cinst);
+         }
+ 
+         for (uint srci = 0; srci < srciCount; srci++)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485.ebuild
new file mode 100644
index 000000000000..74f02de2f3a1
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="13"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-1.0.11485-fix-BiF-caching.patch"
+	"${FILESDIR}/${PN}-1.0.11485-update-raytracing-llvm14.patch"
+	"${FILESDIR}/${PN}-1.0.11485-wrap-getNumArgOperands.patch"
+	"${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+
+		# Compilation with VectorCompiler causes currently a segfault.
+		# See https://github.com/intel/intel-graphics-compiler/issues/236
+		-DIGC_BUILD__VC_ENABLED="OFF"
+		# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 34520495e875..b1e1f986b758 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,14 +2,10 @@ AUX jenkins-bin-r2.init 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e2
 AUX jenkins-bin-r2.logrotate 479 BLAKE2B ccfe2179a1c3a5a49140373bb594fd4fd2c40edb7ffc7fcdeef6dd7a8da0116bb7f1d7da42f914b779651a6b69c147cbbacd02bb6f5fc1ecd7a8b3269ace56de SHA512 b06d0900e92d14fe6bfd194d5eee667e40a49a13d57c6a1720767a925b5647da1d7b2e6239e7d64d86ff7798df215cac6332e09a89e11ab6fe1a1dc42ac818aa
 AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
-DIST jenkins-bin-2.332.3.war 94928325 BLAKE2B 2e93756ad898761fa5a139cff75e68f130dc5a47fbf9f39c5cb0f02848595a29f84a6ba567ad78a248fc658e1811baa8ea89841f1b632aff3974865aacdda64d SHA512 62bc639e7bed7f6cb194781761735dbf07b4e7b38a38b43a798c386e7000d589b3f6202ba8789a685d3b2ac18cb1554b19d4208362b945e4866e8a810be84e57
 DIST jenkins-bin-2.332.4.war 94930441 BLAKE2B 9502d7fd91d0ffc6871ff0613061883bef98442cf69469ef6bd1cc23fb1849d0b8e70aacf27e2807281a575889c34c574a84caae0226c8fd922fea0bdf334485 SHA512 e187804f8ab1454b56e88b89b258ee57e1c4c2069ef33d87e78e2797252498817edbed15208ec3644a77d51d51afebc0c12e226cb24068bb21a415f21d9727bb
-DIST jenkins-bin-2.334.war 94653863 BLAKE2B 83c237384723dac7c850be45b1d61cd3a9fbae91d1286bf1de3613badc311ad57619dddfa1cea935f4a1cb378948c41194a762de44b8b356b00cb744f976586d SHA512 bed2b70efab177f8c56ff3f9eb4af8821038b1b4a3f996772d07233335494cc9a335e97f24182f9467f5363b31c46127a393cfcc48eed52368773836a06b82e0
 DIST jenkins-bin-2.346.1.war 91193351 BLAKE2B 21a0f2ec258498e447a25527e82ad6e7e0b061daaa9647f244930471629de4805755648f6a689598e048e3ffa72879d1dba88a7a4d5ce3fe5bff287f6cd395ca SHA512 63a34dcf66714b6db405a46ca6677693458f49cb61ff413c8c4bcffe6e10eff33ead5dc2e4f3eb3560980c33f1dbd67c3f51655d578ce5cbb19e1ddf871aa545
 DIST jenkins-bin-2.356.war 90781388 BLAKE2B d65e1642a118cfcad66c4585bfe4e30cea8a5e8b598a6ba33b298a158fb2901d0b388aec9087d243648f51067661cccfb610948129f35c40c5c5bba4d3fb89e0 SHA512 2b602cac61101e4f47a23727b682684cec6afac7a867606f5210f5213a78ced0d0b1a2bf10507c26c58e480217a59b906626c80d133504f8d195a6e9e8fed94c
-EBUILD jenkins-bin-2.332.3.ebuild 1101 BLAKE2B c4912482e9f3287818e01d0b7e9d83591822145d69b39fd91439f5cf31043caa3c91b051cb556ea89129de6ab356600640b9701d538ada8145812dc880b9ada4 SHA512 ecbd288fe8594a97ffb716e582997b1e9f296d2e93754dc7975bed8b682153549e8789def16dea9eb713c73c63192fc7639591a59242c9d7b03ccdf09aade84c
 EBUILD jenkins-bin-2.332.4.ebuild 1101 BLAKE2B c4912482e9f3287818e01d0b7e9d83591822145d69b39fd91439f5cf31043caa3c91b051cb556ea89129de6ab356600640b9701d538ada8145812dc880b9ada4 SHA512 ecbd288fe8594a97ffb716e582997b1e9f296d2e93754dc7975bed8b682153549e8789def16dea9eb713c73c63192fc7639591a59242c9d7b03ccdf09aade84c
-EBUILD jenkins-bin-2.334.ebuild 1117 BLAKE2B 2e124af6b9c70ec8c8157f020ca2e3bd4b9e9184400706fdf14230613be6497cb812ce366ef7fb03df827d696273ff045176d6ce1fdd3236afab7c46c83d2858 SHA512 e3f96fade1ca640425bc875b2001fb8477678e89a5321ee673388f1a4f7bbc270a53a7350c0d34273b00a36c00b13c4dd1b67e5d95ef4970e904541a3d16fb49
 EBUILD jenkins-bin-2.346.1.ebuild 1123 BLAKE2B 8a494477de627fa4c185d560621ab910783d11320b0b500cfe738ad5cd3bd6820faed9c8b72345ed60aa9984cbb2e4b6060319bc23c9f38f499413df66994ee8 SHA512 b6280a876876976f3380440e7795ae043262d5315bba75e3531abfcaf629dc657e4e77e7e4a31b3473c34095da0bd8af8aa5bebfbb4cbc9171d3029e85036b75
 EBUILD jenkins-bin-2.356.ebuild 1116 BLAKE2B 645d4d7c3df6e0461fc6ddf2579b3c361fedcceeeff651ad9758d0240d66c70b7d0f83e6c8ca59f07df4094b56001f2d610f6fd607e56fe3de93cdc504270776 SHA512 c905cc7fa57702c542ceb856b5420903412ce035270a0c3aba2d5f2282d5fdce5a9dfe0a8750fda034ae0aba6d2b74912f8694ec2159b17d54185a1da008721e
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.332.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.332.3.ebuild
deleted file mode 100644
index 8e851381fe5b..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.332.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	virtual/jre:11"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.334.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.334.ebuild
deleted file mode 100644
index 78fde83d5d56..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.334.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	|| ( virtual/jre:1.8 virtual/jre:11 )"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 4befefc5079b..29806a3ec93e 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-21.12.3.tar.xz 1080044 BLAKE2B 6d391c0a4fda21c3b21d8ebc70e48a90b63ae398abd91de8cf0641a0aab07e16045fbb156f267c83b32e95635e3d0a04b6f7f0488bfed093fba2f57aff8fc7e7 SHA512 e35637bf6e40d100a4393ac575d11f6ea73d55131e21d9d8fafbf07eb7d7990a27614d6025591c3ffd6283e6b3a1b7246870faaca98b8edf9e21fc310d1d5ba3
-DIST kdev-php-22.04.2.tar.xz 1081384 BLAKE2B 1d61ba33e07f4145ac8c51bf5a6038cd12b010e3f18041b17a2fd22195f47868906129784467947a4e41ff0de8aca70d915c66fcd8c25836d23e843ece5ebeec SHA512 ef0039d6645f92efc8297df49141e372829df7c88444ffdb7ede00dd5148f5c7a4f7d4eb1c6a3c4087696b9a74ac2aa8161d1be21691d42238c47b9a473238ef
+DIST kdev-php-22.04.3.tar.xz 1081120 BLAKE2B 252aecf224ac8059b0b24042b0d3d8a369125e3cf881aabda10fc999348104db9bdb23fadf08115281ae6332b8c2bc068e75078e63d761fb495d3808c879bfb7 SHA512 95fd3c3d6dc92351eaf470d4047d77622eae9629e7010c52b01f5b2b96c710664e1d8b32082f70942bd7f30d2161e1f61d596f62de36b38a173cf60594d277b8
 EBUILD kdevelop-php-21.12.3.ebuild 1233 BLAKE2B 08a02abf2d36f241984447072ddb37d8940a23f9c82681adad6118088bca094245428979ac725cdd5e59a9e920a9463533384ab36e97a510f2333a006c597a59 SHA512 eb1623d63bc503084c5b676a7fe11827c8a0685d023f64c33bb2dc09c044a1e4a51d2ccacbbf0b72e7c11ef65e4d1f9019f3efcb96d2221076eb13717a9c5f24
-EBUILD kdevelop-php-22.04.2.ebuild 1236 BLAKE2B 576b69633b494e0a9598017e5cefa42bbfb55d817cff700b0ae640d5bf3562de7645f302ce77238f2a2cd83f1fa0572dc31ccde347293d932f3fabf2c6dc5528 SHA512 bb1b85a9e70a8a7fd6233f0e08cfe39dc85ad7d18b0471aa06aa8cc1fb6e7444d329312fe73fc8b05e256ef1ca5289bc0c5fe55c6f82d0a0ec251ce346046170
+EBUILD kdevelop-php-22.04.3.ebuild 1236 BLAKE2B 27769fd566394bd62214315371cee02e562828f24fdcfb4d54895fa5cca26a31de275bf595023abc7964f193a0aeab5fca2188774d2b40581869f12ae8691b37 SHA512 72b9a28c656c719c4faf90be767d345ff3ece7872538859ba022f0e069fa8e782020cc396f7d38ba02ef7902bc4ee6ae9f4a37b6d2085dbd56e5888c3253c8fc
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-22.04.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild
index 35773af7137f..1ee2b9870fe6 100644
--- a/dev-util/kdevelop-php/kdevelop-php-22.04.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild
@@ -10,7 +10,7 @@ KDE_GEAR="true"
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-php"
 KFMIN=5.92.0
-QTMIN=5.15.3
+QTMIN=5.15.4
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index dbb4b7392b46..ab6b579b4bdd 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-21.12.3.tar.xz 1089924 BLAKE2B 8658281280147ce4e87b6f2df9adbdb7adaab326c4bd7a107d49be47b1da876b6d31f1118d5d7103bdec826cc225209125fe07b3a18b947b42252b6cfc2b839c SHA512 06e4df638357fca9cfaba6a2d070e7977fdd0029e77cfd385c6aac80a2953ee1a4ca7a5042d4f1b14b481337e4d5e1c14ca2db86529df88d219dc6b45c44c469
-DIST kdev-python-22.04.2.tar.xz 1091224 BLAKE2B 05cffc8aea43c0aab14b26bf2992029610fbebffd7bc9193080e3bb1ddb25aeb772f516cad4679c3b4ffbd033fbc23f0a575a5afe74b4d95fac71e533576cab7 SHA512 8445c864f10b974e23a196428fd74cffec520abb1ba3eb06a05a24cf660e8c08ab1c85b4089024977b7e6515b3921c3481e27698f62915d7416e24f213eae7bc
+DIST kdev-python-22.04.3.tar.xz 1091116 BLAKE2B 2512597a4a741de579d82af9d331cf8a7eed60c147e65e78817702649ea59be3dca14a91c9a7407d7825ef91d113881644b89ca736cea6ec02e697b0e2316e8c SHA512 1070b60e513ac0abe15ea0de17606833c87b6ed5e8a15a8230c240c0777b5ee5d021164db0270ef77f5190eb75b64514c30c64761aaeb9ddfc37fab330c257c9
 EBUILD kdevelop-python-21.12.3-r1.ebuild 1236 BLAKE2B d6e62a9e6ff86a22c805dd4ceaea372f3e9a1c6f583926b8cea1cdd72768621228fd15895c2e3e85c3bd7f16c156f54471ca3cf0a446154f76d738d3a5d1ddba SHA512 2de016e68095b49f9e09e7887b5363a50c72fa74fbe8aa10af9e370431773794a855bb396af191229e976f9b1afd0bc8702a73277e28d5dd6abd458ad68cced1
-EBUILD kdevelop-python-22.04.2.ebuild 1239 BLAKE2B a7f2bb96d0d0d5df06eb69260ea5a70e4f290aab5752178eca872e383e2fb58fb8bbacab32213c20555126c8eb9d9bd07de35f9d3ff58e637adbfa6f7a2060e5 SHA512 f0978b328848c2cf98883944f3fc047efb8d525688d22b8e698ba22347e5d28e322d31225953c1af7070f084b6b77cdcf842055f9431f6e212d8fc601a93d5a5
+EBUILD kdevelop-python-22.04.3.ebuild 1239 BLAKE2B 6951ed541f191e6684c9099592615dab5755f495c2913af380cd6255a16e7b118c04e90a36649bb8ec3a877e404c6a95ae37bcf29e82911bbef97e3ce1864c38 SHA512 52527dab8a972be0c43ab8ffc19e4310a77bac3bd0a2ecc1ebb3b75ca889cdb43fde74833ca825f0704a50f802ab1d87349566469a066939722dc259521444e0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-22.04.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild
index 987f81c8505c..b8fbbc3b6c47 100644
--- a/dev-util/kdevelop-python/kdevelop-python-22.04.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild
@@ -9,7 +9,7 @@ KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-python"
 PYTHON_COMPAT=( python3_{8..9} )
 KFMIN=5.92.0
-QTMIN=5.15.3
+QTMIN=5.15.4
 inherit ecm kde.org python-single-r1
 
 DESCRIPTION="Python plugin for KDevelop"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 70287e859942..360025fb4b06 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-21.12.3.tar.xz 8391560 BLAKE2B de0ee16db9de9b725431a59450c4f907103f87214a5b1ea365b17ec9916391b0be565e9d8977a8661dc6a00475bc0c162335fece0a518136ed1b18878fa47747 SHA512 963bddf8b405d818303c43c392c7c3070e8acdd00f6f3edc8c4adc9c9b946388019cb99e8f647268ef2a25337a52a046ec6591634d8d214b4e70bc39b6e1a5ad
-DIST kdevelop-22.04.2.tar.xz 8426024 BLAKE2B 275bc7fbb5a899a74fff9a86cecc7a725c35a665031c57a0b3606ef0c81e7965e6c1ef247fd1fab92111e2e1af7eec234087ab8a62e0fcf17498c32f8300a08d SHA512 813dc4a4f4b4d17e365dee6bf902b34bfb011e4b27876e6e9bb801462c860d9df376e6e65bf9657d7b3dd2ecdd19b4180968d0ebbdea68d4e3ec194ead20a29e
+DIST kdevelop-22.04.3.tar.xz 8426644 BLAKE2B 114ec3d6f94712482ccf485cdb746f51f0898bda62d40a24a21222098596f1026dadebb0f901a030cfbf5cfd8bf6d66a22b4960bbeeadb16baf12b62d90e5816 SHA512 a78a2a1e5232369a676297ff52f8f3cf0e003c28d0513628e4a0c37a91018232f4c7f485021a73d4bb617f383483b8795713038fa30c7e5d63675e9b78251a71
 EBUILD kdevelop-21.12.3-r1.ebuild 4145 BLAKE2B c6e52f2e0ddbbfc643bd250bf6c013838a5db313df584274f70d0404ed36a62b4766ac2ca87416f6e2019688850280d79ceeb1f4087621f600533cb297c4e140 SHA512 dfe1eac9c33713d057c788ac2f241dbb520107b6ae7a0ee9151cc06dc97d81b713731d79a7e79d47b7bdf899fb78bc2ae788b3e7d587fa176f7a3a4c3884953c
-EBUILD kdevelop-22.04.2.ebuild 4148 BLAKE2B 3abcffd16dd3b61f1179c7a40ca5f240e8c501a6158eb702c72bf45b50f488823fec5f168e02932d7a8c0e793981cecceaccf0775a9a5cb041e984394138599f SHA512 96e9013ecca7a3d32fd8157577c2737bdbcf77c862f6da81d94aadd895b136af1856f8e70a978e3d296f2adcb101173096eb95be67aba4165fd2d33bcc94651d
+EBUILD kdevelop-22.04.3.ebuild 4148 BLAKE2B 8e28259fc1e2100224172117488194239855618f33d8d49fd0a593e9223f24f8176025ec4ac3f1a85aaa800642c211ea8635b4b618b874699c5848dc54c65e9a SHA512 26024e2015edbdeabb29227454f7688a7f2273bcca41f7104e5b2b0b4f1a5526cc29a1ea7c5156df11a5ae3dbba271e5625447e719e1df9966326733d11a671e
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-22.04.2.ebuild b/dev-util/kdevelop/kdevelop-22.04.3.ebuild
index bc328de79398..4b3d24b903d4 100644
--- a/dev-util/kdevelop/kdevelop-22.04.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-22.04.3.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 KDE_GEAR="true"
 KDE_ORG_CATEGORY="kdevelop"
 KFMIN=5.92.0
-QTMIN=5.15.3
+QTMIN=5.15.4
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 77dfd78c4eff..91758c217a9b 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -359,5 +359,5 @@ DIST zip-0.6.2.crate 60077 BLAKE2B 3353cb0b8557ad1f16f3a3964a5c6d992bd044eebe385
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.12.17.ebuild 8037 BLAKE2B c5b406316271cee7e2603da966ac839a55954628826f504e38d7eda4b73db31dae54522fdd6bc2183f4e0ce3b9ec1958a79c22bdde4e303f705cd0f38f607609 SHA512 98b817e77795ce2b1d68137aeb2dd60beb4595a928f6db4a6a1af9c70fe40ce68b13439557dfd1c804b4e22727156c2ea16c65d3dd70e6341cba7272b43fde7b
-EBUILD maturin-0.12.20.ebuild 8473 BLAKE2B 7cef739d9448f49b477e06f6954bb774a1b4bd667a62b4549d70952f5afca0ed87f8fc5202ad55f8f9d0f4125ec67f7034de57cd27039603a8b1d5de34546d56 SHA512 2272c83f5058766b67b5819edee3379b13e672d3a6f16bbad6257c24d04615aee7794a78ef7705ac50610e09ba2059a82c588297ea71bc83c345999a2b018b51
+EBUILD maturin-0.12.20.ebuild 8472 BLAKE2B a4c605e6946af255031a7375d6bb0c82ee779d65529a0b3bc1fdc44dad4f5d08a87c029750106a13a4e676eddc3be7fb21075c5634d0370a4ff10b1fa3537dd4 SHA512 f42663d3d1ffd376cf0454342f74fc437a8937dc56eb9c3cdf61f967796d458d5916beaddfca87ee52230e54b9f70b410bbdc8c5d971979ad4f1e75da7e0861f
 MISC metadata.xml 536 BLAKE2B db6debbdfe3fbc3107e6683cab0a93686735191fe9a04602112023938ce570f5c6ded2a72c850280e61f7ba8b1e7ca93198f93e03d4750649f2c03d7bf60095b SHA512 010e51df2a4364b5f26e2c2aa6e645e5f26d40d9c22e7782305eccc25f59b37b5287f210373383994a5db40f9ffd2a6a52848bc9ed80066521de665358b1e29a
diff --git a/dev-util/maturin/maturin-0.12.20.ebuild b/dev-util/maturin/maturin-0.12.20.ebuild
index 10e610cabdc5..a11723f703f7 100644
--- a/dev-util/maturin/maturin-0.12.20.ebuild
+++ b/dev-util/maturin/maturin-0.12.20.ebuild
@@ -341,7 +341,7 @@ LICENSE="
 	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl
 	doc? ( CC-BY-4.0 OFL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/meson-format-array/Manifest b/dev-util/meson-format-array/Manifest
index 0312e935d537..eb1984e3fa19 100644
--- a/dev-util/meson-format-array/Manifest
+++ b/dev-util/meson-format-array/Manifest
@@ -1,3 +1,3 @@
 AUX meson-format-array 642 BLAKE2B 5daa5807f11f35c96d9451e5c6b7198950b4edf24119fa606620f00133075a6a830c98a05f1d3d2c7a5fac1f15107c571d6e8750a5790e3ab945cf8a07d2f51f SHA512 54c173f286cd0b98d6b69633d45b4d57dae26c561dd8c3f3bb2e6690773422c925e5f1d510d0a00f7723136b3f1ab51c5738d4bf207dcaad4d35ae6b8409cf8c
-EBUILD meson-format-array-0.ebuild 683 BLAKE2B afcf8984f888446590c34a629fe4a5a94fd65801fdbf1afc6caa2c59fb3e0d9d27c0f452402582284e0ae137ca8848da368e69894f327bbf96acea1183a68a9e SHA512 728045b21f9f7ee83a5518e6c93bcfb10d0fa4a0ae96092797d981d32de4a80b648a32709e7f22b092396cf972537d8d06ede9da54a66188e39da2671f70c4bb
+EBUILD meson-format-array-0.ebuild 683 BLAKE2B 33048f11c8282669c68dc575c238b75f1fd92c6568b165c68c54e86ce5d859fd88e14e1ae966d1291b2436fcbaa31da1adff3617bcae6e9e1683dce21273291c SHA512 016224ab1ca6458779591173ed784ae69dc4da1bdee885d340dd37192b0b919e5aee8510f2cbba05fa2971520a615039c78194a897421e1b8b8dea9334eefc87
 MISC metadata.xml 271 BLAKE2B a2279fc595f4360379e0df7685e0e2d2f14c0b06ecfc3cada635d7d993af586c3fecf94d36534208266b9f8cbe3111d1d88c5cbad3618a62694ba367eeab5369 SHA512 5d347bfa3c17b76d8f226a33620534d142c58006734529b3345791a51966b87c92a578b70cab1104caec353dfcbd6838a309d608783fea37ab36660533f62142
diff --git a/dev-util/meson-format-array/meson-format-array-0.ebuild b/dev-util/meson-format-array/meson-format-array-0.ebuild
index 6916b9fe8239..208d82af4e66 100644
--- a/dev-util/meson-format-array/meson-format-array-0.ebuild
+++ b/dev-util/meson-format-array/meson-format-array-0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-r1
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 33f6f8f4fa17..8ce9f66eef11 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,11 +3,11 @@ DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e
 DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef SHA512 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195
 DIST meson-0.62.1.tar.gz 2034805 BLAKE2B 6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f SHA512 52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32
 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
-DIST meson-0.63.0rc2.tar.gz 2059282 BLAKE2B 4b90ccc87fddcd9d1e6edc71d508990e68da8eeb6349de76f170a4951d64b106d098fc23ef46424b6af2210ccc5be1d79a5c12f18c2ac70c3f8162ceaa4e2b6b SHA512 898e2dbb8b1dc4145c70c9042054cd2bc9568ce363cfb9b9ac697f2d8f406f7d4e312f7c7233b1cfd8d74946b253d597231d2dbc4f7803f98a33cdd03237a1a5
+DIST meson-0.63.0.tar.gz 2060688 BLAKE2B 763d35a6dee42d7ef61b00c472681042289f38737374178d43eb8e66c3abe38affd372fca7aea4f4c7cd52f25ad3754485f54f24ac5e453b7a58011397ddbbb8 SHA512 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea
 EBUILD meson-0.60.3.ebuild 2678 BLAKE2B 1b602648e5c7eb7be683acf70c759499f95e3a777b42dd1e0b7d26edfa9c3b468b7b2d9a1962240f14efbb569654e1d937da3a505c8e0f68f2700c1d5ad5f2f6 SHA512 2aaf4796facbe63668cf4ae702d0a1a13cd56de0760ea803acbd48d491a2eaa76839b8a43dd1b077a9aaac8a7da416fa7de840107479b261fdaa2895a44d99c5
 EBUILD meson-0.61.4-r2.ebuild 2921 BLAKE2B 9ef05e7b1f2eaa0220aa2932cfdf6eaa77752bb7ae8a63e5f05ec86cbffe4155bb1f7ff36fb11a045e14b3a45d1a6836c8fad381058000d63edd004249ce135c SHA512 3aeca22ff744634526306de74e995d69e1cf2c0ef7b367567b6babf973366dd2e84b8e073d84c5872355e6420da6557be96876a261a17983285a1a0799c7148f
 EBUILD meson-0.62.1.ebuild 2857 BLAKE2B e1fe1482234d090c12b995d6bcf56336c299d2759d6f0e1e487598021a5c551a175d04ddd29f29fd516ce87137cf32aa614dedbedd304a207622e1a79ec700f9 SHA512 29cf1f26c8c2449f9aba2ee2d554514df0f1244be206255702edd20a5a91f89ae01c88006c55890dee7812ed08828f4a2600358e3248eb8752972b536fca556a
-EBUILD meson-0.62.2.ebuild 2856 BLAKE2B a7c0401f5d366a9191302d7d58395ab7287db6c5b4de696091139a99dd870ff0ee09a1be8e67d149525f566c507341bd8127d9a3a615f5849a878bb91b08772b SHA512 56b07a732851a7d464a5bf19539923ca49ef6be14c4af83e3022061760aa5c02ec1d1e3e9ee4e1ff6db6ea273f96cf0e8f97262835d501979a67549da15cda4c
-EBUILD meson-0.63.0_rc2.ebuild 2896 BLAKE2B 36395f0a737b9ae248f08276d2cb4892a3a1090b4c8f0740f1dca475c3daf19c4b529631eac748ecd75bbb54a92b6817c941dbadcbb185243c2425a120a868d9 SHA512 5ebfe5456c078aa2d7cbc9a9c4d27111c49e5c81e2f3c4ec800c99c4ccf56efc687e14046873d52be6068abf84d2a1cd28c1f4c7e276fe31e03a8409220754bf
+EBUILD meson-0.62.2.ebuild 2848 BLAKE2B 0f1794a5141c01af083d614e9acd9d37461a0ffc68f71d33177bf934efe1261c260c1518e502552193d45814529335e9a98ba1ceb78349cf243bcdbe6eb3b12d SHA512 d333739fa3d7557cf9e84950004c1539c072ce43a3dcd88bd1409af4961ab2a37cf2989ed34fd0c6e80bf79d66a53f0e7e9d550e5e802d8b70ecc7f54a3dcd68
+EBUILD meson-0.63.0.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
 EBUILD meson-9999.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.62.2.ebuild b/dev-util/meson/meson-0.62.2.ebuild
index b5d3433c2dab..f424a7baab47 100644
--- a/dev-util/meson/meson-0.62.2.ebuild
+++ b/dev-util/meson/meson-0.62.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.63.0_rc2.ebuild b/dev-util/meson/meson-0.63.0.ebuild
index a7a111a382b8..14ecaa4f465b 100644
--- a/dev-util/meson/meson-0.63.0_rc2.ebuild
+++ b/dev-util/meson/meson-0.63.0.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P=${P/_/}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index cd1331f6e704..2721b5a79511 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -4,7 +4,7 @@ AUX mingw64-runtime-8.0.0-udivmod.patch 865 BLAKE2B 848b45fb68c775baa5b285293df0
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
 DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e
 DIST mingw-w64-v9.0.0.tar.bz2 9537758 BLAKE2B 298b97f50c7632972aee2c75e90de0776f64c1dd5aaeb52d4e4be10a8e0365efee82c93179990cc090cc7b9f83525a7abf51a5d069b7a3e39abb37fdb733a70c SHA512 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386
-EBUILD mingw64-runtime-10.0.0-r1.ebuild 3821 BLAKE2B e0d8d9849026ef80aa32362ced9dafa928997c037abf9ef8d59380bfcabd6c0067164fb11b76a43c2c8bad694d945d6e2bdfd55a6d4a7d7e90afd2d59b16d71e SHA512 fa52708dd8a7d472f4fae3f7613d8de0a49fe91fa54f40a78af5e07436c41b86de24f80c1f2ffd5945d56d62bafd7739e6f4f03f1a3150b153b300b746859ece
-EBUILD mingw64-runtime-8.0.0-r3.ebuild 3826 BLAKE2B f7fdc38895e7acff66a685eaebd8ffd71f4637bc4aab9e48624675362275f5beeadf078a62e90e8d5c4b21c492453741578487e3a1a2178ffd22df765e47d4ca SHA512 3c66f71c61f5f54babc20a571eb1a7aec29eb14a7dedfd0ce575b3d65a40059df9b6c5370a7ef3cfe8715e35bc2167c290b49af5b1113fff4c760cf25da4bf30
-EBUILD mingw64-runtime-9.0.0-r2.ebuild 3758 BLAKE2B d30c933883cd1a69a7ae76f8a7a37f8752dac21447f167e201e1d031b0419171f3f4dd5f0c49c2d458d51adc777aadab90cf4efb30be17b41b19ad849a09c4a5 SHA512 1d0bf51007b942d8fc9e550997e1bf9072d8b17026444887c7a271334747cb4df5e1ecf539bc7cd2e65dcdaf15cbdd301f25bcbd2eafb2114c4947bdb8b0d3f1
+EBUILD mingw64-runtime-10.0.0-r1.ebuild 3931 BLAKE2B e8436ebe36d5b90232f5a55ec2c606d0d077ad2f04871763507f5ded900ba5cc6093692b8a3694d13bbea464f6aebe2bd500846c56c9b772e23e988c2b80987f SHA512 ef09e2b3dcc60e0c28c6d30f59ced9781e9bf9e906fa45846628706261a4290c7b88e1f19b84029504d5de384fed328fb7750882c2bc8336c94aba4dce2898a7
+EBUILD mingw64-runtime-8.0.0-r3.ebuild 3936 BLAKE2B 0701875192ee81f31002d97bf5b3a94342fbe9e35c4b33d21cf95e672219b6f8227cac0fb81c9c5c9a4d9d308e53ce1ec2e9f954ddb49639d17f529f7fbd51eb SHA512 887720f01a0feb783f8df00c38020f07d785763a2db50a85e9fc9cb39106231bda4907df059ca0a405be62f80bb50d8470b71a0501dd17f3654116c881d8c001
+EBUILD mingw64-runtime-9.0.0-r2.ebuild 3868 BLAKE2B 2ed6775ea335b121de1d9dbc1f410dfc3ef4b7ebdc86a2e03b0b22ba01a0ae53fa7dd93f28ef100cd27e1413868876f2ab758b5709bbf02373102a752bdc0583 SHA512 5dbbb18885811ab931948d8f879bc72cc16d115fb08b4f6f6512ebd94b6d61cea851c474196ed5e054906eedb409e497b9cb6da16d7cb7c57d1680fffaa8d6f9
 MISC metadata.xml 904 BLAKE2B b7b42242ff7a39ba87ec4889295bb1229122bd20f34c163499423d989120569d5b6c69ed9490f328aa1af8a9dd3ff2ec0f07b85910e7d2eb401f40dbd670d366 SHA512 80bb5c58cf80d7233599e772a1e615ec4b4f16bd9387539a684d11e0b7196e7a3d21f1b56d18271b9a4b0544253e3fec4130ff70702ba4cf5684941ff8d49a51
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
index 3b3854308f65..004d6be49356 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
@@ -36,8 +36,13 @@ pkg_setup() {
 mingw-foreach_tool() {
 	use !tools || use headers-only && return
 
-	local tool
-	for tool in gendef genidl widl; do
+	local tool=widl
+	if use !amd64 && use !x86 && use !arm64 && use !arm; then
+		einfo "Skipping widl due to unsupported platform" #853250
+		tool=
+	fi
+
+	for tool in gendef genidl ${tool}; do
 		# not using top-level --with-tools given it skips widl
 		pushd mingw-w64-tools/${tool} >/dev/null || die
 		"${@}"
@@ -47,9 +52,7 @@ mingw-foreach_tool() {
 
 src_configure() {
 	# native tools, see #644556
-	local toolsconf=(
-		--prefix="${EPREFIX}"/usr
-	)
+	local toolsconf=()
 	# normally only widl is prefixed, but avoids clash with other targets
 	${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- )
 
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
index 9efc43518403..f8c49eccf6eb 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
@@ -38,8 +38,13 @@ pkg_setup() {
 mingw-foreach_tool() {
 	use !tools || use headers-only && return
 
-	local tool
-	for tool in gendef genidl widl; do
+	local tool=widl
+	if use !amd64 && use !x86 && use !arm64 && use !arm; then
+		einfo "Skipping widl due to unsupported platform" #853250
+		tool=
+	fi
+
+	for tool in gendef genidl ${tool}; do
 		# not using top-level --with-tools given it skips widl
 		pushd mingw-w64-tools/${tool} >/dev/null || die
 		"${@}"
@@ -49,9 +54,7 @@ mingw-foreach_tool() {
 
 src_configure() {
 	# native tools, see #644556
-	local toolsconf=(
-		--prefix="${EPREFIX}"/usr
-	)
+	local toolsconf=()
 	# normally only widl is prefixed, but avoids clash with other targets
 	${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- )
 
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
index fbd35d0570b7..3a886c7ab13b 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
@@ -36,8 +36,13 @@ pkg_setup() {
 mingw-foreach_tool() {
 	use !tools || use headers-only && return
 
-	local tool
-	for tool in gendef genidl widl; do
+	local tool=widl
+	if use !amd64 && use !x86 && use !arm64 && use !arm; then
+		einfo "Skipping widl due to unsupported platform" #853250
+		tool=
+	fi
+
+	for tool in gendef genidl ${tool}; do
 		# not using top-level --with-tools given it skips widl
 		pushd mingw-w64-tools/${tool} >/dev/null || die
 		"${@}"
@@ -47,9 +52,7 @@ mingw-foreach_tool() {
 
 src_configure() {
 	# native tools, see #644556
-	local toolsconf=(
-		--prefix="${EPREFIX}"/usr
-	)
+	local toolsconf=()
 	# normally only widl is prefixed, but avoids clash with other targets
 	${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- )
 
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index d32f13b27a60..b2c649ab7eb8 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -1,7 +1,8 @@
+AUX gcc-11.3.0-musl-calloc.patch 812 BLAKE2B a9e77f042ef5e0843535009a922ef1aaa57f54a20c66e0fbe2511ff8c15e9a1e756d766ea118874f620dc20b99fcf38d561aa6711d03a8935b490db77c036145 SHA512 c5bcf8ca3e28e696f0ce2ba4acf06fe5f1574dc954ae319023330f5958695c63c39b0cc95badcf4ff5738739e699adcdccd1b757c3b296b2ce7052d670482560
 AUX gcc-11.3.0-plugin-objdump.patch 762 BLAKE2B c98cec68476fd3c5922c8b84a5f971e86d20f8e47da2923e929b7852da62ffaa45d0ed78c7326e9b4319696d11478f2aac1fabd7ddb6688d85f9b6e686a37120 SHA512 a012c01f54a6db490ae06cde80696fbdc750e937e54f2848d43c920ecdd3365f57197ff08b818d6d2d8423bfe5b31b440642a99fc34506d99588ab6703c95286
 AUX mingw64-runtime-10.0.0-tmp-files-clash.patch 572 BLAKE2B c0604bf4bcc3de23a4144bb1482e824c145e51e19468489702002c8d0e446dbd896424d1cd498329e144892e46349286d3d9fdf257a1cc181ee0ea6f87a25b3c SHA512 01eb77360b609a32bfa65da5b4ca4c737144514c43d1d05b462e2dec8051aef921fde23ec2c39c17444464ba46354dbe109e9267b8fa77a929be1550711290fd
 DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
-EBUILD mingw64-toolchain-10.0.0-r1.ebuild 9565 BLAKE2B 9f3a32ccda8de94e77b3f1dd3996f8ae924fe411a9ad000082ff596af12cf3673a9053e8d478cb5f320ed223111ff00ff7a4aad9803d4482d6662ba8c034226c SHA512 7b79d7719222ccf07b6c641304eabec06721b09fe829c05fe107286d013f5de7a5331aa071df5977ffabf2c2c4d08d36e27995ab9aeb1bf9558d5001db0eba82
+EBUILD mingw64-toolchain-10.0.0-r1.ebuild 9609 BLAKE2B c9faefe5443163fa004b10cab28e8ab0a6763545d667cb84c77683de8e26ace4bf9b71da345f824430f2dccac68f2d20d5d767e626e695267a9c3b4a1f33e917 SHA512 561ad63c45b4b114fa3acc74985cc4eb224c13e85b102a6fb72baf05d7a3c0fec56ba36a3a4558bda1522b57d0d46eee87c051809f7749fdc71e626b4f28c454
 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
diff --git a/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch b/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch
new file mode 100644
index 000000000000..71602df60cca
--- /dev/null
+++ b/dev-util/mingw64-toolchain/files/gcc-11.3.0-musl-calloc.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/855002
+https://gcc.gnu.org/PR104799
+https://gcc.gnu.org/PR106102
+--- a/gcc/gcc/cp/mapper-client.cc
++++ b/gcc/gcc/cp/mapper-client.cc
+@@ -29,2 +29,3 @@
+ #define INCLUDE_MAP
++#include <pthread.h>
+ #include "system.h"
+--- a/gcc/gcc/cp/mapper-resolver.cc
++++ b/gcc/gcc/cp/mapper-resolver.cc
+@@ -27,2 +27,3 @@
+ #define INCLUDE_MAP
++#include <pthread.h>
+ #include "system.h"
+--- a/gcc/gcc/cp/module.cc
++++ b/gcc/gcc/cp/module.cc
+@@ -206,2 +206,3 @@
+ #define INCLUDE_VECTOR
++#include <pthread.h>
+ #include "system.h"
+--- a/gcc/libcc1/libcc1plugin.cc
++++ b/gcc/libcc1/libcc1plugin.cc
+@@ -19,2 +19,3 @@
+ 
++#include <pthread.h>
+ #include <cc1plugin-config.h>
+--- a/gcc/libcc1/libcp1plugin.cc
++++ b/gcc/libcc1/libcp1plugin.cc
+@@ -20,2 +20,3 @@
+ 
++#include <pthread.h>
+ #include <cc1plugin-config.h>
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
index c0d573454f7f..c902601aa43c 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
@@ -44,6 +44,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/mingw64-runtime-10.0.0-tmp-files-clash.patch
 	"${FILESDIR}"/gcc-11.3.0-plugin-objdump.patch
+	"${FILESDIR}"/gcc-11.3.0-musl-calloc.patch
 )
 
 pkg_pretend() {
diff --git a/dev-util/ninka/Manifest b/dev-util/ninka/Manifest
index 6b48c7b9e86b..56e1fcb807de 100644
--- a/dev-util/ninka/Manifest
+++ b/dev-util/ninka/Manifest
@@ -1,5 +1,7 @@
 AUX ninka-2.0_pre1_p20170402-braces.patch 284 BLAKE2B a417f77193b086485ca5522cc14328c54ba52e1a0a8ae263c1d2880f5c6efa0629ed6c180675c844af9595ba977a453548400964b2cc09f70c758c90937f2c8c SHA512 76bfcd86036fccca00f2f5e145a52aa280fb129b7dccdcb6c2f1dcd591b35d964baef3f82116f7f2159394be227766ebaa15bce7e3177f8a15fbeda41c05be71
 AUX ninka-2.0_pre1_p20170402-makefile.patch 911 BLAKE2B 40157c2517b8959842a83d47d60f937a5da8d0c6da8ed3378fc186fe7a6b528d048b8f4227cc529b5862b72a489c7f3a5ce5280b7977dfe425e01518adb6db01 SHA512 4b9c604608446b49d308221757f986f8c9c901aacbd9c09dba1b26eecb6798e381782e49270f79ecbf4cff45d50c4dba99cc04b9fd9d428a9c8b66d7d74043aa
 DIST ninka-2.0_pre1_p20170402.tar.xz 136080 BLAKE2B 9c612dd3586681b1bb037d5c7271341fc652ca62d3e22ee29f330922d78e9a460e3bb2700f4216ea3fa564ed2e5c83a9c50cdea5db796851bbdc999b9f35658a SHA512 fc1c8f6e134c6c618852bc62b306c4e73fcd7443900f4d31d9abffe718e8b4fa7e3853631d0207f70e1223d00a72e976f4c3e7c8780a892113644ba5167f30a1
+DIST ninka-b94e0d36669c4cc086856adf57bc67ced8f1aaf0.tar.gz 266201 BLAKE2B ebc0466cef0e193784fb9a4096d6e35f3c006efa1911e76bba3996f12785cf2748fa4aeb13b0caa2689c4a3a325874d8922f0fd47b27739d4e33e81d11953958 SHA512 3c9abb5e7e5e3b1a2b46e04b0eaa0c9e5f681ffbe37077f0ce5aee727a4e68a2bf169aaa8953678f452abee916c62a47d4305f669f9023350a235442b7cebfca
 EBUILD ninka-2.0_pre1_p20170402.ebuild 1139 BLAKE2B 614d4fe61b80a102178ef4b5c70085cef5ee916a9f327eba12d7ee4988284ea6bafb5516b4aae94ded2c119b74cee2b71e8c0ccbe053b232151793c986832d21 SHA512 d75d06dcaae8789ff21f46bf5a2fa9faa19b2cb548f811f7f6dfff60988e7c56c01dd707cfb914ba630774f4026230581cd064baf140c6d730ff4183904515af
+EBUILD ninka-2.0_pre1_p20220619.ebuild 1177 BLAKE2B a1ff4ac077e2dfdd83432d73544f83a584f389e32dd8d85188d219b1fc941866b9ece28a12b32bc3921b560631f81042957999b95ad519ae471b1e840afeadc1 SHA512 3ea7daf66d1df3ec24b234d78698245c2c13fb75bbab2fb115811e39e88c6c36b245254b3210c2944ec06f0ae02bc1fea3ea82b587053f52c26871ba8dffdc05
 MISC metadata.xml 213 BLAKE2B 6036cc110b019327f9dd87b41589f79741c81103107f730c22d93ae87dcf3a53d141e19e6f1021d9b4cfda1d9e3bd541104aab5859b5fb28a5e0c2833f8cdd88 SHA512 7f3e93fdb41d7bbc35f196c2f2cafe0fef3c7b4d4b1746274ce8d131a602b3534d85bd8c1f2db022ed338321a5e65230bcbe8d0471d9826025728d75ae411158
diff --git a/dev-util/ninka/ninka-2.0_pre1_p20220619.ebuild b/dev-util/ninka/ninka-2.0_pre1_p20220619.ebuild
new file mode 100644
index 000000000000..2ee065f72d2b
--- /dev/null
+++ b/dev-util/ninka/ninka-2.0_pre1_p20220619.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module toolchain-funcs
+
+COMMIT="b94e0d36669c4cc086856adf57bc67ced8f1aaf0"
+DESCRIPTION="A license identification tool for source code"
+HOMEPAGE="http://ninka.turingmachine.org/"
+SRC_URI="https://github.com/dmgerman/${PN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2+ myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-perl/IO-CaptureOutput
+	dev-perl/Spreadsheet-WriteExcel
+	virtual/perl-File-Temp
+	sqlite? (
+		dev-perl/DBD-SQLite
+		dev-perl/DBI
+	)"
+
+BDEPEND="virtual/perl-ExtUtils-MakeMaker
+	test? (
+		${RDEPEND}
+		dev-perl/Test-Pod
+		dev-perl/Test-Strict
+		virtual/perl-Test-Simple
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0_pre1_p20170402-makefile.patch )
+
+src_compile() {
+	perl-module_src_compile
+	emake -C comments CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	perl-module_src_install
+	use sqlite || rm "${ED}"/usr/bin/ninka-sqlite || die
+	dobin comments/comments
+	doman comments/comments.1
+	dodoc BUGS.org
+}
diff --git a/dev-util/peg/Manifest b/dev-util/peg/Manifest
index faf4e699ca7b..90c3d279851a 100644
--- a/dev-util/peg/Manifest
+++ b/dev-util/peg/Manifest
@@ -1,3 +1,3 @@
 DIST peg-0.1.18.tar.gz 57776 BLAKE2B 3266db2009073ee95a7fe65f3969b06001669dca095a8b77cbef3293557f9919872b44b348ff3de53cf8a132fd414c265bf0da3f77f0da0391d6d53cf4ab9217 SHA512 ca2fb9088bf87955adf6f883370ddb7d5f6f3cae3605a871094317205a124cce4f7b9f83cf4662cb470e2c5a6977608b456eb1fad98022d7e40fc384d1fec0f8
-EBUILD peg-0.1.18.ebuild 870 BLAKE2B 85683a921523c9b1c83d40f97da4d7b6cff4e152c87025f0bff948c751f3e5003436d5ce783ca636f3688178cfdcfc889642f56744f2f131d886ef17bb9e33fb SHA512 ef827b7ad368c5d0bce2de6731443366b47d6154ef0267581e668f5389940c84075b9a3f5e4da6b758694288a7a8631a841c206155ff8f94f47e7cab872fd2cc
+EBUILD peg-0.1.18.ebuild 869 BLAKE2B 8c3d0995d23f081dcc5217bcfc724ec445d37332417be1ad2b6df550c247bcbe0d5270ee8dcb6b4fa941ed611599747340f0bab3854607bb014b97945291edcb SHA512 413e8d1b58bf4fd5a2d68892ecf02544b41f3ba5f2c70834eafe9d9a8f266e9484059316d3e867bcf79f1fbc2a52b0c28ae776a2f1f5253d4c559b47de964566
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-util/peg/peg-0.1.18.ebuild b/dev-util/peg/peg-0.1.18.ebuild
index 3853be968a49..2f7cebbf5421 100644
--- a/dev-util/peg/peg-0.1.18.ebuild
+++ b/dev-util/peg/peg-0.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${P}.tar.gz"
+HOMEPAGE="https://piumarta.com/software/peg/"
+SRC_URI="https://piumarta.com/software/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index ff635c99765a..a30a1b51be53 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -2,6 +2,7 @@ AUX rebar-3.18.0-bootstrap-vendored.patch 1292 BLAKE2B e91914c48e355e675be853282
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST bbmustache-1.12.2.tar 17920 BLAKE2B a91df2d85533de4ad2df661b19e5dea67e84b73fd0192ecac43b8c9163beeb4444872af605ad298b104725687f2a5a2107b0d142a4654213f7b817903c06aca2 SHA512 aecba4e354bdd5e09756cf9cd8c1e55af832f0e121c4c8000b71bc9a46485a4cdd86d13aae4f1838588be228745003a324956fdd440fb4c48b987cc58a9e238c
 DIST certifi-2.8.0.tar 153088 BLAKE2B 1718b805a2c340586c908059bd1e38cc5175f534136efcf6022ba970cd6f00100ef209953aa2718f2b25e76b895ddcf57c71690660f85ea519eb353d24ec612d SHA512 1c484afdf7664eb92df90251bb451208c08e76179e5654a2b069388a72889aac75e941ef626eaeec7fe0a74fdbacf359aeab5330eebd43e333ad513998e46e76
+DIST certifi-2.9.0.tar 156160 BLAKE2B b2599590e18da52685fd953b62f54ec1db7fac749d202bd4ec865a5477348bbcb93712af89b9206723da7bd33339461205a43b4cd30f486074b617ddd92ab8cb SHA512 d8c2f62b3b5a626735bbdaf3fb553bafe2cd1c736a378240633f0970c35079ce610ad3458d3e43c79f244c670b5e197554ddf8a71944bdc0975213db693a5583
 DIST cf-0.3.1.tar 10240 BLAKE2B 0a13aca11772ea8b7a9ed6a5908a013b82248a64ca633c616ed75b3ccc0e7d52199480e53519f96c1767ceef9c863da16840ad90d1d7c6235cb6ea3291d35b8d SHA512 232fa9cd175e54599c035b087a6d44c9afb4135a5509b7498ebce8becec333cd670d0e06a3bf9e30d54c7c609ad2aecd42fc40e667cf95e68b7dc228e1fd85d8
 DIST cth_readable-1.5.1.tar 19968 BLAKE2B ecaab32aec9e327a2e39ab7312bbaf07c5ab4a88916ed6d84e064897d49f148486b9d95a761d9243cbb8b3cc0a779c9075f1eba179db0ec5e22502176e8c10e5 SHA512 8abd3f7255634e29584559e0d4b811e2af3ed047a10f32a7e2b899abd02f0ab3cef117d3ef6c9db38d34fed6285a1f47356b647350c9b636f011445d3914da7f
 DIST erlware_commons-1.5.0.tar 53760 BLAKE2B 042b321c2d0e5ae82801ab982a989618b2cacf4aef921162d6185e4bf4790346765fae265ab9ad337b58ccd0a928199b8b95823528fdd7cb8c440288efb7dc88 SHA512 215072e79da4edf51ac6889721c0d4cefbee60fd5e2a803b39acdd2735b5e91f2df690b94f14a9814f63a4cd3e4762e8d7f87f6debb3e659e542a6dda5159739
@@ -11,8 +12,11 @@ DIST meck-0.8.13.tar 34304 BLAKE2B f2bb100bdea75079351610edd572ea7ced1503c02f86e
 DIST providers-1.9.0.tar 14848 BLAKE2B a50e97faee63bb62335005e61e63de0a1b9ebf467f61e316fd0002485fbc6a102689bd0881878db95972a367ac2ee56c603bfcdd0b8e5efc6dfeee7e177fea8d SHA512 7227855164124425b89996b0295a786e36bbc2fadee9949d0b3d9ad518b3be9204650e5fa9e027e72cc4c2d2e8b968bddfc2015ceaf4cc00d865a35132defe76
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
 DIST rebar-3.18.0.tar.gz 436403 BLAKE2B 827fcb8a3fb9f3b93a19260696546697f766ea83a498cf79943568dd811c2afcd05a1c666b6813116428d0c1e6f522617244b69fe19cebda2701efdc3ec68763 SHA512 4fcaa1867fba7462df0b9a64fa442f4a887e83530635fdcd19f4b5dcee14ace3e7403c27f35e5e6055fb6bf89c98a91a3ff1e2036ab6e67e3de028f91233e4ed
+DIST rebar-3.19.0.tar.gz 442286 BLAKE2B 834bd25fb301a3362ba281638ae5680c1d7315971e85ba1b90cd3f0452ad1d1f6064c0d197d960c1a88af539ddda955bbef6747d71c1c69103af2938a9b28a04 SHA512 43928e2b96ca9361af2ec0b6ceb82f4429e29990054e1cbe2f1d4e293748243d16a8d2b809200ce443408a82fd3227b2cfe02efc14941d1cdd3d3c9a689fa0ea
 DIST relx-4.6.0.tar 75776 BLAKE2B 1e9b6043781ee2835f2cd7ff37755456de63e34702fa1e2d8c5326bc58f953700f1a5acf4b1bf073b4d30ff2587d4fdc505a0c1dc0848675ed98a10b9277df1a SHA512 a0ae0447815e78b7f296b721be1430897305bb21b8b183191ed1bb0cc33ee1060f5b1ee2452d86ff7a782f29450896e8b01e90f00847c7e4bad62f3c5a786678
+DIST relx-4.7.0.tar 76288 BLAKE2B 99af942824344a617dc19b771d5db697fd8d8a19776a670da96c62852df75c9d68236bffee05ce84390f63cef34ee305fffc864bb2a5a4c2acfd02cef2122c27 SHA512 cd7bc3535d012f8e2bf98cf9a68c03425903c137557c18599a27d80722471353623e616787fed791760c0ec6ec51379e060a57777521be33ef84b37b3693f9c3
 DIST ssl_verify_fun-1.1.6.tar 14848 BLAKE2B 31f8a92881803b1b93e2f65cf070449cd53af21b50f6aae7a9d036e28c17b2c093b2cb6238279191663ba011aab7fd604af8366ed8ae91b7b1d7c333f9de9ea8 SHA512 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
-EBUILD rebar-3.18.0.ebuild 2457 BLAKE2B 8a571d50eb1fee488b56be5d2745615ef7e7765a0c506e0ce279c1d6274d97448dacdc7066b9383f7960d384e91fe04fec0f4fe5c539c8cd072c415c24cb3a24 SHA512 165e9a80984513b4fa0ce6c95f154f6d3e1d9031e1419c9f7bc91bd995dec0b23aad920be2e236eb9c63b0ea86db0b953234e44ee881c6d0c90c3673149496a6
+EBUILD rebar-3.18.0-r1.ebuild 2462 BLAKE2B 9bdf8762c0a0dedf4ebb5626b5403dbcb847b97cfaa18474fa91d815a816b7c9f926a7e3fd78be27c8fd03f81efaa131e391366405ce053171bebc6c8bdcdd8e SHA512 a005414b5f1fb40fd17a5fa4e0233d50e20d7750cc5eb95831af2090a136fa2f09a1d841690787814636ada855b760cb3303fc0c547ce7af7ee8bbd2b334287c
+EBUILD rebar-3.19.0.ebuild 2467 BLAKE2B 6ddd2cd70be8c2c931e7ce85ee791042a50258a4f69c480264e30505a8350e45ee8fca69534a0c15548fdfe89ac80c9318e77df1b444a7e69f8526c0f61697de SHA512 aae6547794b8a5e08b6ca4709a07db8f3b34b6e1c0a3491d88a56425cb2cafe1712c2dadc2f67ade1c1e9dd6d34164d989062e9520491472b6541e4fb21b36d6
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.18.0.ebuild b/dev-util/rebar/rebar-3.18.0-r1.ebuild
index 7aef643d13c2..06e277d964b5 100644
--- a/dev-util/rebar/rebar-3.18.0.ebuild
+++ b/dev-util/rebar/rebar-3.18.0-r1.ebuild
@@ -33,7 +33,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-lang/erlang
+	dev-lang/erlang[ssl]
 	!dev-util/rebar-bin
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-util/rebar/rebar-3.19.0.ebuild b/dev-util/rebar/rebar-3.19.0.ebuild
new file mode 100644
index 000000000000..6229094316c4
--- /dev/null
+++ b/dev-util/rebar/rebar-3.19.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN}3
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://www.rebar3.org https://github.com/erlang/rebar3"
+SRC_URI="
+	https://github.com/erlang/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://repo.hex.pm/tarballs/bbmustache-1.12.2.tar
+	https://repo.hex.pm/tarballs/certifi-2.9.0.tar
+	https://repo.hex.pm/tarballs/cf-0.3.1.tar
+	https://repo.hex.pm/tarballs/cth_readable-1.5.1.tar
+	https://repo.hex.pm/tarballs/erlware_commons-1.5.0.tar
+	https://repo.hex.pm/tarballs/eunit_formatters-0.5.0.tar
+	https://repo.hex.pm/tarballs/getopt-1.0.1.tar
+	https://repo.hex.pm/tarballs/providers-1.9.0.tar
+	https://repo.hex.pm/tarballs/relx-4.7.0.tar
+	https://repo.hex.pm/tarballs/ssl_verify_fun-1.1.6.tar
+	test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
+"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="Apache-2.0 MIT BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/erlang[ssl]
+	!dev-util/rebar-bin
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# The build directory (where dependencies are usually stored) gets
+	# cleared before each build.  Make the fetch function first look in
+	# a _checkouts directory before going out over the net.
+	"${FILESDIR}"/${PN}-3.18.0-bootstrap-vendored.patch
+)
+
+src_unpack() {
+	# Unpack the rebar sources like normal, but extract the hex.pm
+	# dependencies separately.  The outer tarball contains another
+	# tarball named contents.tar.gz that actually contains the code.
+
+	local archive
+	for archive in ${A}; do
+		case "${archive}" in
+			# Assume that the .tar files are our hex.pm dependencies.
+			*.tar)
+				local dest="${S}"/_checkouts/"${archive%-*}"
+
+				mkdir -p "${dest}" || die
+
+				# Extract the inner tarball
+				tar -O -xf "${DISTDIR}"/"${archive}" contents.tar.gz |
+					tar -xzf - -C "${dest}"
+
+				assert
+				;;
+			*)
+				unpack "${archive}"
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	./bootstrap || die
+}
+
+src_test() {
+	./rebar3 ct || die
+}
+
+src_install() {
+	dobashcomp priv/shell-completion/bash/${MY_PN}
+	dobin ${MY_PN}
+	dodoc rebar.config.sample
+	doman manpages/${MY_PN}.1
+
+	insinto /usr/share/fish/completion
+	newins priv/shell-completion/fish/${MY_PN}.fish ${MY_PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins priv/shell-completion/zsh/_${MY_PN}
+}
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 3c00397fcef4..28df4af7c4e0 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,7 +1,9 @@
 AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c0964f6f00c1bcd01cba51a56e6626fe50c6ad2c36bece4db326f7b128d6ea5786970eb454832e32f9d837458f92f2a596 SHA512 241a72a7f1c3ec8ba831ca696faf0cfc09a58207c6d3db7005b09b9016a71ed9238bcb9441a389116083557538a0ff1a6adf55e78e1aa35d67aa206f30774391
 AUX rizin-0.3.2-never-rebuild-parser.patch 1493 BLAKE2B fd5a4d306336ccba939e9d96e97d4b653b83407352f9babf9c39bbad28a18b4fc1a3e2f1eb57b25b7f8dad35b3400271cf6a6bf1cec55c74dc00f424da715c91 SHA512 7a105831cbdb99633c43411b7a407ff6970cb8e89cae561886ade96c75579c0484271641e957762189fc68762952a26ca0a2536bd1342802c408041066852b16
-DIST rizin-src-v0.3.4.tar.xz 10411432 BLAKE2B 99745f069e6bd72aec6a6f335f3aa0ccc46ebf186b1dc0aaf32b4f95d2be4bb49e8d3d976a72978c22fce82d896e70bf8403568e100b73898731045ef06a2ad5 SHA512 cda35afe8c031f3207c055ed31d7f76a46b7addd04cead0f5aadf0733b66f4dd953ca16f054b47da7921d4726d6ea1250436012954a9755c1cd524a8fd0d670c
-DIST rizin-testbins-aa6a88dcdfaad54335e3935c16ce21a124ff861d.tar.gz 127254454 BLAKE2B e7a4536be7169abd197c2128e103b8d669fbb7532ce265b27da3ce347b1aa58c8a96c95d85cf7700f66a44c041a0575175de3a0e176a0d31c490f7ccfb2f6d6b SHA512 20cf299e5324793f07f8a2fdcfa3d66c3a418f09bfc6a272e35ab31d4a64408bf91532ae431098dede1a2d0ad0b1c02433304c514816d98dc068f6c0528a4099
-EBUILD rizin-0.3.4-r1.ebuild 2949 BLAKE2B a9bc52204a78067073435df92cfafa1e8c41757c6aa78782ee2914e02c859588fcad8eeed5c2d8f75d72e69a418eef40831f80b671069b9b7f407737ae0394eb SHA512 29fe2634d5a6677de17932b0f5dcf1018acb835a92ba9ed6c96e15be740e9534b730045bbbfbabda62b89bfc2d8efcb6a64d78fdf6f1863c39570bcc9f50e042
-EBUILD rizin-0.3.4.ebuild 2945 BLAKE2B 9fa83d7ac4b5fc25886439e34cccf2c378dad4d18ffdd098f2fb02732a13ae4304fad5dffc5f9d92ec898b020900aa53e7d09a8ee93a3b2189d47461b9c01344 SHA512 83d5364a7b2a4f92730e3cebe5e5443ea7086fb8e616dfaf4dff3c4755ef35f1e4a40adce4a0b829110e27799a7ea97799809c1bb396c1ff618a57b769aa0f8a
+AUX rizin-0.4.0-capstone.patch 681 BLAKE2B ad680ca6ee4782d0a164048e9884a3154fd817ffea42810dc3e11ebd9b5254da7fa1c1379180ba43eec9d3b1966329ffbc7a807df1beee6bcc9879e7e7b5cb65 SHA512 dca9648697d9b419002d27de4ac562ec519c4ffd2161960c489c90e5c0950beaac7a7e9b86cfa32a34efdf60f11fd953547b9a37fe457fe294b5516e5d07d412
+AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d84b011650b978ba5bed6c0596258963d395014c5e0733e44930b4c2db6dd88941d99b2aa37acf461d035fc31dcd321571ef0d6392 SHA512 a46311772dc42b90b8e3e49ddb66f6d64873773e254ac943934de0129d5f4a77ccb759d20b519b58418d45c076f136d582f2e70056693c75b2f6aae19eb07551
+DIST rizin-src-v0.4.0.tar.xz 11432232 BLAKE2B 095ca9d317296afca9514a70f208e9aa87fc426e6b7e41163f64d5a1192a4d9ccd8ece9c4f13a24fc973668dece625fa13ad75542695a66c542fe2f0d9e66733 SHA512 9d576bee48e5ceae46b4e309c53e01b82edf89a95046f576e1c38fefa73353d6d1f04e6d444332324387d4e115bc87659a358629f7277a41dfef44c82364547b
+DIST rizin-testbins-64a6f26369bf5893ecc20cb8984a5ad506ef8566.tar.gz 172591261 BLAKE2B e78843fd95ac0406f66490b7253206e77787fc65780bc7c6a67d26aa9618a6f85803a88724ad424a7bdeeb20d95ebf9314e582029ac778d7d4de4f207ff54aad SHA512 ada4a3faad94553f0f2802419ba604177bb66d332b1a351effd485d65bd8365abb36d736486bbd0bcbc0da584ad4a2edaa7aa3cb62fa12811282c2e0afecb950
+EBUILD rizin-0.4.0-r1.ebuild 2483 BLAKE2B f776c97d5a1e27a5df6e0426c37daa5c8eb8d8f12234c0fbc2f0a2320fd256a41013b0529059c6b40ffc3a827846dbcbf723cc337b10a138dd975d15f00c9133 SHA512 ee556a24f162fa5288dcf7b26f694d96160f741078fcf1be0ac2e22e5d2931d21146fb717dd9ea70514f8194d65e77d2bb829573b8e38f68ac011f3ca9f6ce2e
+EBUILD rizin-0.4.0.ebuild 2450 BLAKE2B 68537bc3cac4d53376e36e455275838be5ea072c78644e0354b70888c19f89c671156f632933970a8ee787f62a532ebcde7a74199d625a996501a0a030185e4f SHA512 20a2da4dd0a4d1ae6d237ac64b751bb88a45ccc44556a434be540334f1ae68d0fb95055ca38eeeffe1959ef2310e24fe6a9dac24b10a3bf3a6d91126261070b0
 MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/files/rizin-0.4.0-capstone.patch b/dev-util/rizin/files/rizin-0.4.0-capstone.patch
new file mode 100644
index 000000000000..4132e97095f6
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.4.0-capstone.patch
@@ -0,0 +1,22 @@
+From 2b8104bc5e763ed841d6dbffacbeaf02e86b8421 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Thu, 7 Jul 2022 07:50:10 +0200
+Subject: [PATCH] Fix capstone include directory
+
+---
+ librz/analysis/arch/arm/arm_il64.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/librz/analysis/arch/arm/arm_il64.c b/librz/analysis/arch/arm/arm_il64.c
+index 2e9da10aece..6b552596c9e 100644
+--- a/librz/analysis/arch/arm/arm_il64.c
++++ b/librz/analysis/arch/arm/arm_il64.c
+@@ -2,7 +2,7 @@
+ // SPDX-License-Identifier: LGPL-3.0-only
+ 
+ #include <rz_analysis.h>
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ 
+ #include "arm_cs.h"
+ 
diff --git a/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch b/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch
new file mode 100644
index 000000000000..0e6e95c09318
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch
@@ -0,0 +1,38 @@
+commit 7af437dbedaaa478b579d19133b6711923b037d8
+Author: John Helmert III <ajak@gentoo.org>
+Date:   Mon Jul 4 12:44:43 2022 -0500
+
+    subprojects/rizin-shell-parser/src: Never rebuild parser.c
+    
+    This requires dev-libs/tree-sitter[ts-cli] and net-libs/nodejs, both
+    of which would be heavy new dependencies. However, these are only
+    needed to rebuild the already-existing tree-sitter parser, which
+    doesn't do much for us (if anything) since it already exists. In this
+    case, it's better to just reduce fragility by unconditionally
+    disabling this.
+    
+    Newly forward-ported from the 0.3.2 version.
+    
+    Bug: https://bugs.gentoo.org/830068
+    Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/subprojects/rizin-shell-parser/src/meson.build b/subprojects/rizin-shell-parser/src/meson.build
+index ae31896a98..14324daba0 100644
+--- a/subprojects/rizin-shell-parser/src/meson.build
++++ b/subprojects/rizin-shell-parser/src/meson.build
+@@ -1,14 +1,4 @@
+-tree_sitter_bin = find_program('tree-sitter', required: false)
+-node_bin = find_program('node', required: false)
+-if tree_sitter_bin.found() and node_bin.found() and tree_sitter_dep.type_name() != 'internal'
+-  parser_c = custom_target('parser_src_c',
+-    command: [tree_sitter_wrap_py, tree_sitter_bin, '@OUTDIR@/..', '@INPUT@'],
+-    input: [grammar_js],
+-    output: 'parser.c',
+-  )
+-else
+-  parser_c = files('parser.c')
+-endif
++parser_c = files('parser.c')
+ 
+ shell_parser_files = [files('scanner.c'), parser_c]
+ shell_parser_inc = [include_directories('tree_sitter')]
diff --git a/dev-util/rizin/rizin-0.3.4-r1.ebuild b/dev-util/rizin/rizin-0.4.0-r1.ebuild
index cc3e0fb5efbd..b298dce57be7 100644
--- a/dev-util/rizin/rizin-0.3.4-r1.ebuild
+++ b/dev-util/rizin/rizin-0.4.0-r1.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 # This is the commit that the CI for the release commit used
-BINS_COMMIT="aa6a88dcdfaad54335e3935c16ce21a124ff861d"
+BINS_COMMIT="64a6f26369bf5893ecc20cb8984a5ad506ef8566"
 
 inherit meson python-any-r1
 
@@ -27,7 +27,7 @@ RESTRICT="fetch !test? ( test )"
 RDEPEND="
 	sys-apps/file
 	app-arch/lz4:0=
-	<dev-libs/capstone-5:0=
+	dev-libs/capstone:0=
 	dev-libs/libuv:0=
 	dev-libs/libzip:0=
 	dev-libs/openssl:0=
@@ -39,8 +39,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
-	"${FILESDIR}/${PN}-0.3.2-never-rebuild-parser.patch"
+	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
+	"${FILESDIR}/${P}-capstone.patch"
 )
 
 S="${WORKDIR}/${PN}-v${PV}"
@@ -87,17 +87,9 @@ src_configure() {
 }
 
 src_test() {
-	# Rizin uses data files that it expects to be installed on the
-	# system. To hack around this, we create a tree of what it expects
-	# in ${T}, and patch the tests to support a prefix from the
-	# environment. https://github.com/rizinorg/rizin/issues/1789
-	mkdir -p "${T}/usr/share/${PN}/${PV}" || die
-	ln -sf "${BUILD_DIR}/librz/analysis/d" "${T}/usr/share/${PN}/${PV}/types" || die
-	ln -sf "${BUILD_DIR}/librz/syscall/d" "${T}/usr/share/${PN}/${PV}/syscall" || die
-	ln -sf "${BUILD_DIR}/librz/asm/d" "${T}/usr/share/${PN}/${PV}/opcodes" || die
-	# https://github.com/rizinorg/rizin/issues/1797
-	ln -sf "${BUILD_DIR}/librz/flag/d" "${T}/usr/share/${PN}/${PV}/flag" || die
-	export RZ_PREFIX="${T}/usr"
-
-	meson_src_test
+	# We can select running either unit or integration tests, or all of
+	# them by not passing --suite. According to upstream, integration
+	# tests are more fragile and unit tests are sufficient for testing
+	# packaging, so only run those.
+	meson_src_test --suite unit
 }
diff --git a/dev-util/rizin/rizin-0.3.4.ebuild b/dev-util/rizin/rizin-0.4.0.ebuild
index 27d41f85b946..5f19fe3d4b47 100644
--- a/dev-util/rizin/rizin-0.3.4.ebuild
+++ b/dev-util/rizin/rizin-0.4.0.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 # This is the commit that the CI for the release commit used
-BINS_COMMIT="aa6a88dcdfaad54335e3935c16ce21a124ff861d"
+BINS_COMMIT="64a6f26369bf5893ecc20cb8984a5ad506ef8566"
 
 inherit meson python-any-r1
 
@@ -27,7 +27,7 @@ RESTRICT="fetch !test? ( test )"
 RDEPEND="
 	sys-apps/file
 	app-arch/lz4:0=
-	dev-libs/capstone:0=
+	<dev-libs/capstone-5:0=
 	dev-libs/libuv:0=
 	dev-libs/libzip:0=
 	dev-libs/openssl:0=
@@ -39,8 +39,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
-	"${FILESDIR}/${PN}-0.3.2-never-rebuild-parser.patch"
+	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
 )
 
 S="${WORKDIR}/${PN}-v${PV}"
@@ -87,17 +86,9 @@ src_configure() {
 }
 
 src_test() {
-	# Rizin uses data files that it expects to be installed on the
-	# system. To hack around this, we create a tree of what it expects
-	# in ${T}, and patch the tests to support a prefix from the
-	# environment. https://github.com/rizinorg/rizin/issues/1789
-	mkdir -p "${T}/usr/share/${PN}/${PV}" || die
-	ln -sf "${BUILD_DIR}/librz/analysis/d" "${T}/usr/share/${PN}/${PV}/types" || die
-	ln -sf "${BUILD_DIR}/librz/syscall/d" "${T}/usr/share/${PN}/${PV}/syscall" || die
-	ln -sf "${BUILD_DIR}/librz/asm/d" "${T}/usr/share/${PN}/${PV}/opcodes" || die
-	# https://github.com/rizinorg/rizin/issues/1797
-	ln -sf "${BUILD_DIR}/librz/flag/d" "${T}/usr/share/${PN}/${PV}/flag" || die
-	export RZ_PREFIX="${T}/usr"
-
-	meson_src_test
+	# We can select running either unit or integration tests, or all of
+	# them by not passing --suite. According to upstream, integration
+	# tests are more fragile and unit tests are sufficient for testing
+	# packaging, so only run those.
+	meson_src_test --suite unit
 }
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index eb6b57c242fc..d7b15dd175a2 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,5 +1,7 @@
 DIST stripe-mock-0.130.0.tar.gz 572453 BLAKE2B b97a1b54f4da158140e91abf68c8b476f18d7e96ea96587cd6a54be451776e5066a0dfc2da6c4b7234e08315b646d395f21099b8e30f20b9bce1b3c90f03c199 SHA512 7796ce75a77cf84c475cb8b957b76280ef7ba616dbfdabe2b6fbc4af135c0068777e0acc5f7a0c058a930988f66ae9d08c69a71cf119fadd9a79f210dddf7be5
 DIST stripe-mock-0.135.0.tar.gz 581001 BLAKE2B 7e7b129b5080cca742b1ce08b1a3443f74af23bad3cf09915a7b697f08c4ecb3d0801bd0a1498746cbd5a1f1e4bd4b4fc182f7f4cf0fb39b6db7067c4f8b5a88 SHA512 276dd5f063a1f318349d87314e76f6d6a00f4e694bd7be0f3de8f85195c196d43cf9f17128b156e75b90502ce897835953d5c425684ce7176a3977d4ea0a477e
+DIST stripe-mock-0.136.0.tar.gz 581986 BLAKE2B 6ee65d8beeec0bff9a97fd0963d0509c0174be49f7bffacbc2e5ba36c3d1711ccebb4c2acb377b9dba32688e8b8f9a4b4f80e5d88b23d6bc1d1f8cc48d0ddd93 SHA512 f5bc97739158e32382ebfc9c06b7db3a1b42e66821210a18dbbb7d36d31d5ee16313a518aaeb9aecfcfb383eb76eb5c05f11e600217f93b5ae10b9de2adc0327
 EBUILD stripe-mock-0.130.0.ebuild 497 BLAKE2B 6d01c4c1a82df433bda4ba706643db3b88f4b1f2dcf04f604ffceac9311d61875b32c9b33ec4658ff5b24c663d7ebb1cc602f6a06eae9616d2859ff2b252d9ca SHA512 ef737de8503726059fbe7addf29b60f960f705fa4ed7880403f80d4250b994218aae25ef4f2f47d0c6b76c4dd2bc2507d5c6c24fe12e75c8ab218aa62a30fa6c
 EBUILD stripe-mock-0.135.0.ebuild 500 BLAKE2B 619d5546bf1ccf99873ce37ff7c447c0b1cf009c9a74f8325c070877b39b522f7a1f7b881b05c2171e204ab23cee1edefaa3f60a1888b731fee0f69e784e5140 SHA512 b8698f82c4a0ba96e351eb8738746a927ecb80d34a66cf51718a88fd40ae20cbbdc8ad95e78244119ea94d1340177ac27399f155c4eb572ffdc90f7c1671a557
+EBUILD stripe-mock-0.136.0.ebuild 500 BLAKE2B 619d5546bf1ccf99873ce37ff7c447c0b1cf009c9a74f8325c070877b39b522f7a1f7b881b05c2171e204ab23cee1edefaa3f60a1888b731fee0f69e784e5140 SHA512 b8698f82c4a0ba96e351eb8738746a927ecb80d34a66cf51718a88fd40ae20cbbdc8ad95e78244119ea94d1340177ac27399f155c4eb572ffdc90f7c1671a557
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.136.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.136.0.ebuild
new file mode 100644
index 000000000000..89958510a463
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.136.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock/"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	emake build
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin stripe-mock
+	einstalldocs
+}
diff --git a/dev-util/tmake/Manifest b/dev-util/tmake/Manifest
index b5a01dae447e..f207daf195b8 100644
--- a/dev-util/tmake/Manifest
+++ b/dev-util/tmake/Manifest
@@ -1,3 +1,4 @@
 DIST tmake-2.12.tar.bz2 47558 BLAKE2B f5c4a590ec6077b12ffa6b37f00adc168d596466fa5ff30622e34b624eb931bef63af47b3c8eaa2d8c844b80d69cfc355adc4f0e965768e28efb31077515f0af SHA512 203a37aca7d391cf8bf7c27d9e5a9825472e9464f745d50b40343f71986ea5a48030372fa858ad5dade0807951f5c413145b9521ee1da416ff4952f8bb845ada
 EBUILD tmake-2.12-r1.ebuild 599 BLAKE2B f58d18afff544245198f6f793c8f8479a0b0793ac405a088b079c56e6068608e1ef111789eabef4d288a2cb771d619a067d30d6cbcb5dbaa5f27e134d1bde8af SHA512 63699771332dcae3da0a07e23cb0a7a85a2843c3c00e5b3d0b528d967df7dd243d02f6fdf8563beda6a3d8b3fcf363a7e712504bd7d041903fb7043819593236
+EBUILD tmake-2.12-r2.ebuild 591 BLAKE2B 529b790761adc8373681f0cb7b88ee13cc887ad4913fb6a8b597de1ced5c51594bcddf06e5adfc8c3fcfb7ee9040c31017cf4afde986bfc5e89814e851dd4fc3 SHA512 b4fbd1fd288628cd6806bc03919157419885a18c00b7ba6f5793cd1823ade6bf04e0b7b53eb4fcf8f9cfca2643957a0e20289c5ca3653c68078d18cff9b087ef
 MISC metadata.xml 243 BLAKE2B de0a7cdd82bbdac51c574962d822887f098e8fa3e4ff79ffb5458b49fbe46c24f6219c1197f922a4ee4437ed7ef0caf508118b15786831b49620015ab58a443f SHA512 751dc4c7bf750892353fac001a18401a5b176fc27eba81be5c715a5b9ede500d00507b2dde9043d97af81b69dbfd1e8e5db3716cad1ce6b3378eb05eea80ff54
diff --git a/dev-util/tmake/tmake-2.12-r2.ebuild b/dev-util/tmake/tmake-2.12-r2.ebuild
new file mode 100644
index 000000000000..598331d3b8e9
--- /dev/null
+++ b/dev-util/tmake/tmake-2.12-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A Cross platform Makefile tool"
+SRC_URI="mirror://sourceforge/tmake/${P}.tar.bz2"
+HOMEPAGE="http://tmake.sourceforge.net"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5"
+
+src_install() {
+	dobin bin/tmake bin/progen
+	dodir /usr/lib/tmake
+	cp -pPRf "${S}"/lib/* "${ED}"/usr/lib/tmake
+	dodoc -r README doc/*
+	echo "TMAKEPATH=\"${EPREFIX}/usr/lib/tmake/linux-g++\"" > "${T}"/51tmake
+	doenvd "${T}"/51tmake
+}
diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index dc9e51285100..465ad96a1b86 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1,6 +1,6 @@
 DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f896bbbb65983e80f8b5c24
 DIST tup-0.7.11.tar.gz 4683309 BLAKE2B 2914339499e80cf52318aaf9d682ac482f17c2acf6eeebb2dac84776cd4407fc23fbb1c61e5e7634ce6f18563e24ff524b284cbe8b46306f82870fdb32166efb SHA512 b923366bb15ce6e5be027b6b3e98b1029cd7dbe6ce2a8dd37a8e4b71521c8ff6d95d88fe296f5ca4719bbc048c6aaa5eacdd8cac1410d46df54ac674d6fd8aee
-EBUILD tup-0.7.10.ebuild 2662 BLAKE2B f50b00cc784dfaa0ccf2bdd072e648709f78faab37e6ed77bdf5c717c497719edc3f906d8ae02ba49af9e5f09db1b7931f0208dd47d2d85815ca22feca9d8134 SHA512 68b6e49051945d9337998844020ce6f39fb236e1754bd755704163a29666fe779477db39c3d80a3fe9b87235838207556776d3e9be8369db57feb1be3ac83ac5
-EBUILD tup-0.7.11.ebuild 3035 BLAKE2B f3fb01fd267a3212481c595b8458eec1c65ae29470889b9d9e7c8b01c5d5d13214b180c6fe84052b90f4938986a06f0a68758737f1c80914277a8ac26cf70943 SHA512 e162dabd731600172d8bc5ebe33f1b8e7fb073115a0bf877feadb3ce592c101bc9e53662083998d14b877044021334d5b19703ea8f93959a32e13bc6683189f2
-EBUILD tup-9999.ebuild 2447 BLAKE2B 3e33c0e837b8469e1906b63c96ef7a6944ff29b9c16c0e5c519b1555b044c4155ec7d787443143a2d54a1ce7356808c280294aae5211ab6ec17b18cf67325d7f SHA512 fcd9a127f316d2eb520ed14c9f8cf5da3458058f58c2dd6715fd4aa90c28c002b9cfa9a905e255f78b96b9695caf26b5d73b2185f28c162ede7fdceca9fe1f38
+EBUILD tup-0.7.10.ebuild 2662 BLAKE2B b42af53dad74b6300858bb85c9456348682a0fea81a659245dfa4a6af6b5406e3666024a85a5db1b45128e0740c429dac610041af563b66d125498aadbdd1eef SHA512 2897911f70618baf2136f0c9120352b06593462e80cbea8b91e5081eecb71702e5d710f7c45e104070c85c2c3f3e95e6f656f8450803299741c7ad9da8e50802
+EBUILD tup-0.7.11.ebuild 3034 BLAKE2B 52195a39bce47bb00529fd7b0394ac5899ae6af81b529b79e86cb7e74e2ac11b7b3c2ca93ca021d64ddb877d97a06ca31dd300c3a80b44518b10a455f4422dde SHA512 fc312a7c3b30e572c933ec2b2ec86e976b2855a55861eabe890f4bd959a7dddbcd017d118bcf0131be3dd4c1a9d201fc24e58b2587c35c4ba1cc38bdb250d6cc
+EBUILD tup-9999.ebuild 2447 BLAKE2B 77f1047e5269e9f07917e5710aafe656f204a1765b0afbef91715bb89bb4ca0f97a12f32b6ea22df4905ce2b553edafa7e78bad0321a5ed89712634044e4eeda SHA512 6012b928d0422961f1341dfb2d9b844a17723c60e40d3938e461ca59a9c8180afe318c393dafb310dbed00838cb71b104a1011b119d1f70af5fd505398a3520f
 MISC metadata.xml 243 BLAKE2B b87b031fb5a945f70afbd431c56a3290c4cb0926e55d9a7bb10040806d40d494688e7c532131e6b47d9fc79237c08b41ea60fb14eb0e84b295788a5cb7b69bb5 SHA512 7f3a04c70b392b12fe3efb4c2fc0d75f7e9dd1e3b74568862913c678843e52883584bc892e8059b21c94bb515831923259a086f99481adb02cee02d852ae34ed
diff --git a/dev-util/tup/tup-0.7.10.ebuild b/dev-util/tup/tup-0.7.10.ebuild
index 5c53cf4cfbb1..46df5503aea3 100644
--- a/dev-util/tup/tup-0.7.10.ebuild
+++ b/dev-util/tup/tup-0.7.10.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit linux-info toolchain-funcs
 
-DESCRIPTION="A file-based build system"
-HOMEPAGE="http://gittup.org/tup"
+DESCRIPTION="File-based build system"
+HOMEPAGE="https://gittup.org/tup/"
 # Tup itself is GPLv2, but it bundles differently licensed software:
 # - lua: MIT
 # - sqlite (unused in this ebuild): public domain
diff --git a/dev-util/tup/tup-0.7.11.ebuild b/dev-util/tup/tup-0.7.11.ebuild
index d6acd475e038..18992088eedc 100644
--- a/dev-util/tup/tup-0.7.11.ebuild
+++ b/dev-util/tup/tup-0.7.11.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 inherit linux-info toolchain-funcs
 
-DESCRIPTION="A file-based build system"
-HOMEPAGE="https://gittup.org/tup https://github.com/gittup/tup"
+DESCRIPTION="File-based build system"
+HOMEPAGE="https://gittup.org/tup/ https://github.com/gittup/tup"
 # Tup itself is GPLv2, but it bundles differently licensed software:
 # - lua: MIT
 # - sqlite (unused in this ebuild): public domain
diff --git a/dev-util/tup/tup-9999.ebuild b/dev-util/tup/tup-9999.ebuild
index e657af1652d7..d09d50bfbccb 100644
--- a/dev-util/tup/tup-9999.ebuild
+++ b/dev-util/tup/tup-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit linux-info toolchain-funcs
 
-DESCRIPTION="A file-based build system"
-HOMEPAGE="http://gittup.org/tup"
+DESCRIPTION="File-based build system"
+HOMEPAGE="https://gittup.org/tup/"
 # Tup itself is GPLv2, but it bundles differently licensed software:
 # - lua: MIT
 # - sqlite (unused in this ebuild): public domain
diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index 4dabbcfe87ce..ecdcdcef2a78 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,3 +1,5 @@
 DIST uglifyjs-3.16.1.tar.gz 519333 BLAKE2B 6e4978aa776256be575ea91fd6cd584fe8885886300db1b77cc889af5112615175cd40d527ac6356d653e60ab3ed404670355f80e0391da538313b494bb1104b SHA512 e0ef3e2b82cb6f211120b1d66132b5b5b13bc48dd946d7e7bbeddd1bee16330c9a3541d07f51b6eddf9036b0e520a527849ddc3cf6de467331b42f1fba37e66e
-EBUILD uglifyjs-3.16.1.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
+DIST uglifyjs-3.16.2.tar.gz 521877 BLAKE2B d9c40425b7911a08f90b64c1bbafe1d69ea2b7f7127b2f6b08065d5d99f776a582c27f29c827394ec89f0652cf03ef51bf1da24a4428ecd6b4dd1fa59107ce1c SHA512 ce714f8fab93c4ce3e9774321c6fd81dc050962a50b599ddff2a42d4ea60dc05f672fafb7cc473adcee37a9ce75f85e4d6fc58b1c174c559fe9a66a9230b9da5
+EBUILD uglifyjs-3.16.1.ebuild 775 BLAKE2B bcc377d38ae642d595fdd2f0dc4a78ad946d4a2c29af09f1ae7e798e21caeb96a5b5f6ce4aea4338d4fb0e84934a1befc1925d056020620573225a9202fff6ff SHA512 e4928b36e7bf3e0b61173d1bef56a389cedac5e06afb6a0426ffb82f4f33aadc1cfa9a0e6151011bc2e671769be700d78c347426cfa674a76cbc01162dd21bb5
+EBUILD uglifyjs-3.16.2.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
 MISC metadata.xml 328 BLAKE2B 74d4d808f158dcb49e996da74b67d65fe12956d7486b91941b03f3bb237d7d13387ac629b9689ebce8bd0580b0ce24d359a788911134fef6f006546c5365f2d8 SHA512 3db3efc0f0f5f0f3c7d453d4edae27d0ddfc62aa7cb778684d58460cfd55187fdd90c06bfb2629fb0d84874ff378dbccbc7ef182a10e35fd4b85991c5777a213
diff --git a/dev-util/uglifyjs/uglifyjs-3.16.1.ebuild b/dev-util/uglifyjs/uglifyjs-3.16.1.ebuild
index 1a44c1a32320..4817ccc4e92c 100644
--- a/dev-util/uglifyjs/uglifyjs-3.16.1.ebuild
+++ b/dev-util/uglifyjs/uglifyjs-3.16.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mishoo/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="net-libs/nodejs[npm]"
 RDEPEND="net-libs/nodejs"
diff --git a/dev-util/uglifyjs/uglifyjs-3.16.2.ebuild b/dev-util/uglifyjs/uglifyjs-3.16.2.ebuild
new file mode 100644
index 000000000000..1a44c1a32320
--- /dev/null
+++ b/dev-util/uglifyjs/uglifyjs-3.16.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="UglifyJS"
+DESCRIPTION="JavaScript parser, minifier, compressor and beautifier toolkit"
+HOMEPAGE="https://lisperator.net/uglifyjs/"
+SRC_URI="https://github.com/mishoo/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="net-libs/nodejs[npm]"
+RDEPEND="net-libs/nodejs"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+NPM_FLAGS=(
+	--audit false
+	--color false
+	--foreground-scripts
+	--global
+	--offline
+	--progress false
+	--save false
+	--verbose
+)
+
+src_compile() {
+	npm "${NPM_FLAGS[@]}" pack || die
+}
+
+src_install() {
+	npm "${NPM_FLAGS[@]}" \
+		--prefix "${ED}"/usr \
+		install \
+		uglify-js-${PV}.tgz || die
+}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 4194073d517e..7be8e477192d 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,6 +1,6 @@
 DIST umockdev-0.17.13.tar.xz 489728 BLAKE2B 0bb4d912aa924c91ff1f4e2cd5ca4ddf81eea1db55ddf9e4cd9a7e9683ed92a268063601a38f7f0a6fb669b301fa9ace94c413e5958ad5587db0097acb2f066c SHA512 77863ad67be0995869b35d12dc43a809d2e67e95f727312ffd9f585c5bb1598c4d31f4909fcff5035dfccdbde8c36819daa633cae53c57ea2d9c3ede3587ec4d
 DIST umockdev-0.17.9.tar.xz 487592 BLAKE2B 9b96ab26d31d927de240fcbbc3139f86ca3108240cbcc4d330a7793472b8b716aa3a573a7ee6a899562411192a6cffed707118a4e648802c84089c211dd870c3 SHA512 f56cc9a1513d05747eda2d36cd7c632502d7f70ccc612e11bdcd1610c96a2be9cf8e883282d024406485c44fb3cedc80dc803a12216ed61f593030d12ece21c9
-EBUILD umockdev-0.17.13.ebuild 1144 BLAKE2B 448c396189142a1025667de6f3ffea4ff5b0ef0369536f260f6270096b57899641300fa2b9a402a40c341bf443078ba8309cb8bdb665c7d40b40918f80a77fb6 SHA512 00f70c973e4f47621c83c5f0e967b7bc7383cc2211ce30bcd355ceed3e1c19a90fdce7252ab2921243eaf2185302625ba6ab4b5321eb96d3b340210999d99d42
+EBUILD umockdev-0.17.13.ebuild 1142 BLAKE2B a9762111ddb04b92fb495670150086c68359db71f25ec6a65b871b594765af27e87934c4cf6778e6e3626075e6389d4d02530e04e7ebfa349748b785eb4e0826 SHA512 7d532df86bd10822ea3811fb6ce028bd0b4b9769e7ef770d8783d70a1cd044ffaeeb0ee944532d395d10357d153d7ded818bd6921e3f1d369165d09842a8e4e6
 EBUILD umockdev-0.17.9.ebuild 1130 BLAKE2B cf10966bf56ae04f9b7d21ae3414112af2eb76d96f7d13705b507bee79901b888b34b6af13cbab174182e32550fd7bd8d83f1e21f0f7d43b47c46debc9ce0d02 SHA512 52c43eaef9b5cc20a557ab9355060b40dc2a72db901c260e4bae9435ffecb678f9409e5b9044bf862756f76ffc12380c7b85cb7968a5438659f40a7e2d510fd9
 EBUILD umockdev-9999.ebuild 1250 BLAKE2B 7ce582be706d807b53d710d2eab7c1978960cbc685d012a2241012efa2629a6254e6493aa7f2ca4459ed9aa9b1f962fbddb0d562fc23789ade63815e3581facc SHA512 92d6151582169e83375d9121cc24f1deb4479d32639870d982265abf3c370d1ee6c9e7453fadddfefc5677b66cbe4e9de8537b7d9b6b734083e15b4df5a7dc12
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.13.ebuild b/dev-util/umockdev/umockdev-0.17.13.ebuild
index 5d85cf951816..16ce48e55e0a 100644
--- a/dev-util/umockdev/umockdev-0.17.13.ebuild
+++ b/dev-util/umockdev/umockdev-0.17.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest
index 13753934d109..42885de0745e 100644
--- a/dev-util/unicorn/Manifest
+++ b/dev-util/unicorn/Manifest
@@ -1,4 +1,6 @@
+DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789
 DIST unicorn-2.0.0_rc7.tar.gz 3984228 BLAKE2B a3e6a0d6084780b3a47837a6c8f9df9ec0eb176ff041881fbf2dc879eee11c70796b4f8e4ba784f553e383b8537abe9a559e627afc2fcaf712e83bfc5daaf11c SHA512 ae7e2b35032a8cff516f27edc58ab41708c2acd05b8feebb127501d0bc990a6722ba8439876ea147a2025372500d5df4bd7db86fddf215be63d070218a85a27e
+EBUILD unicorn-2.0.0.ebuild 1708 BLAKE2B 43214ad5df0aa79a0fd002304c0f4964d3b3f1ba90ca9a2f64b61e5c3e01ee9a47e323b364bc08d93dce036f196ce8c19888b5a93da95ad8ea335cb8ae3f6318 SHA512 bdd22202eb84437c619831116fad9438cac24b3eb85b3d0476ed5d43999572223c7e83ff7484212039a54d725df6b839cddbf59f2c09529f737b81dc72e2bd00
 EBUILD unicorn-2.0.0_rc7.ebuild 1635 BLAKE2B 3395838b9b1b40dc602fb58cab4081fcca8f0df4fe1d0990a71368dbc0e7e5ed2076b53559c485563fede19059c769f1580587746b5185c2726caa76f8b193e7 SHA512 26dea296997e337cdf854d4faa4c6eda2a16fb0b7e370c7c361d92153f9b5a37c706b0ee365691b5c69850f8fcd9cea80086ae368fdaf4e1d388fef81cc4047d
-EBUILD unicorn-9999.ebuild 1635 BLAKE2B 6b1ef99c0458971d413f0ebae78886de1c6375c3cce9edfb338b739a008cc17b1da636333d7952f95a000412a82ce4add748bcf7d32629a17257b8bc5e06bf97 SHA512 e80f886de510d66d8421d34747cce745237cd806f4cd2e286eb1cd38952553efd978ecfaf7ff0bfb4b9493a80c88e3bdb004c74a78b3c46caae792b8184adfbc
+EBUILD unicorn-9999.ebuild 1708 BLAKE2B 43214ad5df0aa79a0fd002304c0f4964d3b3f1ba90ca9a2f64b61e5c3e01ee9a47e323b364bc08d93dce036f196ce8c19888b5a93da95ad8ea335cb8ae3f6318 SHA512 bdd22202eb84437c619831116fad9438cac24b3eb85b3d0476ed5d43999572223c7e83ff7484212039a54d725df6b839cddbf59f2c09529f737b81dc72e2bd00
 MISC metadata.xml 510 BLAKE2B 857f3ee3645ffdb28846b7305ec3066ddf49934225fe2c173a5a6b5b8354b208b6bb1337c2e11713b7c983a6fe3a1e67dae62bf64b0c9228f14ccfea8d57d5c5 SHA512 e1da17744042b95f11fb8b5f562020738c7495b0256469420cfa19fda995a24f02e806f67db8521e2f4a19a32825bf54a0865ec723d853cd5aa440c42b007946
diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild
new file mode 100644
index 000000000000..34777b117a28
--- /dev/null
+++ b/dev-util/unicorn/unicorn-2.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/_/-}
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake distutils-r1
+
+DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
+HOMEPAGE="https://www.unicorn-engine.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"
+else
+	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1"
+SLOT="0/2"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+BDEPEND="virtual/pkgconfig
+	python? ( ${DISTUTILS_DEPS} )"
+
+UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
+
+wrap_python() {
+	if use python; then
+		# src_prepare
+		# Do not compile C extensions
+		export LIBUNICORN_PATH=1
+
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Build from sources
+	rm -r bindings/python/prebuilt || die "failed to remove prebuilt files"
+
+	cmake_src_prepare
+	wrap_python ${FUNCNAME}
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DUNICORN_ARCH="${UNICORN_TARGETS// /;}"
+	)
+
+	cmake_src_configure
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-util/unicorn/unicorn-9999.ebuild b/dev-util/unicorn/unicorn-9999.ebuild
index 01c1ff6ba6bf..34777b117a28 100644
--- a/dev-util/unicorn/unicorn-9999.ebuild
+++ b/dev-util/unicorn/unicorn-9999.ebuild
@@ -7,7 +7,7 @@ MY_PV=${PV/_/-}
 
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake distutils-r1
 
 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"
 else
-	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -34,12 +34,12 @@ RDEPEND="python? ( ${PYTHON_DEPS} )"
 BDEPEND="virtual/pkgconfig
 	python? ( ${DISTUTILS_DEPS} )"
 
-UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x"
+UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
 
 wrap_python() {
 	if use python; then
 		# src_prepare
-		# do not compile C extensions
+		# Do not compile C extensions
 		export LIBUNICORN_PATH=1
 
 		pushd bindings/python >/dev/null || die
@@ -58,7 +58,6 @@ src_prepare() {
 
 src_configure(){
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DUNICORN_ARCH="${UNICORN_TARGETS// /;}"
 	)
 
@@ -76,5 +75,9 @@ src_compile() {
 src_install() {
 	cmake_src_install
 
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+
 	wrap_python ${FUNCNAME}
 }
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index e95034168310..53d28f13f879 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -1,5 +1,6 @@
 AUX watchman-2022.02.28.00-libatomic.patch 2254 BLAKE2B 4eec2caf20f9c892bd9d2a7961da35cf79b606bc519a7b0b725b41b9fe844f4ec9ebc8de233565fd4889c492b7c3b45581e00e6c90ca981f37bf3f047f93f577 SHA512 12fbe5afb62008c97a60340ea05a148932ffe9428f2c0114fbe2fccf7ff428aa43e6a0c856edb78ec1a0d81cba92dd6cda92a079c24213e77b69d6bb88a25b06
 AUX watchman-2022.02.28.00-python-working-dir.patch 2409 BLAKE2B b92a51ac410063384c94047681a93fd3c2033a92dfbb0d65c9b00463696fb7917f03faa20c5f39dd331d6e7715db7b53d1fa77ca3ad20caa7b29971e90c8da21 SHA512 6429eab55af5faa6bb1cc946792209541f5c8228c1dc48de89a5777d2c402a41515f6810b6c3fb760c4c3bc2bfbec8b5b9c44f6d72229e20aac5988bb2a1fb4f
+AUX watchman-2022.07.04.00-python-working-dir.patch 2455 BLAKE2B 3a8c37f87884caae46d87194d397cefd6f1d58d78d22f3cda43bde3a5262a9d88dcf8f1747790786a889384ee5fd0ed2507ed2faffd63f338e08b445aec2876e SHA512 9c7bcea9502e5fa11e63ca3b0fb0132a67512beece934becf9a2ebdc1097f29b7a454a22c519f801779da8c9e682d2d306fa79e2f38cc1d21aca21d3a25151e1
 AUX watchman.tmpfiles 32 BLAKE2B 88c6a5c4b1d7a35d4ed485ab1e7ba0e18a8433d176318f69e77030d4980931876fdd8d1811e0af8c924c89c358cffb7cc9ab4effbc363cfae8adc6d88597313a SHA512 5c4230d23a045704efd5851abe0cb4c6e9eba91e128bbfc677e231868ea161364055fea65800a9b8bec61d95c6a2824dffa536755e12d3b6599a81cdea5c063b
 DIST ahash-0.3.8.crate 28650 BLAKE2B 93dcd622dc4497d0ce436461349119e96266c25278a7252a8cd295ced922b430895041ec767b6cbfdef57ada69e9b7bc67cce5155a6bdac9fe3c87c25e3a9e74 SHA512 dfd49903b0950a4fd3bf7432108f687322fd3771bce59126e2aee2a6ed5c2d8b31199090e96f31d549092b957f2cf470f201f2d65b1b838f7a182aee8a750a25
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
@@ -85,6 +86,7 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST watchman-2022.03.28.00.tar.gz 3781468 BLAKE2B 5db1f60c7149af418037a0ce7a00656bc652ec90a4bae261dd48c0bc21d2424ad30e049fe1142b072b5a01ca1380a5cd495fafa74d5c10785e097685f8fb5b21 SHA512 3275e66fe522fc45b3f0c8c458d6d2f61ee314f04d6b12935100535bc060603cafe76c8b13c0b8d334c13b63320ff4b84dc8dfb0f5ce09efc28d94e5d7a5974d
 DIST watchman-2022.04.11.00.tar.gz 3783345 BLAKE2B 0b4b4cadfb45e5a894428ab27fde3e7b70e3e3021d0cf76a15f7d072e0c86589d4b9f8c32d75e0c055a8dd30832360e669cc3d7f86061d214a3e18adc61a3781 SHA512 129eaded13ecaff0f4bfa2ffcd5fd27a1685a5f98e53d7b9dba837ad09054c9f8054992d92009580e20f80f367eb71276edab11bfbd4604ade353b08a29076d7
+DIST watchman-2022.07.04.00.tar.gz 3785684 BLAKE2B b27f71cd5d505d9383858434eaa90dd9a70478507a2750f10c3fdc88e39978cc6f94402d498dc26e2b5043018913bf71a28c04870dbefe8ee79fbe3e963a86e8 SHA512 43bbccd5e69905105da54fb661f506d2b3ef43719660deb07cb4b3b47b1569af71edcdc798ffdae79ec26c7cf24988394321d0f183f20af51daf6d54f4a3d8e5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
@@ -96,4 +98,5 @@ DIST windows_x86_64_gnu-0.32.0.crate 744209 BLAKE2B 76106af387f443f2a24a0cd15d53
 DIST windows_x86_64_msvc-0.32.0.crate 669835 BLAKE2B f8c9dc578d652c2abf0d689dfa9681da29f760bc45ecec83b7d994e7df7c04f91fbcebee464ebd94d5fe7eb0dea90ac7c04578b56264d89ca9d91213fd89b17f SHA512 4720246d2aed3c3b3c252cda7773096642e78891b1a9776c920da908b2d3741e9e341060424327f1c16e4cb47b6e22af1be229589a51b5a3a04d2a6447275332
 EBUILD watchman-2022.03.28.00.ebuild 4692 BLAKE2B 380179dc8f5d8a8f98136d9078a6950c4136f7859dc7fbb8ff6e858292426ccbd171db50c59d6722439adcd7808c2f7ccf007d8003caf932922ecf51ab61da82 SHA512 0c25b80ba316477132eb6c940b50ff1b470a23644652405c38d4248a0b939b68e356417c1c625d9acf11cf98b5ecef8e74bf4298097b937f2ec5965f287db998
 EBUILD watchman-2022.04.11.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
+EBUILD watchman-2022.07.04.00.ebuild 4687 BLAKE2B b9b8376653dab8674d042f6f5a0f4f99deeb1459e8dba60e975711d239e61f40a7871ea04dc1ba84e694a242a48957f3766b119a38aaafbd46ba52899fd638c3 SHA512 ac344b1bc10a34808b4a9453280cd682a77bc8e687e7cc8b8e50d9bb413d17a668863a3ebff904d459a0481dc67f4bc485d2a635c3251c25af3a03bb1d672883
 MISC metadata.xml 691 BLAKE2B 68506bb31b8d7524b07a12bd2a237ed985215701eb2a28bacfd63ba5f3d61713b0369523a369c5880392e2f4790da4f908538627f3c3d58fe7c78faf9ebc9a15 SHA512 71c073c60fd880455dee0af9193a4279975ba34558144cfe03baa50d2a7c2c5074631a53fb89504d852e9782478f0add9dcea361f36cefe8a42f8f94ae27831a
diff --git a/dev-util/watchman/files/watchman-2022.07.04.00-python-working-dir.patch b/dev-util/watchman/files/watchman-2022.07.04.00-python-working-dir.patch
new file mode 100644
index 000000000000..cd475fb1bfbf
--- /dev/null
+++ b/dev-util/watchman/files/watchman-2022.07.04.00-python-working-dir.patch
@@ -0,0 +1,73 @@
+--- a/watchman/python/setup.py
++++ b/watchman/python/setup.py
+@@ -13,30 +13,10 @@ try:
+ except ImportError:
+     from distutils.core import setup, Extension
+ 
+-watchman_src_dir = os.environ.get("CMAKE_CURRENT_SOURCE_DIR")
+-if watchman_src_dir is None:
+-    watchman_src_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
+-
+-# Setuptools is very picky about the path on Windows. They have to be relative
+-# paths, and on Windows that means we have to be on the same drive as the source
+-# files. Otherwise it is impossible to obtain a relative path across different
+-# drives. However this has an implication that we will not be able to build this
+-# package outside the repository. Not great but it works.
+-py_dir = os.path.join(watchman_src_dir, "watchman", "python")
+-if os.name == "nt":
+-    os.chdir(py_dir)
+-    py_dir = os.path.relpath(py_dir)
+-
+-
+-def srcs(names):
+-    """transform a list of sources to be relative to py_dir"""
+-    return ["%s/%s" % (py_dir, n) for n in names]
+-
+ 
+ setup(
+     name="pywatchman",
+     version="1.4.1",
+-    package_dir={"": py_dir},
+     description="Watchman client for python",
+     author="Wez Furlong, Rain",
+     author_email="wez@fb.com",
+@@ -47,7 +27,7 @@ setup(
+     keywords=("watchman inotify fsevents kevent kqueue portfs filesystem watcher"),
+     license="BSD",
+     packages=["pywatchman"],
+-    ext_modules=[Extension("pywatchman.bser", sources=srcs(["pywatchman/bser.c"]))],
++    ext_modules=[Extension("pywatchman.bser", sources=["pywatchman/bser.c"])],
+     platforms="Platform Independent",
+     classifiers=[
+         "Development Status :: 5 - Production/Stable",
+@@ -63,12 +43,10 @@ setup(
+         "Programming Language :: Python :: 3.6",
+     ],
+     zip_safe=True,
+-    scripts=srcs(
+-        [
++    scripts=[
+             "bin/watchman-make",
+             "bin/watchman-wait",
+             "bin/watchman-replicate-subscription",
+-        ]
+-    ),
++    ],
+     test_suite="tests",
+ )
+--- a/watchman/python/tests/tests.py	2022-07-09 05:21:29.017605168 +0100
++++ b/watchman/python/tests/tests.py	2022-07-09 05:21:34.920982537 +0100
+@@ -27,13 +27,6 @@
+ )
+ 
+ 
+-if os.path.basename(bser.__file__) == "pybser.py":
+-    raise Exception(
+-        "bser module resolved to pybser! Something is broken in your build. __file__={!r}, sys.path={!r}".format(
+-            bser.__file__, sys.path
+-        )
+-    )
+-
+ PILE_OF_POO = "\U0001F4A9"
+ NON_UTF8_STRING = b"\xff\xff\xff"
+ 
diff --git a/dev-util/watchman/watchman-2022.07.04.00.ebuild b/dev-util/watchman/watchman-2022.07.04.00.ebuild
new file mode 100644
index 000000000000..d70308e436e4
--- /dev/null
+++ b/dev-util/watchman/watchman-2022.07.04.00.ebuild
@@ -0,0 +1,210 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Split into different variables then combine for each component?
+# Not all is in rust/ dir.
+# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client
+CRATES="
+ahash-0.3.8
+ansi_term-0.12.1
+anyhow-1.0.55
+atty-0.2.14
+autocfg-1.1.0
+bitflags-1.3.2
+byteorder-1.4.3
+bytes-1.1.0
+cfg-if-1.0.0
+clap-2.34.0
+const-random-0.1.13
+const-random-macro-0.1.13
+crossbeam-0.8.1
+crossbeam-channel-0.5.2
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.7
+crossbeam-queue-0.3.4
+crossbeam-utils-0.8.7
+crunchy-0.2.2
+either-1.6.1
+futures-0.1.31
+futures-0.3.21
+futures-channel-0.3.21
+futures-core-0.3.21
+futures-executor-0.3.21
+futures-io-0.3.21
+futures-macro-0.3.21
+futures-sink-0.3.21
+futures-task-0.3.21
+futures-util-0.3.21
+getrandom-0.2.5
+heck-0.3.3
+hermit-abi-0.1.19
+jwalk-0.6.0
+lazy_static-1.4.0
+libc-0.2.119
+lock_api-0.4.6
+log-0.4.14
+maplit-1.0.2
+memchr-2.4.1
+memoffset-0.6.5
+mio-0.8.0
+miow-0.3.7
+ntapi-0.3.7
+num_cpus-1.13.1
+once_cell-1.9.0
+parking_lot-0.12.0
+parking_lot_core-0.9.1
+pin-project-lite-0.2.8
+pin-utils-0.1.0
+proc-macro2-1.0.36
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+quote-1.0.15
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.10
+scopeguard-1.1.0
+serde-1.0.136
+serde_derive-1.0.136
+signal-hook-registry-1.4.0
+slab-0.4.5
+smallvec-1.8.0
+socket2-0.4.4
+strsim-0.8.0
+structopt-0.3.26
+structopt-derive-0.4.18
+syn-1.0.86
+textwrap-0.11.0
+thiserror-1.0.30
+thiserror-impl-1.0.30
+tiny-keccak-2.0.2
+tokio-1.17.0
+tokio-macros-1.7.0
+tokio-util-0.6.9
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+vec_map-0.8.2
+version_check-0.9.4
+wasi-0.10.2+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows_aarch64_msvc-0.32.0
+windows_i686_gnu-0.32.0
+windows_i686_msvc-0.32.0
+windows-sys-0.32.0
+windows_x86_64_gnu-0.32.0
+windows_x86_64_msvc-0.32.0
+"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit cargo cmake distutils-r1 tmpfiles
+
+DESCRIPTION="A file watching service"
+HOMEPAGE="https://facebook.github.io/watchman/"
+SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent
+RDEPEND="
+	dev-libs/libevent:=
+	dev-libs/libpcre
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/glog:=
+	>=dev-libs/libfmt-8.1.1-r1:=
+	dev-libs/openssl:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+	python? ( ${PYTHON_DEPS} )"
+# TODO: Make gtest test-only (needs a fair bit of patching)
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch
+	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
+)
+
+# Rust utility
+QA_FLAGS_IGNORED="usr/bin/watchmanctl"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17
+	export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}"
+	export RUST_CARGO_HOME="${ECARGO_HOME}"
+	export CARGO_HOME="${ECARGO_HOME}"
+	# Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69
+	# so no need to force -j1 via cargo jobs
+
+	local mycmakeargs=(
+		# Rust wrangling
+		-DUSE_CARGO_VENDOR=ON
+		-DGENERATE_CARGO_VENDOR_CONFIG=OFF
+		-DRUST_CARGO_HOME="${RUST_CARGO_HOME}"
+
+		# General bits
+		-DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman
+		-DWATCHMAN_VERSION_OVERRIDE=${PV}
+
+		# Fails to build against fbthrift for now in libatomic troubles
+		-DENABLE_EDEN_SUPPORT=OFF
+
+		# We handle this ourselves
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	cmake_src_test
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_test
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process watchman.conf
+}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index 5e3082464a32..d210a33dc7ce 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
+DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-scanner-1.20.0.ebuild 992 BLAKE2B 47a95fe8fa62d143e48f397e255fcb5ba868c86a8253e58b354b453994718f7c362df9e2858d58ca3772309aa5f101e66508e622806090c84fe370469129d231 SHA512 316c93ac9e9f64e8a38639c905aa6ba622a0730d1e517734e748946750407651808cf4e9636fb0b58910c6fbbd3c2f18dd94cec656322e1582fdb8b8ce361502
-EBUILD wayland-scanner-9999.ebuild 999 BLAKE2B 735c180d88726bf44efaa4f903946e17d1669a022222d11da88dcdf2aac909bec72c1621fc8f2b3fe9dc0100751331b72e06b8f11f342dafe2d1bbf8a758d610 SHA512 1284fd93474fedfcb17b8e197c0080502fd237748794a68da8bb1e866926b171b5d61f89d0796e400c8763a77547ba2a1723902dbea156a4083c866e56d27be9
+EBUILD wayland-scanner-1.21.0.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
+EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
new file mode 100644
index 000000000000..a71f5f47ad48
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!<dev-libs/wayland-${PV}
+	>=dev-libs/expat-2.1.0-r3
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=false
+		-Ddtd_validation=false
+		-Dlibraries=false
+		-Dscanner=true
+		-Dtests=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/share/pkgconfig
+}
diff --git a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
index 4761157bfcaa..a71f5f47ad48 100644
--- a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
 	inherit git-r3
 else
-	SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
+	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
@@ -22,7 +22,7 @@ SLOT="0"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	!<dev-libs/wayland-${PV}
-	>=dev-libs/expat-2.1.0-r3:=
+	>=dev-libs/expat-2.1.0-r3
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index c3e9bc6f71f5..cb668731ab76 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
 DIST xfce4-dev-tools-4.17.0.tar.bz2 341014 BLAKE2B cb9588a200176cae5031b50e51baea1d2c4051b0a68e6886766986f1883f00e3cb13d662ebe1aa0e72892b83eb9dda114f545d1a8883fd7bdef8fd030e60ab4e SHA512 73423bb5cc55ab8816d734ac24c3f005bdb7db370d9a2e5e820cda1e6385730cab1f2fc8af715caa961e571ddb234c2b46b9cd26636142b9ab5d18c3a26efc00
 EBUILD xfce4-dev-tools-4.16.0.ebuild 598 BLAKE2B 13b4bfa02960605265c996d8d2e1976c4e5dd645026ce5fe4c7812f12b5f63891d481b22b0e06cbbbc9290fb1178a85afd3e124d31a033c92827e63e4b3e1d56 SHA512 9a17075362771d9af7d4aafba81d9e5a2f61c8be4c595c46feedb96fe8b5f7bf185d310352bcd24fd6024b66e2f76f921c3d58c20e30041bfaf89089d2e91d0f
-EBUILD xfce4-dev-tools-4.17.0.ebuild 604 BLAKE2B 1af6af763ea82c4ced52491f80e59cbc78fe12613b9d383fd43e579cab6dc61ee32773fa57c1f43facc34c37a1670677cd0a5aa9d661900241adef0c646637aa SHA512 ca601687131a0b2f4c5d5cfca0a9aaeeead9fe7f2868b2cee163b5a4da298d2aaf6976b69cddd62286ffef2058a991d5156a8c4bb2be4295f1f707fbc7ab243a
+EBUILD xfce4-dev-tools-4.17.0.ebuild 611 BLAKE2B 59e40a3ef02f0c554b512991bee165d8054e656eb1bf6cb34d435ce14e7c820f20f6b4622b35db440315f567309de494643aaf586ebc526e8b88d3bdeb2f9acb SHA512 059c1008c79ae6ff69820da19d3daf4042b6fd29aee7c1056e47e57a2ef9574046232be6d39ce2b2a5ad76197329e90db4c618673fa5af3ac5a871b277057963
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.0.ebuild
index c3c7d8bdd0bf..bc3d26bdcc54 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /dev-util
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)