gentoo resync : 16.01.2021

author: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
commit: 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree: 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-util
parent: c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
80 files changed, 1339 insertions, 1430 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8123cac08b08..dafff41dd23e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/amtterm/Manifest b/dev-util/amtterm/Manifest
index aecbb79b93a3..1ce8031c3f65 100644
--- a/dev-util/amtterm/Manifest
+++ b/dev-util/amtterm/Manifest
@@ -1,3 +1,3 @@
 DIST amtterm-1.6.tar.gz 40804 BLAKE2B a682bb6646e7ed57e3ee8f17f25bdd60fed37d614eb3e66f6b05fa4062ef99237c24d69e4795e7a9d8b83579728c8f8423389bf7e042d981b3e84a0037e56b0d SHA512 b10777727cf7f931e4b04fff7c621ea6e94989738833fe4f830bd795c8be3b0e983100b34a2ea5feb48221f022b3498a819c9f4fba9c7722226d56d374a1d986
-EBUILD amtterm-1.6.ebuild 993 BLAKE2B f99b9b674619d58b2b27cb0350ae568ea41a20efa2fcf23a731920ecdc0fd44d81a5631aa1b1161cfd1993395c15cf4cbdbacd4695efd6384b75a27a6f5a0255 SHA512 5a29fe5aff274d0ec95f8a02eac2bea254eccdd424d2f6674b74dc1930d36747f8d68291a22f509fe60c6a103b3ee1e3727017a2ebe0d2e55c23e5a6b6fe0d04
+EBUILD amtterm-1.6-r1.ebuild 1011 BLAKE2B 9ecc65b4d58317e0eeebc6e0cb6a4d2b80d933d328375894df944a03bf2ef319ff43126afe4195eaf89e9811dcece2f084256d1d10efa28c7c5cadefe4c7486b SHA512 57dc03ccf21255e9044955eca8220825c467a1e2c9039906d15385b6f33192aa554a71aa4cb5804fab87fe3cd212dfa72a309cd3e5ca01fac56fbf32235a13c2
 MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
diff --git a/dev-util/amtterm/amtterm-1.6.ebuild b/dev-util/amtterm/amtterm-1.6-r1.ebuild
index 7f7b43b37eb4..d9a6a8dc663e 100644
--- a/dev-util/amtterm/amtterm-1.6.ebuild
+++ b/dev-util/amtterm/amtterm-1.6-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=8
 
 DESCRIPTION="A nice tool to manage amt-enabled machines"
 HOMEPAGE="https://www.kraxel.org/blog/linux/amtterm/"
@@ -14,13 +12,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="gtk"
 
-DEPEND="gtk? (
-	x11-libs/gtk+:3
-	x11-libs/vte:2.91 )"
+DEPEND="
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/vte:2.91
+	)
+"
 RDEPEND="${DEPEND}
-	dev-perl/SOAP-Lite"
+	dev-perl/SOAP-Lite
+"
 
 src_prepare() {
+	default
 	sed -i -e 's|\(INSTALL_BINARY  := \$(INSTALL)\) \$(STRIP)|\1|' mk/Variables.mk || die
 }
 
@@ -33,14 +36,14 @@ src_configure() {
 }
 
 src_compile() {
-	prefix="/usr" emake
+	emake prefix="${EPREFIX}"/usr
 }
 
 src_install() {
-	prefix="/usr" emake DESTDIR=${ED} install
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
 
 	if ! use gtk; then
-		rm -rf "${D}"/usr/share/applications || die
-		rm -rf "${D}"/usr/share/man/man1/gamt* || die
+		rm -r "${ED}"/usr/share/applications || die
+		rm -r "${ED}"/usr/share/man/man1/gamt* || die
 	fi
 }
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 0df83918b8d4..ab8e77f19093 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,5 +1,6 @@
 AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33dfcd39fd36356691722f593f7ce0fa615279c0e440077b3e29c5a643bf5be8a2406a656bfa91fb9f128c2afa922b3ad832a35 SHA512 0690f8d178fd7a5ca11b26d1e23c9c26e984214cef2e3619a22fc6cf58a7ee96fe0b046dd038c202cd6f60b9175dbdd346813c53ca85932f9a4d9dd40e9bdba1
 AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278
+AUX apitrace-9.0-libc-dlopen-glibc-2.34.patch 785 BLAKE2B 0339c808f83ecb18e42fe643a0de01b3f8566251e805bc5eace16f7d77571cde85d9cd2eef24e408202591a7b7ad0f1ec2c090b4ce8525b54057dd55cf08009c SHA512 54a7cf81370de87b28e18840b7644aa764d67096268d49324cc25b2f0cf256eb44e4da10cd63fc5fae8b8fcfac4d9eccb840b24778accb3e76c992eda06e2af7
 DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
-EBUILD apitrace-9.0-r3.ebuild 2292 BLAKE2B f0b6b5034afd50a347b2273584c05aa449f85981675fe84c8427d2c842fdb56ceeda5a1fd27eee4314bcedb2051eea4921af4c2dee88d3c02e3c17e3cd086dc9 SHA512 06498772bfd0e7cee0ac286d3db864bd18b20b708faae68634fd00e43113282808a0e25ea8ab60846d496e5ee7e61bd8f97fd7385eb4ec9a6621fb273f3249a3
+EBUILD apitrace-9.0-r3.ebuild 2350 BLAKE2B a088ac691d216414b0e7eaa352eb5ed54db1ddbac4fded595f7e8a9f691e1f1b0b82f64eae85d61e7599726760cd96931d858cd14a084f106ca1658af616442d SHA512 17fc2b8fc90102324e913cbde54f194cca247dfaf977a42c9d2f082ea02d87bc1fd9a876a9205508b89e877a32665024c03c9adfddb5b2b3e61828a1bee8bfe3
 MISC metadata.xml 250 BLAKE2B a9437881337420620edfaa0a3f4e7660a47100479c9d360dfb3b8304eaa085d5f2bb97ea8d823fc6be282fd4f2964cf12d189ec0e6d18a09ea513809e5bd5cde SHA512 284c9edd2a7f91f48402414ec05379f5a9a40ca67f02ddc4dbf3bbc45f83cfe01aa54442af0016dcf8495bb6291423def988f0bba616c5a5024011c4e97fde57
diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild b/dev-util/apitrace/apitrace-9.0-r3.ebuild
index 7c0a0190acac..f558e102537c 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{7..10} )
-inherit cmake-multilib python-single-r1
+inherit cmake-multilib multilib python-single-r1
 
 DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
 HOMEPAGE="https://github.com/apitrace/apitrace"
@@ -40,6 +40,7 @@ PATCHES=(
 	# TODO: upstream
 	"${FILESDIR}"/${P}-disable-multiarch.patch
 	"${FILESDIR}"/${P}-brotli-unbundle.patch
+	"${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch
 )
 
 src_prepare() {
diff --git a/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch
new file mode 100644
index 000000000000..6c1aff4bcb31
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch
@@ -0,0 +1,29 @@
+https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb.patch
+https://bugs.gentoo.org/812155
+
+(rebased by sam)
+
+From: Jose Fonseca <jfonseca@vmware.com>
+Date: Wed, 1 Sep 2021 16:34:54 +0100
+Subject: [PATCH] gltrace: Avoid __libc_dlsym and __libc_dlopen_mode on GLIBC
+ 2.34.
+
+These GLIBC_PRIVATE symbols are gone from GLIBC 2.34 due to the merge of
+libdl.so onto libc.so.
+
+This means apitrace can't defend against infinite recursion when
+used with Steam Overlay, but at least it should work otherwise.
+
+Fixes https://github.com/apitrace/apitrace/issues/756
+--- a/wrappers/dlsym.cpp
++++ b/wrappers/dlsym.cpp
+@@ -34,7 +34,7 @@
+ #include "os.hpp"
+ 
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34
+ 
+ 
+ #include <dlfcn.h>
+
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 9c36d10ab2d5..0cfeaf7d2d84 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -3,5 +3,5 @@ DIST bats-1.4.1.tar.gz 98964 BLAKE2B e7cb70d2d0f448e4336ccf1fe51e93730a7179a7822
 DIST bats-1.5.0.tar.gz 108052 BLAKE2B 68bba9d263e4206ead7039da2b09c5211c834445efdf429dca6c53acc5409de1052ce7ffa9143e732d3aeaeb6ea6dcaf9b419adc02776e601545557dea776e36 SHA512 e0386fb32214db67ae001a2040c44277988af7fa909a820843237c7d47eedfa4e370238d5b2d06a4667b874cad4b00f2cd14624b1bc45628192e5d693bd5073a
 EBUILD bats-1.3.0.ebuild 1051 BLAKE2B 0cfd22da9b36402da3917c5b3f37fa1c586db0f8e776e8db5cdd82d179eb087570b53b5376deabf62346e5c07774c4991fa76e4f2d3feee9c25279308ce430cc SHA512 94f4ef6ad77720bb5c868596acc962b9855791dd341d1e275b4b1eafb85c61f324522f2504199c979247ab3cf0c5c26adf2ad60e9bb981a2bab657c95d5360b6
 EBUILD bats-1.4.1.ebuild 1182 BLAKE2B d734dd2e2e032a69020267f7c734185ddbd022d75fa48a66225cd400dfeec66afe5249a19de7a38692ef3f368a42abae90d60c838f2369a57f71a2c1457552bf SHA512 175c7d4671350fe14ff4bccf5c0c7aeddaf0cccd42c4d98ff92a5889c5c5c9dd9956f03adca447e35b883b2b98519daf793e586ac57023d7cb1fa2b84e95468f
-EBUILD bats-1.5.0.ebuild 944 BLAKE2B 7d052a43e4d9d7394dae56e05127e1d897d8417ded97c068d5194b1769d37704ee4f3b589fb2dc8fa0430367c5493f5f8db0061230703abc520633b52b1a4448 SHA512 4d66e1727d9f11854cb5343c12eeef44f3d50d641773963f4d00eba025eb35a943f63a98278c21475b07c25e49561c3ec0afa3decc189e12eec2ffc40c7330d0
+EBUILD bats-1.5.0.ebuild 940 BLAKE2B 9fdf34273c68f2d82d16cbc3809aa7818faf70e803c07847e514eff13ddbc422e11909fe7d41a579fe26a6e6865170e395b9375f3fc736b81f6576ecf0e6348b SHA512 ce82c52c31455b5e203fa3df5d9f707f5319be21be8bc1fd5db97917d5a89a8c60fa14a099f6f6f23535a5d4e1bffd69a6ba5e3332a953200869395e34bc8ffc
 MISC metadata.xml 960 BLAKE2B 1eef5273fa063fbeb31bf73be2dd264f83a37a75ae5bfc116cfe6e97a0707349b9fdd6e0700505d7f698e63eeffeec2f72f9f9e853be3c3eb70ea80891fddde0 SHA512 906495ef8f00981f362302c4cc0f24aca8a9a7d4898e4f729941836b3bb126590c7d4863b37b6d216c1485cc96502c330ca03801c9cb271793ebd298285f8923
diff --git a/dev-util/bats/bats-1.5.0.ebuild b/dev-util/bats/bats-1.5.0.ebuild
index b9ed1b8d1482..84e71c0c72fc 100644
--- a/dev-util/bats/bats-1.5.0.ebuild
+++ b/dev-util/bats/bats-1.5.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 DEPEND="app-shells/bash:*"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index e2d4aace7085..ef199f10d30d 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -2,10 +2,8 @@ AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168
 AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7b319329ad45649edda0f7c9cbd8c8e90ce200c6f7df4913c3eceb0cc729e83d90b7dcc8af991e3f59b5a772f9cc8 SHA512 05f2c50e7daabe9118ea4e6dfd6d8dc155bb0311fbb2fbc491c2740d6f5081cc95ec7cb8faf19751eb161bcf60d30be87e0b6c88d032bf88ecae48af5119e0df
 AUX bcc-0.23.0-man-compress.patch 704 BLAKE2B 0eceb68e7d7a09b948d24e98c833031751421c829ba99564499b4e4ded9f0bc505b60a2648de7287185d85d847b65f3b929dd08b3fe9f97b1a7aaf9868750ec4 SHA512 7f7c4f4292ab5334201506ba523adc1c9a8e87cd3656a896cf31fe7f48f25e84bb52552f7d02d12442784a72cf7bcb01dec8a63eb2679aa9d84ff935f94d1863
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
-DIST bcc-0.22.0.tar.gz 5247927 BLAKE2B 896d22c9540180e015f7be03b2ce8e6957fd7ba3e7f28fb57247bc8455b35bc82ecf321140e80f714bc01a2c01721e0544e249bc07be7b467c650788014793f0 SHA512 946ec8ed96a83cb7a9d7e44436901445588dc5e37c5cbc8b720a7a0d226b2769ab780294fa7c52099f579f4f1b6935f662be19c739d13979044723dce8ed7792
 DIST bcc-0.23.0.tar.gz 5254103 BLAKE2B 011559f081dd8f95b45b64e347ed191f585f6f5e395aadc3ef9726785aa41735b263c0d6e7743c969e390792f0f4f286930fee585c1a59878f301c4b4026dce8 SHA512 531626c920f5ef7d05617b3b418d55fdeef2dc8014f942a6e68ca457433d63445cc98303bbe331ee982e4aefe5d2df84764d373a6166638bd457992b371f037c
-EBUILD bcc-0.22.0-r1.ebuild 2502 BLAKE2B 4b48547c387bcf109adf746eb57eb04d93c41c6116b481beb9654dfaf82470ec34f5998cd9da0badbc308d4b0409ee7efcc4b2f1874265e5f12ca22fda4e9fbd SHA512 44f531b55f2a27be716276bf646ae2652b7e55134636c0c229fb1d327332842e8ec7211a8a9a4402e2362e17574e6fcbc375d2e0697c96250f35f5b02f554bee
-EBUILD bcc-0.22.0.ebuild 2533 BLAKE2B 948441d97a61b7ef0925bc6c03c130ebb56d25ada7be353bd087efaf8d37423c2b9ea407b93efffa963cd09c999e941f9f24efa20c863f07f3dc8b8b9a7084f8 SHA512 180d12f060eda41a33e57539f22eb7334e116a7d3227a2bc041e897213f19344ccb499b5d9e7ec4d455aac66e896ff88d989c866a727aad8ba304dc9dd4c4a29
-EBUILD bcc-0.23.0-r3.ebuild 2969 BLAKE2B 803465e0955b7e896c1baf05d4eed95879439407b248df17e738a61ec1b863f400166113ab7ff65fab0c58ebcd5667cc8b7683e939ee675578a89a8393a8da3f SHA512 309fc7d9c8e710bc7a2311b513352225a13049bc93abf6fa7b641c3b474c8b298c5275222eebc9aedb54fd70057a165ecf245b9847355814b4c64d33d4e9089b
-EBUILD bcc-0.23.0-r4.ebuild 3069 BLAKE2B 4317e7c2ba6be3721f07296b5dc7f877ef3394f236b056ea39f6e10a9a9705f59f6173401299cfca0b5c2cdc6a321caac1b601572433d7c9b02277b2b7f7bbe2 SHA512 4f6f09c1cab99e29fdc3985e273d719e2455d3c4bd30a1793aec6329683ffb3fe931ca9c98516960b3c48ebb441b2da23edda1cb0649637e24ee3d8f496bbc30
-MISC metadata.xml 501 BLAKE2B b958c89640d4cfe0cd5951fbfe65394b84a606c2ac4e73893b46fb950ce7a53f9a9623636bb8f3926c0637539c1aed3107cbf1e6aa52fc0d8a9b948977fab747 SHA512 32e576ce7431409c9c3a69f3ac1d5f757b6ec9807fa86d38a93db02721b0e10771dea786c646513f952fc6603e64df2eefa5797ef2103c55a9b1be60bee522b9
+DIST bcc-0.24.0.tar.gz 4640711 BLAKE2B 91d333c21c55de6a0ae78f9bb0b003803578525746e63ca5047896c0b2ed03ee880e03a84511470576e888e46559c67a8ebfdfe49d8785d094e2361bb20c5c2e SHA512 951672e3a8e5ad56eedf513477317ec3d3b4cf2d594bbfce20f3d19ddf7ce255e9dcfc69d9b05bb765a16e769c8e42d7c57071ddb86fb32437f527d3d25d19b6
+EBUILD bcc-0.23.0-r5.ebuild 3065 BLAKE2B be459f9fec8bcb46a1ca7c30abe20b3be11ff39b113214e676a0d323da2b2e31c5381a5a024f07e4c4d303d05d1496aff554a6e7ff2ee316b9637b66c1896f49 SHA512 ab602946077f47e56711a703107048cc72cf2fed7cafecbf19bd82a3786680baab20b36a33390f33b76d5922b5e896b2bf293e03ea63a6969f92117da7cb532a
+EBUILD bcc-0.24.0.ebuild 3073 BLAKE2B 7cbb878889a2e8ffd7e466a81e8da65244397b8da4e2907b777cff46bca4711fdc42aad8a257d2c4db9aa355404f2998851c1072b797d3985c38759e7a784a74 SHA512 7a8c7487cd5522068b426443927d51ff6ca4fe9ca5ca925e8f69260e25717c3bd788ce56fc6246d61711ace7461b97b199843606be4008cc06aa27a5878a9ed1
+MISC metadata.xml 533 BLAKE2B b34e30baea99e82348b7f925ab1b4899ea9e4119d2f24f59e11b48dd8efc61edb3029580af40184acd0dfa180caa7e558ef0303247658cc1b3136940f7a735f6 SHA512 c7d4a450c8fe534fd9ab3aede95ac1192aa62f94858b9e0b1efc1b8982d49b0546e012f2d60c1aefc96155b8641d6ebba059af8fbea798827cc8dfeee15390e9
diff --git a/dev-util/bcc/bcc-0.22.0-r1.ebuild b/dev-util/bcc/bcc-0.22.0-r1.ebuild
deleted file mode 100644
index a5029626a40d..000000000000
--- a/dev-util/bcc/bcc-0.22.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-LLVM_MAX_SLOT=13
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-# tests need root access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/elfutils-0.166:=
-	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
-	>=sys-kernel/linux-headers-5.13
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}
-	lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	# bug 811288
-	local script scriptname
-	for script in $(find tools/old -type f -name "*.py" || die); do
-		scriptname=$(basename ${script} || die)
-		mv ${script} tools/old/old-${scriptname} || die
-	done
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.22.0.ebuild b/dev-util/bcc/bcc-0.22.0.ebuild
deleted file mode 100644
index d3f591ee94f5..000000000000
--- a/dev-util/bcc/bcc-0.22.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	|| (
-		~dev-libs/libbpf-0.5.0
-		~dev-libs/libbpf-9999
-	)
-	dev-libs/libbpf:=[static-libs(-)]
-	>=sys-kernel/linux-headers-5.13
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-13:=
-	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=12 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	local script scriptname
-	cmake_src_install
-	find "${ED}/usr/share/bcc/tools/old" -type f | while read script; do
-		scriptname=$(basename "${pythonScript}")
-		mv "${script}" "${ED}/usr/share/bcc/tools/old/old-${scriptname}"
-	done
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.23.0-r4.ebuild b/dev-util/bcc/bcc-0.23.0-r5.ebuild
index 4f45cf6e2a90..7ff16dec0b5d 100644
--- a/dev-util/bcc/bcc-0.23.0-r4.ebuild
+++ b/dev-util/bcc/bcc-0.23.0-r5.ebuild
@@ -120,7 +120,7 @@ src_install() {
 	for tool in "${ED}"/usr/share/bcc/tools/*; do
 		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
 		name=${tool##*/}
-		[[ -n ${rename_tools[${tool##*/}]} ]] && name=bcc-${tool}
+		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
 		dosym8 -r "${tool#${ED}}" /usr/sbin/${name}
 	done
 
diff --git a/dev-util/bcc/bcc-0.23.0-r3.ebuild b/dev-util/bcc/bcc-0.24.0.ebuild
index 20e896fce14b..019bdcd9fa81 100644
--- a/dev-util/bcc/bcc-0.23.0-r3.ebuild
+++ b/dev-util/bcc/bcc-0.24.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=7
@@ -15,23 +15,28 @@ SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+#KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
 # tests need root access
 RESTRICT="test"
 
 RDEPEND="
 	>=dev-libs/elfutils-0.166:=
-	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
+	>=dev-libs/libbpf-0.7.0:=[static-libs(-)]
 	sys-kernel/linux-headers
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
 	${PYTHON_DEPS}
 	lua? ( ${LUA_DEPS} )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	test? (
 		|| (
 			net-misc/iputils[arping]
@@ -112,11 +117,15 @@ src_install() {
 	python_foreach_impl python_optimize
 
 	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+	local -A rename_tools=(
+		[trace]=1
+	)
 
 	local tool name
 	for tool in "${ED}"/usr/share/bcc/tools/*; do
 		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
 		name=${tool##*/}
+		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
 		dosym8 -r "${tool#${ED}}" /usr/sbin/${name}
 	done
 
diff --git a/dev-util/bcc/metadata.xml b/dev-util/bcc/metadata.xml
index b1c79adcf2e9..0964cdb4976b 100644
--- a/dev-util/bcc/metadata.xml
+++ b/dev-util/bcc/metadata.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
   </maintainer>
   <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
+    <email>zmedico@gentoo.org</email>
   </maintainer>
   <maintainer type="person">
     <email>jsmolic@gentoo.org</email>
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 828412959e32..644129bb7bdd 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -2,13 +2,16 @@ AUX 22.0-fix_build_without_leveldb.patch 683 BLAKE2B 471da86970257cc9082c57504e4
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
 DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae
+DIST bitcoin-21.2.knots20210629.patches.tar.xz 711680 BLAKE2B da49c6ab075b2478482daeafefcad507f12718e4ed2af847e64aa30ff0839876b9a5b68bc53f2327c9e18df51870d50f7e7d6b2215d5fde1d147567d9d60ffa5 SHA512 e0386f2712053475548c3d7fa927117d1fefa27d447c1398bec152e601a9be0af7a1b03f83f5345b03af252b372091548ce75075f42e4831f4e85f622531962b
 DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
+DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
 EBUILD bitcoin-tx-0.20.1.ebuild 2436 BLAKE2B f8bfc55eadddefe07189dde452ffb72139a7ce54d8fc859bd781dbba02118453c85abe5f47c5d517cbf266b046ec88e2baaf390eedff237612c0859e60aa9502 SHA512 5f2c1b325870bb62756b42541064ee4004cd514ef56505b1fae5d8bd2ed50201e9c774473443349227cfafa53254a131961877e48b7d6351c44adb7b660d2700
 EBUILD bitcoin-tx-0.21.0.ebuild 2444 BLAKE2B 46b9ad6010bbd0a830661b8e97042c054aba009e38a339009256189b598ad1a4273811ec718656a27bc6b7b0edc08878a9030713f1d545f03b1fc326b75419e8 SHA512 cd9e34f5a9075ad4fda89fc63e662030719dbc685c48122fdb073dfedf8f6c96c7bcb5b70c1fa069db56138336e6d22892afa99bea89b004919f5dc3e91575d4
 EBUILD bitcoin-tx-0.21.1.ebuild 2380 BLAKE2B ab839a6dff59217a5141ac7bf163550f3630ede3d2474ad51f6e09c25992f03f153cb20321bfae5ec793ec5e0a4228ffbc45415bd044ca31cc64e3c967c6a70e SHA512 319a0e3668e8e75a41b92c36ca6c63860d379d05aac9f6b755afa8310176104258dafaf9922c1798ffa3a49ad1cd57262d31264c82cda675d77ac9a7f661d212
+EBUILD bitcoin-tx-21.2.ebuild 2349 BLAKE2B 35cc0a33632a88de8f203cd18af25e251bae3926cc0c2e6e6cd14481feaa8d10b5fdef47bf958fdabe82a92e9b02bf6af891279e49037365ee2864a3a8245367 SHA512 0a4d6f50bcc8b69d7e785a9ee7fb3b012c0d3091e9bdbdbd8e56d42a2b6f278b99df46b14a08e4b6b96a92b2309ca28c860a3ed1a083ed6ceddfd60f7caa9806
 EBUILD bitcoin-tx-22.0.ebuild 2710 BLAKE2B a8bb4eafd021bee351700ad2e3bf35d24ff7ec21ab2193ac1b32bf9213ff00b9fcd84877b06050c94ec8f8c9a07317d77d7ee0e67b0640205c598e1071e67a14 SHA512 66c70f81365f16c7cf859d46cee12fd1880854eecef3173ba710aa1e1a0a67fbc8e8f513f55fa05d7104b33628c1450cfeda8cd15a62af51f74668b55f1f5ed6
 MISC metadata.xml 651 BLAKE2B 33a308d2af3a2418cfed88e8a50b1a7f160c3f9ccb7d65acef717cad7bbad0dd8fe0577a6fbe606a354f6458074ed3471ac7672737c8892ac5c67f41ef47ed2f SHA512 303af395b2ef63071c84925ccd94a79f441fa2d32efb78b218c2846be6ae8777949823d205f8073c48ff73746adbec8cf05f76ec90a7f26601cd427335f1fff7
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
new file mode 100644
index 000000000000..eba3d0be5784
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="af591f2068d0363c92d9756ca39c43db85e5804c"
+KNOTS_PV="${PV}.knots20210629"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
+	https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots"
+
+DEPEND="
+	>=dev-libs/boost-1.68.0:=[threads(+)]
+	>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
+	>=dev-libs/univalue-1.0.4:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/automake-1.13
+"
+
+DOCS=(
+	doc/bips.md
+	doc/release-notes.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2021/09/29/release-0.${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch"
+	fi
+
+	eapply_user
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index b8655a232f32..e2f7efc4bba2 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,19 +1,15 @@
-AUX boost-build-1.71.0-darwin-gentoo-toolchain.patch 651 BLAKE2B b6fe461f4db4a07d4961199dd3c707584b35af4a8ca3c0da8921eb366e80b81aa25506ef18cd9d732f3177e2505258be4268a0e58e5325c59deb7d76d3b55645 SHA512 80aa0b261b6aa1f89bffb34ec720c0b8a5b6e2e4867dcf4fc1cf58ba798243cf61a12c4ea1ce6ebc97ca9ec45fb959fb9c0ec997844d3c750d4a2f5a76f11c63
 AUX boost-build-1.71.0-disable_python_rpath.patch 343 BLAKE2B 7b8449db1054dcee76ecbe1b1c826ae3d6964acfcfc0850ff3c75d3c71b043587bccac6b96797229c6dec39beb593893d16ae93a4d7fd16b969129fe63f73d0b SHA512 99bc1260f3d36faf60ab2837039466201bddfeec5c60f65c1c5e52d6d6c1667d419376328f8202596aa2b66448308175d2504062ee6e1708ea0f44d02988ceb4
 AUX boost-build-1.71.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4588b60abc5ad361d3daad39a33a92aba2e0368373be26ea10ae2ea4396a18c098ca5dd00db995f03c9a35e2eb1f9002990 SHA512 d349ff3040c219c3a9f9f6182ca3f1fe7e25d8f2975dd04e66d8e281caf10a5b27cab5e6fa6240ed57b24524fa045a88ba1cf9220efcf065726c78c68378c5e8
 AUX boost-build-1.73.0-add-none-feature-options.patch 475 BLAKE2B 5211dbc9188056bea09c4d9d5073cb772ff876b6ed7a05c18db34b2b86b85301d092c6dfd5698aec9ad93a828aeef8283d005136cfb4eb10ab2001f50f41b51a SHA512 0ba75a1e46a58dcc6a332ef8cc8a688f1219619cf84b681233e044da1fda754b7f8dc5ecc903776674729275d7a39a571803022cd66b99e9e335e6ba5bbc5501
 AUX boost-build-1.74.0-no-implicit-march-flags.patch 16904 BLAKE2B cd37f24ca075760dd220926b081ab898f0f61e9de22e1dbc119afd5d746f3a7d215065332c96af9f64299e9374d994655d196430ad7deac592a42e7d165b0bdf SHA512 d07b55530d26c63b7453d265e27ba6a1e902f67f2b74e581a0286f563e0b2afa833bbdeb625be1a0beec255ead811eecb10d3a6f45c27cb929dc224430c60a8c
-AUX boost-build-1.76.0-python-numpy.patch 791 BLAKE2B 48751f726120b69511e7bbf0f4ff1454218d67de7f61b68127d70da2631f09a76448e5c660bf8d64288a4098331ac3ac4e626f068afeb8cf46cea9f45ae46dbf SHA512 3358c08450c998d665e5fe3599bb7f900acada856f602ab9a592aa1845ea6244a70c56f135fbd45f8c62dcc7fd083b4b026c222d39afdb82b95a532f09308fcc
 AUX boost-build-1.76.0-respect-user-flags.patch 456 BLAKE2B 02a383d7a969220da3a40bfe822a807c67734a286f65c3d1dbda18c263593cc6940f5ed260bea1d1ccc20c0726b04859ce2d97c151d10b067206f79d417af237 SHA512 06df6dbf1bc48f224a77ccef202f0cde61c594e6be23418196fbc274bb8e1b6e16a8f2ef9fd45d112cb57af8987df23282e0b1bd4bf4ca6603127b573f54810b
 AUX boost-build-1.77.0-darwin-gentoo-toolchain.patch 646 BLAKE2B 96420764d7504ff08899fa92384180adee851ccba0e9395d4efbe93644a8e505ad9bab6f5a56ef382bbb2ec2ab5cab4d50e35dacab5fde059f8370cdf58491f0 SHA512 029135d74cf046cfae23a2762130da40200819e9edf0df0b4d9ba3e9a787bea69975e3d92540d19d5680ab98a8c7786fa3e44801d675bd8fd943e9e02c13c45d
 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_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
-EBUILD boost-build-1.76.0-r2.ebuild 2155 BLAKE2B f3705ae6770e374d00d4405335662c072dd475dc0a230cb2fc376bb84374554cf11dfc07df059833630ea0131a2f3bce9f4d0aa0059fff33b0996d12d1d1d33b SHA512 b68b1bbaf0713cb0901037d731ba7001d0cab9bfec248bf0f6724211b2b50ba7a759d9f5e0bc66070f37b60c9207dd452bd63f69007ac18d5370316dc3443651
 EBUILD boost-build-1.77.0.ebuild 2114 BLAKE2B 28bfad497b939cb453f6010fbeea0e46fd7ffff6009ab65f7404b842399e2941065e33477d293d5983fa4269d90b2d8cec017537d010d11c40e8d9c94e3d2f30 SHA512 677e523abbb7f97475a91b87bb592c6fbf8674d6baec28bfc24bbec32636476430266b5cab2f1c6b357cd84ce7fc99294896ea9431ac2e0987270a8012470384
 EBUILD boost-build-1.78.0-r1.ebuild 2174 BLAKE2B 278b5ac3c8ffd19e259ae923dd05bbd61415b41640d3e12e80e951ff0473dbd15ecbef51010f78abcff9b725fa193c4551b337ac4935365b813c644c96b77706 SHA512 d80d4355b2082606c0f44d71a2611d77757dd5c07c5d0e73df5cda8c672f47d5f4f9675601384e089d956449a5935f95b1af119c934100f70e4f6b4d649cd7f8
 MISC metadata.xml 320 BLAKE2B b8916adb7b84ead3feef70414578019e07de58086e6954cf2a26a77368a99bc75bf99ca18f111a67531d318863fab700083ebcd7612e7d40ece89086d9d4974c SHA512 7c2c8fa591a6c3d05b5d4808077b890d5757bbb4c12a9fe7ed7b4ebc738244266196baba07da434ac3609c0d00aed4ef9c2346524f141e679b94376f804c508b
diff --git a/dev-util/boost-build/boost-build-1.76.0-r2.ebuild b/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
deleted file mode 100644
index 1e0b91062eb0..000000000000
--- a/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~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.71.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.74.0-no-implicit-march-flags.patch
-	"${FILESDIR}"/${PN}-1.76.0-python-numpy.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/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch
deleted file mode 100644
index 3693677540a4..000000000000
--- a/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Avoid adding all kinds of things to the toolchain's flags that within
-Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target,
-arch, etc.
-
---- a/tools/darwin.jam
-+++ b/tools/darwin.jam
-@@ -239,6 +239,9 @@
-         }
-     }
-     
-+    # leave compiler flags etc. up to the toolchain
-+    return $(version-feature) ;
-+
-     if $(version-feature)
-     {
-         if $(.debug-configuration)
-@@ -447,7 +450,8 @@
-             support-ppc64 = ;
-         }
-     }
--    switch $(arch)
-+    # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either
-+    switch $(donotaddarchpleaseXXXarch)
-     {
-         case combined : 
-         {
diff --git a/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch b/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch
deleted file mode 100644
index ed04d5426341..000000000000
--- a/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 61adb508853be1fa2c01a0c3a0c55fbd16cb9a52 Mon Sep 17 00:00:00 2001
-From: Peter Dimov <pdimov@gmail.com>
-Date: Mon, 24 May 2021 22:11:23 +0300
-Subject: [PATCH] Declare the /python//numpy target to hold the include path
- (fixes #725)
-
----
- tools/python.jam | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/python.jam b/tools/python.jam
-index 00706932d2..0dfc750a22 100644
---- a/tools/python.jam
-+++ b/tools/python.jam
-@@ -1052,6 +1052,9 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
-             ;
-     }
- 
-+    # Declare the numpy target, which contains the NumPy include directory
-+
-+    alias numpy : : $(target-requirements) : : <include>$(.numpy-include) ;
- }
- 
- # Conditional rule specification that will prevent building of a target
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 6c7768fa2c25..2830906633fe 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,5 @@
 DIST byacc-20210808.tgz 891489 BLAKE2B e349e960cdbc654b148ec8412f8502e26976f8a933e3846fc4ff308440c8c8058b3422dbc0a709b792ec727c62f3b4ed7d0679d9d5da69fed8c4e08daa801625 SHA512 cde092dbd845364752aca228a838b97fc34378c7dd7f860c614d13c8ec7167b8416422ded82864d22e8c3c447b47b30abca591ef8ab667c49f9fa070d68114c4
-DIST byacc-20211224.tgz 894135 BLAKE2B 6b9e7686e66d9f23ba92f5d8129bda72f75b71a50a72792ec241270102d972279b775b6dcfba85f79dd3bad04470838c1a9f2a675d620322393c7251afafab25 SHA512 e2b9df443c5b05179815808d61e693e942549ca6484a5ab4fdb285b9468da9ed3a90e00d1950a0fbacd1890e5a69bcc03b6d7135a7bbfa59ab0995125b9a8642
-DIST byacc-20220101.tgz 895100 BLAKE2B a78b3530cae045453a6d19fb0dfe3b84034638c624183a32950a19d9b5dbf6b4e4f32ab943e3bad9e9e497107513763be1f758f7cfdf0ffcf31e23a0e2fa5ad9 SHA512 9aff85f0b4ea7f0c9b2e25a155537c99e0591582b2c76c251f08493987a343a812ff86b9cf3d8ecb0954140817c9b164328117de9116f7013e6ec0d91a27486e
+DIST byacc-20220114.tgz 897405 BLAKE2B 79d3cbb07022e3376fa5c2b772b55bfc509f23daf7cc4a58cffc8834db4340b4f59e0ba544a11039d2a4e2b2bbf18f279f9be37c34c85f06c9b755d572005521 SHA512 5734d7f21b356a620104fbac574d46fb31fd967766b4184bf2cae7de6a61686ce32d21a2920f2a0fe4b98e7826b50a3d44fadc057d7371de5e3ca38c3b685733
 EBUILD byacc-20210808.ebuild 720 BLAKE2B 7adf13f8402a63d3106b295d3f3b7e0b99c674a3c567c7645600e8b73edb26e40fa0f7f72ab334c67ada51662207da29b95eccee092013e5fa51f3385879b85a SHA512 797b80df70601601ee535f1d723d4515c14b613bef1398973b64f9dc70d47a6e8a796fa2880880fb13f9899fa32b5636fd04f99bf9e4bcf13e3be8b1fcce2818
-EBUILD byacc-20211224.ebuild 727 BLAKE2B eddd520fa731184dc22a88d520caf04aa128e9dac8cb9882250e1acd6310eabf828cbc280c7aff2db6eb32c39cf34d91da43e462038448b087a0caefcf04286b SHA512 a74182290a2a3100ef3e374f4c35cd97d5507534bc00c7810741eec40282ed4a147bb3bda2befeca8be726b397a350d0ebe68149bbb1792019051634bc299c5d
-EBUILD byacc-20220101.ebuild 727 BLAKE2B eddd520fa731184dc22a88d520caf04aa128e9dac8cb9882250e1acd6310eabf828cbc280c7aff2db6eb32c39cf34d91da43e462038448b087a0caefcf04286b SHA512 a74182290a2a3100ef3e374f4c35cd97d5507534bc00c7810741eec40282ed4a147bb3bda2befeca8be726b397a350d0ebe68149bbb1792019051634bc299c5d
+EBUILD byacc-20220114.ebuild 727 BLAKE2B eddd520fa731184dc22a88d520caf04aa128e9dac8cb9882250e1acd6310eabf828cbc280c7aff2db6eb32c39cf34d91da43e462038448b087a0caefcf04286b SHA512 a74182290a2a3100ef3e374f4c35cd97d5507534bc00c7810741eec40282ed4a147bb3bda2befeca8be726b397a350d0ebe68149bbb1792019051634bc299c5d
 MISC metadata.xml 356 BLAKE2B 3f7f63e3c9b146f59f1f5af0d683294a58b264e2945fd1a30635c64d462f4615395a49b6acedaeb3ae6377061e85b2496b898db6d8b39a3b8ac8f3cd800a666c SHA512 6f1890fde8b83fe6821ac2e9d298f4dda67bd1a15b26e54d51de685cba60b7f938e4cea3f335635773bb54f4a7fadc9a41e52dadebbb41897c042b4c995ba634
diff --git a/dev-util/byacc/byacc-20220101.ebuild b/dev-util/byacc/byacc-20220101.ebuild
deleted file mode 100644
index 6f72092c3d7c..000000000000
--- a/dev-util/byacc/byacc-20220101.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="ftp://ftp.invisible-island.net/byacc/${P}.tgz"
-# Seems to be unreliable (unstable tarballs): bug #820167.
-#SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/byacc/byacc-20211224.ebuild b/dev-util/byacc/byacc-20220114.ebuild
index 6f72092c3d7c..6f72092c3d7c 100644
--- a/dev-util/byacc/byacc-20211224.ebuild
+++ b/dev-util/byacc/byacc-20220114.ebuild
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 7b13795cbfb7..bdb72f4a002e 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -2,7 +2,6 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST cbindgen-0.19.0.crate 181286 BLAKE2B e09931704cfe0f0f777e67c66fdfd08820e8185a7ad475521eca2d6819d1d0a92791d5cd5dfb2b2199e911da9e8a92dfa09ec20d2912f1073d456f7932944438 SHA512 dc31896c75d43fa7efb6256b861b7d4a51b9b0e4dc605bcaf769b32cba2dc0b7a5c49b01f0ff48ada08488ad8c020c3bbb645d6796046caf0bd7d9eaae25a962
 DIST cbindgen-0.20.0.crate 183277 BLAKE2B 51529b21879e3a3212fbb951b3bdd5c8c396dce53e9dbe568bfe1e752caf3060bc784909cb4b37a6e6e80d357d5a8e2bab8d10d4470563358407bceb814bb7fc SHA512 83c2b0da580f0a2fc9a74922f3c44d0e73ce0d1de8b5a3f5819c7fcf1c481df1ff0346e84c5b4c199a9364542c85fb81ece4e1deca3a6f12231a4478f76a7c02
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
@@ -49,6 +48,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 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
-EBUILD cbindgen-0.19.0.ebuild 1259 BLAKE2B 631c95bc89f17fdfb13180f4e6c203d3f8f8e8297e578f098b2fc583db2725d66e70e8f2b3eb3b366fb155c004e255bbcf856a1c79579bd24b591de0c337bb4a SHA512 48bdd6a80553225bc952964aa11e9e1a27a79793588d720362ae4acc23ccf8728c36c113312a99279989f8851e7186090d709f80333f9933e624b9f5a5826ac5
 EBUILD cbindgen-0.20.0.ebuild 1266 BLAKE2B a9271f4139d33ec15b9e87875912fe5471224b065459e587a4d4f8128e74ab18c19147fcd16fe96c245f53b08039b77990824842cf746b0475a8161adbeae309 SHA512 e240d76b68da969c19642fb2f09cf164518fd0528734d560e3ef95a9516b273e40114afb9492145ac9ff76319417b5ec5bc7bdeb545c70750a11ee5763840cd6
 MISC metadata.xml 335 BLAKE2B ec3adc5159ac8268dc5c075840ae2999fcb90287bad12dd094f6ac7d5f810b6adf2a83f66daaf211ceab5f11ce1e1184d8e451de8ad5e16f9cc8cd7114246585 SHA512 e4033b997924d22d914efc9867f95a1e4ce09790862f9e0929de93832f5fc779537312f1e8c1dc17462e5543f599181104079bfc59305450fdeb375279bd1b29
diff --git a/dev-util/cbindgen/cbindgen-0.19.0.ebuild b/dev-util/cbindgen/cbindgen-0.19.0.ebuild
deleted file mode 100644
index 43c1c656c7ff..000000000000
--- a/dev-util/cbindgen/cbindgen-0.19.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.14
-autocfg-1.0.1
-bitflags-1.2.1
-cbindgen-0.19.0
-cfg-if-0.1.10
-clap-2.33.3
-cloudabi-0.0.3
-getrandom-0.1.15
-hashbrown-0.9.1
-heck-0.3.1
-hermit-abi-0.1.16
-indexmap-1.6.0
-itoa-0.4.6
-lazy_static-1.4.0
-libc-0.2.77
-lock_api-0.3.4
-log-0.4.11
-parking_lot-0.10.2
-parking_lot_core-0.7.2
-ppv-lite86-0.2.9
-proc-macro2-1.0.21
-quote-1.0.7
-rand-0.7.3
-rand_chacha-0.2.2
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.57
-remove_dir_all-0.5.3
-ryu-1.0.5
-scopeguard-1.1.0
-serde-1.0.116
-serde_derive-1.0.116
-serde_json-1.0.57
-serial_test-0.5.0
-serial_test_derive-0.5.0
-smallvec-1.4.2
-strsim-0.8.0
-syn-1.0.41
-tempfile-3.1.0
-textwrap-0.11.0
-toml-0.5.6
-unicode-segmentation-1.6.0
-unicode-width-0.1.8
-unicode-xid-0.2.1
-vec_map-0.8.2
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-RESTRICT="test"
-QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 77bfe5ee914e..13e5bd6fe3f7 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1,10 +1,11 @@
 AUX colm-0.14.7-disable-static-lib.patch 524 BLAKE2B 1e47e8e48592956b4aa99682398f49817458c005758ad606a5efaea82305bca58b4319a97ed36ecb57d2759b8d3392d8c39c91fba46cbc2b43cd421ccfe3bdef SHA512 6f9463c99691cf51c0a1765a6942c2ef5316676bff7c7cec991877a9c86ab708c44d0a2230f172880757a48f5c77d377d754becc243972e276586ea077feb493
 AUX colm-0.14.7-drop-julia-check.patch 1369 BLAKE2B 9d2e841fd19051e0617df64fb9940b5552e7b0a1c7d3525606e022b1f483628847955c2c85e7ac6d3fbedb85e46b38573b054b9883ca31a327180fcae261bf06 SHA512 962174b04c0f694c655e5e5c526ffe82619abbe12457d3a396dd639f023e36a8750d166c0b09b7531cb03abd0a8619587201d66ce46e69d2d4e7420f883771ca
+AUX colm-0.14.7-solaris.patch 659 BLAKE2B f7e8b4781ffc7a63fa63ee83f69e115ea14609e1665a01e0ad62d9716a1258d71ab849f02b58b3dcd40fb8d6cb30a9beb0e587a3825fadde4d9ca45e124adcb9 SHA512 cd4e6a8d7aca33112e3f7c936b018392923e8578050a437c13e818d4bec8979b5f0c3f8792dcc451a4ac6c990f7498b9026aefcb22d91db0d61c1bc01287300d
 DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
 DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf2879ac3780fa6ebbc37bed30d3faf68515f21c9b31bd5f1504ab03b5ea63a24812f7117515c63261b8d1683e27 SHA512 a783817f9d348a79e93cac54c042e8366a73df287c14221b9e4a7b963385c1e32eb54d6918d0822b271dc2a0420abce84a3e1a3c9ada84968d1c20178d0310ad
 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.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
-EBUILD colm-0.14.7-r1.ebuild 1157 BLAKE2B 58952558f5920bb8f22d35e3f64a4b4a9cc867d0c2b7ef24f872e16641000bcb5c781e66056b335d7adba40ec372dfa49264f21f5b4a8010e9a73b5922d36b53 SHA512 331dc45399eed8364e30436795744b5b5e813f8762a043e20171c03972fe27172a53b2b4f23687ee629a47ca10a75840a8fc3478238184cd6eceece1a9e771ed
+EBUILD colm-0.14.7-r1.ebuild 1464 BLAKE2B 42a1241adf2e34160d294c104a6fe06550b001ad51d1694ed6a665373284e2eb25db7012772823405304f6531184b4a93deca6cc086247913d74b554f327dd88 SHA512 07841441e7eee4dcc2567d7096af022d25b63a381608f5849f6d79a8b7aaabcae82eabe5b75fe90dd3abcb201c85ba2985b1991781d3386a4b46105c8b242096
 EBUILD colm-0.14.7.ebuild 1366 BLAKE2B 443e26f0bad0e8805d20ce2a69cb829d28e5558fedeee3e3a76b74e1c73bf4dea37ec391f9e2615c91581576297cfc37865cdd4cc9dab8870bf4a4634da50b9f SHA512 58af643e63bdb8261b36c4141b9b680f3d27647394b40c0fbfcf1c5f9c261f44277d17dd98e58db7aa697cfe6d5ea66260e1adbfced1c45e35fb7b7335dd4b83
 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 831d5bc521f1..cccddd15cee0 100644
--- a/dev-util/colm/colm-0.14.7-r1.ebuild
+++ b/dev-util/colm/colm-0.14.7-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="
@@ -26,6 +26,7 @@ RDEPEND="!<dev-util/ragel-7.0.3"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
 	"${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch
+	"${FILESDIR}"/${PN}-0.14.7-solaris.patch
 )
 
 src_prepare() {
@@ -38,6 +39,11 @@ src_prepare() {
 	sed -i -e "s:gcc:$(tc-getCC):" test/colm.d/gentests.sh || die
 	sed -i -e "s:g++:$(tc-getCXX):" test/colm.d/gentests.sh || die
 
+	# fix linkage on Darwin from colm itself during build
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/libcolm\.so/libcolm.dylib/' src/main.cc || die
+	fi
+
 	eautoreconf
 }
 
diff --git a/dev-util/colm/files/colm-0.14.7-solaris.patch b/dev-util/colm/files/colm-0.14.7-solaris.patch
new file mode 100644
index 000000000000..83b03b0d23a1
--- /dev/null
+++ b/dev-util/colm/files/colm-0.14.7-solaris.patch
@@ -0,0 +1,28 @@
+https://github.com/adrian-thurston/colm/pull/145
+
+commit 0a0fa0a41928564fa92100bff1bc21f85d770bfb
+Author: Fabian Groffen <grobian@gentoo.org>
+Date:   Wed Jan 12 20:32:44 2022 +0100
+
+    src/bytecode.c: include config.h to activate guards
+    
+    Fix compilation on Solaris, which needs sys/wait.h for macros like
+    WEXITSTATUS.
+    
+    Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+
+diff --git a/src/bytecode.c b/src/bytecode.c
+index 8ef848b0..c30778da 100644
+--- a/src/bytecode.c
++++ b/src/bytecode.c
+@@ -20,6 +20,10 @@
+  * SOFTWARE.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <colm/bytecode.h>
+ 
+ #include <sys/types.h>
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 586f7afc2d94..75a2bec6a56b 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -2,8 +2,10 @@ DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087b
 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 623 BLAKE2B 8800c3347f0754c023ccc4397cfadcd48b6ba657b41f29c399c06318ceec1f78126140e5ccb392dca41a01d49095c31fe40d9d32dbc295109519fd97d613dfc7 SHA512 bf460a6910dd439f197583414509b131e2b474cba8362de761fb928708c1c9f1a3f41d33edd97aee6dd58a8230c9550b2fbe09b2605f64e024d2db980b55cbe2
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.2.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.2.1.ebuild
new file mode 100644
index 000000000000..ee8c5596452f
--- /dev/null
+++ b/dev-util/cucumber-wire/cucumber-wire-6.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 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 40bd1a2abae4..3e202feea77d 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,6 +1,9 @@
 DIST cutter-2.0.3.tar.gz 2720129 BLAKE2B 1fbd20c8e190e422fdc64db5a008b7a8a2b15349e9d2f7056a970e0c924bb97d5bf0f9f25d77b220a560429881120466bce1ed3aab6cf4c7ec34453b35ddec53 SHA512 892df9fb166a3160b857d2becb61689d2eca340d7c2cf1a1f81a7a6ac6c414c5205220a7282de8a2823fa8fb54b03580b376c65239d7740cb429d499a16f8924
 DIST cutter-2.0.4.tar.gz 2722604 BLAKE2B f9b670296e7e4aa1da2e665afeb0e7e4fa83517a473222a0cce03fff0858297120f619b8e1584f45f97c49ecde800242344d2b24140e9fd5a268ed1fd10d16c4 SHA512 06a5ffcd96e8afc2d947f8f45a5b6bdee3ec4b1c7edcf2cc14e0eac5922400be8f594fe579a0515869dd33b90a07b24f0d4294ad85b3f1cb247b16f8b7cf0826
+DIST cutter-2.0.5.tar.gz 2724670 BLAKE2B 67352247dd4f16c916a669f72b3fd432c9fd122df39be3af5b08d288fab1b83876dbc891df8cfcebe211a9815930855add0ede7cd86667636ebcba1a43065957 SHA512 96badcd2ea00c2b50417b7019933443831fec3a4769cf7ab66505e898d3f2c693f24bbe994ad70f66a456908e621f053a96b21a2999290dc47c4219b6c639bfd
+DIST cutter-translations-67f5c654523d22c7843811e5aa852a01742f6f12.tar.gz 719126 BLAKE2B 24c518c26a47e5eeb9d01ddbe835f9864588954e96820d562afb09f5da3352f807b7c3642d589a9ec81faaefd93fdbdf9c9f7cfc56cfd51ffe6aeaa920385913 SHA512 c2caa0e5d6cfa807cbe9117eb84b2931715e303a7d9902a6aaa58ec71b764d2ae9f0836981bd8eb9c91469b9776d93ab12b986ee068922559b5deaab28f54598
 DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 595073 BLAKE2B 4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd SHA512 11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2
 EBUILD cutter-2.0.3-r2.ebuild 1604 BLAKE2B 48509355663f74977c01d77422c9f63e74c42be24b1caf5fa2f400416bb93c14e3cf7e261f919528837244d436d116165f25d94ccd565d0604c92aeca7598a07 SHA512 2c11be9ea501988e7518d378af407122f279c6e2ee2fe04f86a867a2cfa6b39322b6803e4e318e80bd67a208c3c67fe4f91ef1b1d081ce0acc16fa2f261092e9
 EBUILD cutter-2.0.4.ebuild 1604 BLAKE2B 3678d26ef0af0764bb9c166da30f744e46cd41067082249a4d56e18a37e0e6e15b960a144f6d6021400b7041ca264d2c172411c57b214301805b6ce8c79dd312 SHA512 87f58df7f835f7a860e36ef4990d161ededc7817db355a6668ca58a042b67bd4d6a6027bf83678d64fcd5cbe9070115225eb66d6b83daceb4cabf884c833a0e8
+EBUILD cutter-2.0.5.ebuild 1604 BLAKE2B 12a110abfa051eea50d9856dc844669fe1714c428b7e8bbea5066e445875c0eda133af3b0f0ae677131a758098162c87d0c9c8d55508d2c5d41af4bb36758dce SHA512 d9453c1e4fd6602808bd8acae494a9fdd20997fbde21a21015e256ad1c0eb47ce8781276ba7ca9821db74584c967332bfc4d75c37960e0b585ba7d27c933ac8b
 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.0.5.ebuild
new file mode 100644
index 000000000000..f2b0ce29314b
--- /dev/null
+++ b/dev-util/cutter/cutter-2.0.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+TRANS_COMMIT="67f5c654523d22c7843811e5aa852a01742f6f12"
+
+inherit cmake toolchain-funcs xdg-utils python-single-r1
+
+DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
+HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
+SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rizinorg/cutter-translations/archive/${TRANS_COMMIT}.tar.gz -> cutter-translations-${TRANS_COMMIT}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=dev-util/rizin-0.3.1:=
+	graphviz? ( media-gfx/graphviz )"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	rmdir "${S}/src/translations" || die
+	mv "${WORKDIR}/cutter-translations-${TRANS_COMMIT}" \
+	   "${S}/src/translations" || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
+		-DCMAKE_C_COMPILER="$(tc-getCC)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
+		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
+		-DCUTTER_ENABLE_PYTHON=ON
+		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+		-DCUTTER_USE_BUNDLED_RIZIN=OFF
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index ddc2ebd5c296..7455bb4a8888 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1,4 +1,4 @@
 DIST cwdiff-0.4.0.tar.gz 4468 BLAKE2B 3c2310c5f57d932d46df1e53a130f4df7f8c5206689df00412507949f7e613e13dbe72b006be1d9adc7c9d630fc91303c900f17914fefa66fd9fa9a9f11f4918 SHA512 b5deda44d94bd3aa93a68da136f4170996ee02c683c38329cbc16a108e0795e86c3543759e1d7adc3d512d4dcbc416436e733341e1b4f3d96325e999e84a4fbe
-EBUILD cwdiff-0.4.0.ebuild 796 BLAKE2B 70f93a91a3b3e40a825f900c386bd55994e83392791e7e3f19198350314ef27985308cbba71a24cf6a4e196c1f73521a32ebfceef33d519c5b954ede97c63222 SHA512 6b8bdc28032612057dbbd2d52c27fd72575d2daa6d3382d386881f93517024dde8a546458c2aae5d581f37d91708b122dff57d708ee45deb6cd80e805808a0a8
-EBUILD cwdiff-9999.ebuild 796 BLAKE2B 2d436dbeeb7e54debe7f9879584be4cc3827ced77877687b3b113e1f3949e3c5e951cadc095c0196cc6c1ba9e76f4bfb8f63de5b8628bd96073079c62324f281 SHA512 dda34ea3c15f46aebbec4e8bdf45ac6de1583df26b7251912def129ca65c360742944689b18b579b45f228e27038ad8566e53ef84ddd25a0090138a42b4bb9a2
+EBUILD cwdiff-0.4.0.ebuild 746 BLAKE2B 351a34bfc7d8b5ac143a1ceceef2febbfde7334919988e96de71e918c834c5fa148074784d87c09c0244c7a279f1cdad9bf70d1377633ba59b3d9f82b24d62a5 SHA512 32c8e3b934656fced5250a1c3fd1a7266dd6e73c5fd44d1628f71a3c585967ad6e11cb5bf2b5a483ef098d65c854d5303b7661d06117378f85cc12fd91476ffa
+EBUILD cwdiff-9999.ebuild 746 BLAKE2B 351a34bfc7d8b5ac143a1ceceef2febbfde7334919988e96de71e918c834c5fa148074784d87c09c0244c7a279f1cdad9bf70d1377633ba59b3d9f82b24d62a5 SHA512 32c8e3b934656fced5250a1c3fd1a7266dd6e73c5fd44d1628f71a3c585967ad6e11cb5bf2b5a483ef098d65c854d5303b7661d06117378f85cc12fd91476ffa
 MISC metadata.xml 437 BLAKE2B 8bce3a603b784a3f22b1977c6e9db1419696d92254b2981b4029614b723e20bd215fa46b7fb6637138617706006b8e0bbb9e94f69290503e0cf2e080b908f374 SHA512 fcda920b42bce1e04a835108a422c32ebc8706345270542d0f69b0a213328288eb7d7c7bedc5437939419f07786af8dcf82aeb6ef6d1837a4029b92a905225e1
diff --git a/dev-util/cwdiff/cwdiff-0.4.0.ebuild b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
index fdf1b9afed55..8ccdb27aa51b 100644
--- a/dev-util/cwdiff/cwdiff-0.4.0.ebuild
+++ b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
@@ -18,11 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="mercurial"
 
-DEPEND="sys-apps/help2man
-	sys-apps/coreutils"
+BDEPEND="sys-apps/help2man"
 RDEPEND="
-	sys-apps/sed
-	app-shells/bash
 	app-text/wdiff
 	sys-apps/diffutils
 	mercurial? ( dev-vcs/mercurial )
diff --git a/dev-util/cwdiff/cwdiff-9999.ebuild b/dev-util/cwdiff/cwdiff-9999.ebuild
index a8184eef699d..8ccdb27aa51b 100644
--- a/dev-util/cwdiff/cwdiff-9999.ebuild
+++ b/dev-util/cwdiff/cwdiff-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
@@ -18,11 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="mercurial"
 
-DEPEND="sys-apps/help2man
-	sys-apps/coreutils"
+BDEPEND="sys-apps/help2man"
 RDEPEND="
-	sys-apps/sed
-	app-shells/bash
 	app-text/wdiff
 	sys-apps/diffutils
 	mercurial? ( dev-vcs/mercurial )
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index e0b0c34238c5..92542640750a 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,7 @@
-DIST diffoscope-190.tar.gz 2704083 BLAKE2B a2a0313f87fdb9c20b0dc696a1aea570857dd7005e0f69dc2dd139bca86a4b5711f98862b60f4d1a581bf3e0dfd38ef3be96991b96862584f289f1eb80415480 SHA512 646380d52730cf2efef57e3fa2995c7b2d5958d75597a59a24027bca1fc35c5b59dd96352faac9b7bd1d5bc053064f11760877651d52099f6b1ca0b3ad65d63c
 DIST diffoscope-197.tar.gz 2705041 BLAKE2B 1d66462d3f1cdbba177d24d194ce14ae51274c6b60139e56724213a6b4fc0b41e6a71f9f2e250ecc7d6330186bf774470b2153801b375ffb63e8390c425e1073 SHA512 d8411ad166738b29caa28abbc10f21e0906b7b19bd5ab644db36c04b1f9c5af9f4cbdb31eb850da7249380a6774bde355f0e815f4d3cdd0df76570df9df7fd0a
-DIST diffoscope-198.tar.gz 2705246 BLAKE2B c0a10fb81f320825e3112104c06adf3861b310c56fd355b6ab533b818a210b56881d7978644496ffd1f787ff98c92c851c8b21493e9c3b4897bb73c8a0c728d4 SHA512 b8620600bba8691650768879a248b10f8417c0aaa12c4f59063eb77210dc93b91a9e8b9f83bbe915932cbbb1f45ea6b8c49cb5ac62622a114fe9a411a6384277
-EBUILD diffoscope-190.ebuild 3291 BLAKE2B bc2d73c19425cb02d4594514f9ae8c53e5bf5304360cd82b9bfc338ce914d81e41f6bde68b2aa9c3137a0de1dbb6c15a0992d2808bd97b5a28189d8818bab362 SHA512 bb63244ba0a19fe88ded3a684bf3cf78f7b6519c6708f073b7d1fec1f12373beffd7398066f6f95978dfd25783e1e87fff49dab97202bbd4beef10be7568859e
+DIST diffoscope-199.tar.gz 2705444 BLAKE2B c17752a504cef75d1a9d6f1c0dfdb896abd1ce7dfd5a2494022d4a7b9e098822db80b52e3cd0d4367e28bcc9ad6316746d10cd82df2ac7c24c19d74b3ea0de5d SHA512 e4caa9d5d8d7f1671acecf2f6240cd587bbfd4087eb6e69021303ec3e7bfde15fbd409139b7658eeed64d75f05b3768f1a585640fcfee6bae63ff7d27227e4d0
+DIST diffoscope-200.tar.gz 2705536 BLAKE2B c931430a7e8159f135446709866106e4646b087c30d9d3cdf82810e8ac9273075af80d67f19858b71656d73c078478f96083c6d784a7e1bf8af5d620765cde78 SHA512 74317603e8416e2decea4d6fae9c16a5a931986a6fb8660c518e1363f99cbb523d69316be6b19f0a6168622780f4642bd901f376c3d38cfd1a600d9ac1ce1fbb
 EBUILD diffoscope-197.ebuild 3271 BLAKE2B ade3cf501f71ee523ed95a2f10f71753989edc12d8107320f389f6b05b4733c0dc7e6e886c19bd1682273f3cd5e115d770b8b06ae20e02bb096c14048bbe7a3b SHA512 cad1ff3dda20a61954833f6219ab695387cde56425009b2c781cab88950cb9f3752cbfa8e24914ad05fe3916d3b5299bb254c06cab8044d5d05abe30ac58fbe4
-EBUILD diffoscope-198.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
+EBUILD diffoscope-199.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
+EBUILD diffoscope-200.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-198.ebuild b/dev-util/diffoscope/diffoscope-199.ebuild
index ec72907f21dc..ec72907f21dc 100644
--- a/dev-util/diffoscope/diffoscope-198.ebuild
+++ b/dev-util/diffoscope/diffoscope-199.ebuild
diff --git a/dev-util/diffoscope/diffoscope-190.ebuild b/dev-util/diffoscope/diffoscope-200.ebuild
index 405700c77a18..ec72907f21dc 100644
--- a/dev-util/diffoscope/diffoscope-190.ebuild
+++ b/dev-util/diffoscope/diffoscope-200.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+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
@@ -80,31 +80,29 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 # of dev-python/python-magic: https://bugs.gentoo.org/716482
 RDEPEND+=" !dev-python/filemagic"
 
-distutils_enable_tests pytest
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
 
-python_test() {
-	local exclude=(
-		# 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
 
-		# needs triage
-		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	# 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
 
-		# needs triage
-		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
 
-		# 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
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+)
 
-		# docx2txt based falures, bug #797688
-		tests/comparators/test_docx.py::test_diff
-	)
-	epytest ${exclude[@]/#/--deselect }
-}
+distutils_enable_tests pytest
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 15fe588159ff..7899ddc982c6 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,6 @@
-DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
 DIST geany-1.37.1.tar.bz2 4689173 BLAKE2B fe17674294e314204b490d0586bc360229a95348236f48a9d25bb49b0d1face415a11e60925501f22018ad047061521258d90af55d8d250499bbf6a09b02028a SHA512 9dafaa540ba4d37ae66f3cc1c4d9670aa8ea30e74e960f0ad010dcbcd1647d1dc2eea4ae7454f589fc6ec0ded0da2de98d85fecc92d8d1ff36cd62d3255a47f4
 DIST geany-1.38.tar.bz2 4860717 BLAKE2B 3dda3a7454f96be18de95f8dfeb7a6ee2627ffe370879fa3ee7aee851e21fa46076de6b9741b6e83af94b66afa245a0f69237db4582858bc40f819d8a3c78e6e SHA512 5aff0643d0d9e667d0fb526e9c8426cb80c89decf92110683086c2a7a18e0d3d55ab514fdd68aa0c4431c98ae0c4685607b49c620525184c89e21b26fca06699
-EBUILD geany-1.36.ebuild 1661 BLAKE2B 050200ef740ec521ea5992702753d2effe2fdca33d8aa623390c9c2abb795fa3859da43c61da6c3a866adbad8fa8b03771036ee67d1ed7d59ef87e3bcbb0a9b4 SHA512 d2fdc3157b4ee473685caef1160041c2ca52b96bee490ec206710809f9047dc21fac4da83c7e4d3b82c1b1c09871f68469f9f4b10c78437d6a7fbf7e820dcdcd
 EBUILD geany-1.37.1.ebuild 1680 BLAKE2B 565a642939279f39f7ac3894da598afc08c0ec4c68535664f52c7625be8197638d2158f683617d034d32d6ba06bcaa79fff5e770bbe05df7d2c49faa1a87b30f SHA512 a44a768db04b6f1e2f94eaf6e6fc7e9391330ea85bf18741a34efff72c823f5a180d49afe92e040cc7116ecb2c3b773d902fa853fad33cf16c98584cfc5c55a9
 EBUILD geany-1.38.ebuild 1610 BLAKE2B 6abc84159775826a0e5b6ee85986fbae208b2c0a83ad3c5f711a92681b716713873f7564abb2dd4fcc929ab337e15a0a5bb9d75bd323986b38261d26aa765a6a SHA512 2d9eb564a87d1a7d797cc8f0ad580c9c4e0db548d0d30599313896628dc694e671aa6bab1189d98e4e260443890f3f7ec3dd4cfecf0238920495e01c09d8595f
 EBUILD geany-9999.ebuild 1610 BLAKE2B 6abc84159775826a0e5b6ee85986fbae208b2c0a83ad3c5f711a92681b716713873f7564abb2dd4fcc929ab337e15a0a5bb9d75bd323986b38261d26aa765a6a SHA512 2d9eb564a87d1a7d797cc8f0ad580c9c4e0db548d0d30599313896628dc694e671aa6bab1189d98e4e260443890f3f7ec3dd4cfecf0238920495e01c09d8595f
-MISC metadata.xml 2033 BLAKE2B 1e4e6b279c25d089da60902117b40cf6aa937c7d24c90ab4cdcc2c9c1b3b3fa053fb6545ec558c41e1f824fd1b18497f4d2aa020f7e39ffa3bbdba77a8403bea SHA512 2787bfde6a370fd7bf22267e6e0442b8045d4a9bb36b7c8145dc318ab0cacf1dd18d22169aff202f8371efdc9b9d8e273a12e74c1e230f2a126165df3df318c6
+MISC metadata.xml 1979 BLAKE2B f8c9b0a93b7f1aa26aa05d36db0dcd8b77e1ae4472b571a58cf5696866ba27a99bc753bb902b3476f662944d356556132ae3ad15fb947cfb7205153510c819e2 SHA512 04345509acf04bc36dd74ae2fae602c17021374379fe64656059aaaba0482d0ce1da8f3a7e7e5966433aed44cea7e992f4c723c8da0c773887519b28efc93c18
diff --git a/dev-util/geany/geany-1.36.ebuild b/dev-util/geany/geany-1.36.ebuild
deleted file mode 100644
index 9cdbe20aaad9..000000000000
--- a/dev-util/geany/geany-1.36.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit strip-linguas xdg
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	[[ "${PV}" == *_pre* ]] && inherit autotools
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="+gtk3 +vte"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	xdg_src_prepare #588570
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-pdf-docs
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
index cb6f12f8b099..01d4f7248752 100644
--- a/dev-util/geany/metadata.xml
+++ b/dev-util/geany/metadata.xml
@@ -36,7 +36,6 @@
 	</longdescription>
 	<use>
 		<flag name="gtk2">Use GTK+2 instead of GTK+3</flag>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/icemon/Manifest b/dev-util/icemon/Manifest
index 88d1f0be6cb3..2f4d283b5bba 100644
--- a/dev-util/icemon/Manifest
+++ b/dev-util/icemon/Manifest
@@ -1,5 +1,3 @@
-DIST icemon-3.1.0.tar.gz 111139 BLAKE2B b37f17a34237e76cd3f7aaad88de903d1a3ac4aec9478613dbfbaab950eac36af33f49b97330a7c7d0ca06ab9bc56d25960142f7149a198acc2c5d35b32faf09 SHA512 43b5c959cd66fa65cac25994e5b8f26646b49b57405bd80d6ddb12cc7ed5bfeb5f91f5816900883078075685c25159f5a19b3198594027b3a1b8b0c489237b39
 DIST icemon-3.3.tar.xz 95308 BLAKE2B e387bccd4361ddcf852ad07207ff9007cd70c16ab6bfda3d4a4a4a620a826bd4969d95613aeaa51f1977f4fe00068e3deca90b31e3bc963795c6461f4a14e2d1 SHA512 326e28959b9f3c9223dec38507414ca44b99cdb52282da27d1f3f96305d9f7e595eb1b9949021957f1b21d5b95811c8de2d9f33a78bc985616f7001bb20eb81d
-EBUILD icemon-3.1.0.ebuild 683 BLAKE2B 049ad4d9b302a93263225cf8d7ce177fa821bd146e64a82d4d59792c4f3ec7af539b74c7be976e9ae9cacd9ac22005ccfbb72a331aae2632ba6490891b24873d SHA512 dd6c787bf92df7fb1028478882e2c3ca6603fae7dbce35bd3a952122e155607f1928f106b88c4d4398df2432b91df664086b01c56aabc8013aebab79d1f0d934
 EBUILD icemon-3.3.ebuild 708 BLAKE2B 2ca86d2d375bc15e7b830ab54ec98091122b2df02a8d67113fbf1243dbeff45b3ec8d9df4c12650718c2455fa3aa1f7882ffeb3c83ecb39f655354e1dff7edf7 SHA512 f73e2d02317020f455df69157095c9754ed6277bef12850ed6ec0a83d0f1367758830781c57f95fd16775853daefa36bce1e65abc6720b0e9fc59117d95dd0b9
 MISC metadata.xml 254 BLAKE2B d6008c0af75d2c59696336153c1fbf23e23bb091b3786644f333d4c0bb9e43c13041ef756532814f203054bead254e98ee24c4e04b053a84e51c18e8714ec84c SHA512 49ac9b7f3e1a9e805c65e2288af69d49c40246ccd58241740afb44593e73c26fa89772185d6b6693db2778e14f5b493169f8b2def93e2d6bdde44cf3b5d66244
diff --git a/dev-util/icemon/icemon-3.1.0.ebuild b/dev-util/icemon/icemon-3.1.0.ebuild
deleted file mode 100644
index bdf10ab714f8..000000000000
--- a/dev-util/icemon/icemon-3.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Monitor program for use with Icecream compile clusters based on KDE Frameworks"
-HOMEPAGE="https://en.opensuse.org/Icecream https://github.com/icecc/icemon"
-SRC_URI="https://github.com/icecc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	sys-devel/icecream
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 8300280ddddf..96e9b9add8b5 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,7 +3,11 @@ AUX jenkins-bin-r2.logrotate 479 BLAKE2B ccfe2179a1c3a5a49140373bb594fd4fd2c40ed
 AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 DIST jenkins-bin-2.319.1.war 72247484 BLAKE2B 097ad49049b4594cdab00ed0a4a562e6e83177ce98284e822127adea10c33860217bf703cce5409f1239f3fbad166ed5f7f1df3f36438ec914ce4569e22898d7 SHA512 d38fe6566a1b07cef2c2451fe204656fde2a64da0e56eb06083c16ea23716ea285b77979cbee15e7dbf94a5b9b0bd5f867f6ce89e36b6f3d136571bd76f560c3
+DIST jenkins-bin-2.319.2.war 72248203 BLAKE2B 6271e7b4de8284681911c81ccf48d23b63ae89e65f1b339e4e6380b204e24b7dbe7278b2e70a2bbc6b33e0e6cae0c9d270534f247de4d8e58384feef7363d19d SHA512 f6f0846d9e032b48e85fc20a030baa2d5c500a65c6c909d00852be3324d1b79c31ea8b7ff45ac05299ff9797b17aeb61d094ad425ce5198f6e13aa050007e650
 DIST jenkins-bin-2.323.war 73557779 BLAKE2B 110336c140ded983e0b01b34ea15acb4a65d1eb6aae078b6ba1ec602d9fcc28c12bccbe90fa87cff3b31d6f835f133ea76f2b15dbe96d39b8c2dc241cd52af0c SHA512 08a72d4cb5558d3ad65845a615d5465cb24e24bdd294d2c52b36c4871a968bde72c0dd67814e7301873aa4a19b4dde14835115508678f5d8356ca262c332b819
+DIST jenkins-bin-2.330.war 73751018 BLAKE2B ca8a37f1963fa06cf18c118089a8f07f6c4e90fcbb338eb141fea82a09cfd3a842f14535d029dd24cc1d1371b4c862cd0d65581a11ee00c0dbb46f3a4119dcc9 SHA512 ad165f59e16a1fee2f65d4878a767754771085b405e9f553690998c23a6887e2acd998e3e138af146f7e1f840367a67a13ca5df454755f304d2a5d5f248fcb93
 EBUILD jenkins-bin-2.319.1.ebuild 1124 BLAKE2B e01505e9ccb32d5a5ca2dfeaadca40c4ccdf9e474da6b7de505203630b04d2bb05ce364aa2f3f17c2cc13bb2b698cef313f28e133f04158aa2a7978d95cb3d21 SHA512 990ce61b6e8a85e2f1a8dd546af90811999fd168c8fd3012f692f06b4b3245d1023da258e27dfe1aa35d2b74d1920fd53dba4b755840542c0b872683a8311e98
+EBUILD jenkins-bin-2.319.2.ebuild 1124 BLAKE2B 8f911bdf35ede2171671b0a926da56ad012bd9d4eea6a91a37c1c90b9bd69d5997a04b28073806fb4cc97bc79053ee1d8df36834871dd4fde0c95bae9160a8ed SHA512 f9cba320883ce0da2b5840a487ca6e0d2fa8b0bc61dab6e94a0edc9c5c753e2059b10e46513c8cf4041f65923da113836c7eeb5370ce9e8a42233770249d7e9b
 EBUILD jenkins-bin-2.323.ebuild 1117 BLAKE2B 3362086945f3b5eee4fcc66ac21fc75b5812912b8aeb1e1e137b5ea9729fa3d4bd748dd4d0ca8f69bf6d82d829e8fd32f28856ed329f8642e7bc4277a3303d66 SHA512 99d2509501dab25b6de95ae9a9accd40517a8ebae66bc7da246d0a81ad0c7782ed7aebc179b32e14f9c6932a73f5dae1d971de0a74a02b3c76c27ea8c5ee428a
+EBUILD jenkins-bin-2.330.ebuild 1117 BLAKE2B 2e124af6b9c70ec8c8157f020ca2e3bd4b9e9184400706fdf14230613be6497cb812ce366ef7fb03df827d696273ff045176d6ce1fdd3236afab7c46c83d2858 SHA512 e3f96fade1ca640425bc875b2001fb8477678e89a5321ee673388f1a4f7bbc270a53a7350c0d34273b00a36c00b13c4dd1b67e5d95ef4970e904541a3d16fb49
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.319.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.319.2.ebuild
new file mode 100644
index 000000000000..28d95fcf653b
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.319.2.ebuild
@@ -0,0 +1,45 @@
+# 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: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/jenkins-bin/jenkins-bin-2.330.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.330.ebuild
new file mode 100644
index 000000000000..78fde83d5d56
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.330.ebuild
@@ -0,0 +1,45 @@
+# 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/libabigail/Manifest b/dev-util/libabigail/Manifest
index d89e195c184c..cdac49b05e03 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,7 +1,5 @@
-DIST libabigail-1.6.tar.gz 176133766 BLAKE2B 4a8fd6861f2213f45bbc5814a8a4e0941c236660ea6f84f09eedf6c08eff963c956f27967581501cd73b51057c3d36a74d53b6bf63d0be4d2c931d465d0564eb SHA512 2ba775bd836b53265dae60e66065fc2106e7f633e890cc70b6abacb8426e04ec0b7b38593c21336f5785cf5e4eb8d110fb15ce63124cddc59f660f31c7b25b3c
 DIST libabigail-1.8.2.tar.gz 258919334 BLAKE2B 6e06c888dcc3f5e0fc5d4046e69f14ba06b3a78206f89e32e4687b07aae1e1d798582285cff5ac9f43d6ba326fe11ec11552eefb5ed05813c25785e337092ba2 SHA512 fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d
 DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180
-EBUILD libabigail-1.6.ebuild 1505 BLAKE2B eaf813c7f56b0d703e03ae350885ed6beb54fa7dd08bc62eb58c7b935d4d4a9857f7c8f0e130ee74334bb52c1f967e334d835922ea52569f435df5857276adbf SHA512 5b6db24c5a22f369675f0a1e308ad42b4e79940a8e632503c28f43c528051227a2cb808e050c2cc5918fc519002bedcabb3f8a745bc7c3a125596650a57b84d4
 EBUILD libabigail-1.8.2.ebuild 1513 BLAKE2B e54abef6af668ccc017e137c8e592f6371f9348667d06c0aa332a327ac322308c6e4b3ef02ead3c7afef2dc5b5ca1f4c422db54ce65a46d85ee26c56ccf0b706 SHA512 6efb448acfd4f8c201f0fbd3c3aa5c49d8fce8aafa1dd366e32f9205aa10cacf6ccbb316f1faabce30179cde75ac9146c067e226218f84734c3e743a79fd65c1
-EBUILD libabigail-2.0.ebuild 1530 BLAKE2B 7e51e66029da59d810fc059e03b583d0886dbeb10db26b114f893ff640e7a5917e34e8b2af43edd08b8e320c084f3cf2445d20e5122a0889b362efe959df4162 SHA512 5b5743b028ba720afb32935ae3540352efa755c208cc1cb3a8b4496b749fd1e0a52b61c4cff81148cf19d1011b8ca8a685bddece3db5524b9b3ddb4f0d47f419
+EBUILD libabigail-2.0.ebuild 1529 BLAKE2B fddae7227ddbb54970363206f2728a346d537e1eabeadafc481d57636567e825a9e93c4820fb91e55e04d8a527a0b4cb0f18b42708dbd34c0adfd79104e56c73 SHA512 2e5f556c1eb020358dda35a5a4e5efe238f0b09e36105115ec6208050ad945230e9ea02c69476f9012d18c169fd1575bc324b3397f89bed36631117bf7f996d1
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/dev-util/libabigail/libabigail-1.6.ebuild b/dev-util/libabigail/libabigail-1.6.ebuild
deleted file mode 100644
index 639ff46eaed0..000000000000
--- a/dev-util/libabigail/libabigail-1.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools python-any-r1 out-of-source
-
-DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
-HOMEPAGE="https://sourceware.org/libabigail/"
-SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils:=
-	dev-libs/libxml2:2="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	test? ( ${PYTHON_DEPS} )"
-
-src_prepare() {
-	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
-}
-
-my_src_configure() {
-	econf \
-		--disable-deb \
-		--disable-fedabipkgdiff \
-		--disable-rpm \
-		--disable-static \
-		--disable-zip-archive \
-		--enable-bash-completion \
-		--enable-cxx11 \
-		--enable-python3 \
-		$(use_enable doc apidoc) \
-		$(use_enable doc manual)
-}
-
-my_src_compile() {
-	default
-	use doc && emake doc
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		doman doc/manuals/man/*
-		doinfo doc/manuals/texinfo/abigail.info
-
-		dodoc -r doc/manuals/html
-
-		docinto html/api
-		dodoc -r doc/api/html/.
-	fi
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/libabigail/libabigail-2.0.ebuild b/dev-util/libabigail/libabigail-2.0.ebuild
index d86f54a804e7..61ac2094d397 100644
--- a/dev-util/libabigail/libabigail-2.0.ebuild
+++ b/dev-util/libabigail/libabigail-2.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=7
@@ -13,7 +13,7 @@ SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 802ebfe4ca2a..66450740e03e 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
+DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
 EBUILD lldb-11.1.0.ebuild 2305 BLAKE2B 5db45d0360ca8cbcfb1e15989d183b8583edd437bc39c1a5e15e5c969b646340dddc2b94b4e34bc843df26887421c376bb15f9ecb3321e7da05dcf23c9030855 SHA512 f63c15a9a12ee7d2bd343dae7b18cb5b0ab77477d35e051e81974c73f51d6887afab14a4dd1d593fe10a6ee5b88cb407c98019d658839b5c22565b123cfd7d90
 EBUILD lldb-12.0.1.ebuild 2443 BLAKE2B dd155b7715cd38eebf62d14c139bb0030db953a2f4f14f3c4779f64e70ccfd3c3f64067ffdad3ee407388f69cb6733420197facefcd25297b0f2111d1912044e SHA512 dca2e443a146b1baa60565eaf5a5cc86cb8deb9b9b10594ddbfcc356e62f67f99dd4ba769817c008c753a5ad854e0fb04e96f00c6e3e081bdf6faf3091291689
 EBUILD lldb-13.0.0.ebuild 2587 BLAKE2B 916ff9a21b0fb99086f4f4039f227481adc63c41c3c480a319da7f1896d8a970d16b3bf813516b0ee3a56316182ff6cc4e61da1f391253d6d3be51c2c5fab367 SHA512 18955a92513b72d3e7fe83d9ad720d650cb2e084af9896c01e3828e19b74c5e2ba7fd523197b70eb190074399f9ce6ccb9d570b1d5ed15212996e9c61b673ab2
 EBUILD lldb-13.0.1.9999.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
 EBUILD lldb-13.0.1_rc1.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
+EBUILD lldb-13.0.1_rc2.ebuild 2568 BLAKE2B dda55f6985409392b8d3e4334e1e44285ccd50e1fc979a3f9ea373c2ef12f3c2d0b49f246ea06713dae9ef532a1c67e5f7f81cf26bd7b90c222cba8d7f5158db SHA512 11cba2782f484d8aa4f43826b8fe953339290f822f1a1315bad1b50d8cf5b7a0188f02c8fa7d4c9f98e9ffa7a93da82edf39345b6fca98988dc0b0fc8f06162a
 EBUILD lldb-14.0.0.9999.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-util/lldb/lldb-13.0.1_rc2.ebuild b/dev-util/lldb/lldb-13.0.1_rc2.ebuild
new file mode 100644
index 000000000000..8e5622759466
--- /dev/null
+++ b/dev-util/lldb/lldb-13.0.1_rc2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +libedit lzma ncurses +python test +xml"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 46957e10c344..9027494a3c1f 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -8,7 +8,6 @@ DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
-DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
 DIST anyhow-1.0.52.crate 44224 BLAKE2B 79d68d3390d27e0e27f9db784ad10b5d7845dec7949fbc722f944ef3988419acd72c509b44a4544e99bea5e57407da5b1ce40a96277d307fc408c958ea915c31 SHA512 b87e0b304daff85894c34060b97379d8e3d9be03078275313035c7142c76b3e59922b25924ac98a0b1b70fc98746eb174ca4b7ef33a26e115f294c1f1200aa6a
 DIST async-io-1.6.0.crate 32282 BLAKE2B fdd46328b23d58058d4501f6a30e396302c36f9a8f91276e6b50b9ddd628a63b8af22e35b5efb4c7cd91cc6c823ffa2ecc492da525c1139f30c02004f0a5b0a7 SHA512 0451c6d53da593bc1753ab56c043d855d2642de5679265970ade0c63cef09268ac5b133100230637bf16506f475e322ffea2c85f8eaa3788a0bbe24ff7e671f5
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -139,7 +138,6 @@ DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02
 DIST keyring-0.10.1.crate 20169 BLAKE2B 0509c3a512124e08cced67c227373a3817f70c78e065f2d391609b4801905fd774e7524688470a5c9eee23cf64e0158f8ffef545d25a88859df76f37c29c416d SHA512 a133d3908906d7b48c2986eba7525018bcf52d9e0690a2b1342580f9d4b9ab5165b800a853c57d7a7f41fca26487fd42b01eb7b75f5c4f0b623fb9f564ffd011
 DIST keyring-1.0.0.crate 28990 BLAKE2B 2309a9d3cce6053d0496dc6699e23ab5947a62fadd48d2ad943b7271c1cc78962ec53d7d674e175944e9a21f9a8b15cb947ed215376baf466e3c56a6ecc0b657 SHA512 988aa67d9fbec41a0704ed611a64bf93fbf38ee5ba02299f0fa0ebcb7794f4003b3b1161e4ff4da9f2d71a83706352e12a5759aad099e355435b82fca0342bc5
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lddtree-0.1.4.crate 10607 BLAKE2B 53e17406af76c116bb23efa6a169f116d6fd55d3a2c5feb4e649014146fca882d1a31b55d5f965fec4dd68cad71d899403735b3821f2496c3b9f7a4e07dd8269 SHA512 2a82b7a16ce74d0663018ddfb1b5972b4df9fe9eb70b4525f5b6901b8b1c08b9388780f802757a610de0a0fdb730ce443de05e633547aedd179b5d6118216471
 DIST lddtree-0.2.4.crate 11267 BLAKE2B 93e3f9e1b4c1acf0bc8f80435d3da5b6bac2f2c13bf8ce2b5f800e684ca44d801869557d97d6cfa9c17f9ee698253bc1a49bca88c835b9e7c0de72d5160fc4a7 SHA512 9f063109dc2a5791b517c237ce803c53088d9944748c51da8ccb3493d82a51c7a0e3cdf02df10318a67f741866991c8a32da83dd9b03d6c3dacc0f3d4424e6ff
 DIST libc-0.2.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
 DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
@@ -152,13 +150,11 @@ DIST mailparse-0.13.6.crate 34804 BLAKE2B d3e88b5ef7d97e06f0b75cf14f2134c5dbc951
 DIST mailparse-0.13.7.crate 34737 BLAKE2B 33ce9844ac364c80c57973e6afe09953f3e73385d5fefc390e42d6018c91a55a25b92bed1df9ec7e3f08fa822368dee8f88c35cafa3a8c5d2936477040c00599 SHA512 00c7e418c3625b7220a677e76589ce7d00d0873d28461716a30d34e2e92f67dee75a64c2fd53b916993240c82c5741fc27ec1d074f80f8d044e6626ecca39f12
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maturin-0.11.5.tar.gz 584266 BLAKE2B be92b8b3f94e7b5e5225a57118219cb854ea072a03b92b5811a135f54c634b89dd52c3c6bb50be539b7578e3748a34fdf4552bb46544500b061743c7dbd92ba0 SHA512 31c32849fe424393351c6f895eaf76852647fcd6b5bf77d1244147315c4e730762c03d49d898bc76805dcd0a6ed8004e8eaf26a2f78af2228f8cfd3cb2201c7b
-DIST maturin-0.12.5.tar.gz 276468 BLAKE2B d04c65a017ad42659d7321143a11630b65a9064a3a11119ccef21c57f56a46fe2db6846b500a2004b8878b788df9e43b010502563fe3d21a6dde5c81a5225dff SHA512 1db5cdeae9e8e7bf1ef5aa7b6ce9ad1030e86ecd21e0e5b7b263e0f0a850bc559f26dbb58fee902c3f297d0e445c67cbf35a2a390ad2c27a271491083a4a8114
 DIST maturin-0.12.6.tar.gz 277779 BLAKE2B cce62dbeca01ed5fb049f9256d2c8d3b04a98bf64e440b0d75c67b8df769fffa047c9891ca7e7717a2b5862ff87025eade7b4c011e54ac6968f59595c89f7064 SHA512 ebb1810567147a6732f6ecf513b2227bc4023c8e524a5bce966da8e96224a6583da8122a09f69667daa4248c5e5ec138c31e499bb321e3f1b0570aebda8ad87a
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
 DIST minijinja-0.10.0.crate 85261 BLAKE2B c10fd8d83d9f078673be99beacb73999ec39da20bb06accda17685475bf718ee675b020bf72704e2c34073ee49247cf1f0a7acb88b8cdebc9e5c278f196f93be SHA512 f7bc4f703f621de08e9cb648a8dd5a4767e70c496bcede4ea299827390af60f37b4a48c054f53b93b601c8c48839dc3bff77532596339820ae99ae867051a9a0
-DIST minijinja-0.8.2.crate 81246 BLAKE2B f27856d9a242ad09b453e2cf620dfecdd3090383c46dd1c9fa46791343b6a69a2b4de16ca8933686c081e7150ad3d033712ab4c4025fd426592dcc522a5ee9e2 SHA512 7f28ffd1ba5f7e5c6986657668c1f0c6d4b31aa93bff614ef505c4ffdf8ab5bb5eb0f12fe91d81b7db7ad2f7d01ca0ffb713bc89efbd3b54f18335e224eb561f
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST mio-0.7.13.crate 87027 BLAKE2B fa1b8287981c3a96c0b6f29de221241d12bbda1c19a95e315f5e026e130e2bff6199774524d5c178718bba47710cc50dc632e942a590f5d5af598e4d59fad269 SHA512 3f9adb95db494dd39041ec1abda0d476b308296024347f28bfaf5883d7896ee052edda026c25a9ccea9a31cbc5431d95c0e13948e90fc8ca7b1a91a19748a45c
 DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
@@ -198,7 +194,6 @@ DIST platform-info-0.1.0.crate 11170 BLAKE2B 5cd76a9170efa332d17fa4b1a58bdafa533
 DIST platform-info-0.2.0.crate 11571 BLAKE2B 4cb4f50d878175e080144f6d96b3ee3f53a49c1c889e96a9fc45595518db45c46e4f24d491dec20ea27b336942023118ed0a8bf01a17e1d2d6cb5218825c86db SHA512 9420f1fdde9e3b47720c312eea5056970c38422829a5768cb280dcb876f12c631e5a64b73a0f4120732a823fa75abcb3a45c117777e453b48b2e47659d378f62
 DIST polling-2.2.0.crate 21616 BLAKE2B b431e4d31a677ee3d0d36710b27fe98b5df11bd37ac1dfdc464b8a0864dee56985125be388afe9f4c5f8e8c556f668578b2566a6de85f0797d6ecce285d42953 SHA512 6592682d6abf61341e18e5b7e6aedccc31de36016c323ee4e01ca4247d5a40be14f9f60e0602f828ce6ed55e29daa3e601e62a1d472a7ab3a75d760fb1fbd99b
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
-DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST pretty_env_logger-0.4.0.crate 8690 BLAKE2B bd6cff07f3a9ad860378cd0bc7d44c1fe9ea346aba2970adfc1f23e6fbd3613f11cf8fb19a401f006ea69e8f05f687636d0ef870c25ccdc97c8b60505e2e0447 SHA512 770de8e256cedfb21fc89cc1ecc564ae1a8e67263705b4234b91867996c4db77ec703b70a46aef6b018c6ce09aab6a232fd1eedf8324c39f119a6807daa534f9
 DIST proc-macro-crate-0.1.5.crate 8096 BLAKE2B 0a992f7aecf05335008731adc40e8ce6c4ef5e114228b51ea856112f850a24e995e4682c8d2ffbc703b9b5cfddad68342cc9d0f7d13b13a96961287bdc22c4a0 SHA512 b2922ea8beb762f42f7646398eff9d03a5fe3d942f1d0cce564eff8af41ed14f175986d07ac5bab75e7634f964b8ad24a6f05f597c90b83761bb4c1d2b2fed59
@@ -210,7 +205,6 @@ DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed
 DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
 DIST proc-macro2-1.0.30.crate 39155 BLAKE2B dd0ec47a3a54fed6cb3b03e5edb5c3e065e5644f631560595eaca028926f283ae20b3e9fe699b0b968e00d3bec6ec95437be2693ccdf22f1524dd5e4ba3f7886 SHA512 d07ddc18dcfcc163bd243c22ffa4735bc300f304c7e70bfa7caba91047b1313bfe1f18aa4707a65a40fa18115c4b32c57b23699f9a4d9b4a09fec3c8aafb1d34
 DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
-DIST proc-macro2-1.0.34.crate 41072 BLAKE2B 6b507e95802fd8dfca422deace25e328b1e4c5a9515c83ae55f8a34b1c1d34ce427afea7d7a748f582abf903245ed8c2b3f4175d78c8c9dc9f467c9805329d47 SHA512 960036a077c3869386ecb5c2019816adc70e9a9b32ceeacd4b14b39a91dbffe0b21764ead7237ab3aa553b26cb6732bbeccacbaf83c8dca9069b11b9a85dd1f8
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST pyo3-0.14.5.crate 330805 BLAKE2B 6ab0b487da4986a91c4360b2f5783fe77514d99ab79aa4fac18c4889e1f0077cf3d58ada0762d96c1cb7c93a6f2f0ebbe852ea881a23b1b5b39f6b974cc965b7 SHA512 050cf757cf3d07dad46af1bfb0a0fc4b4b7ef677af15d2119ef3eb83cf0bcaa02540c7e5c04a0c0653813e6041221754d3af6b6ac6041e9287fb9d50121c5b35
 DIST pyo3-0.15.1.crate 370722 BLAKE2B b755c93d8dca8e778b886ed1d16e83ddca483d0f6c932b3241edb2e1211306cb0257d2a6bc31ba4298335f277898e59aad67e9f675ed4ad9a2bb9d596400bda3 SHA512 9168911db76f2c9629615c997accfc4234bf91cc72293dcdb3db14b4e93f93af9df3b3aa7900384121719aeda4a0b6dd68c0cb380bfe5424724b0be5303c02e6
@@ -242,7 +236,6 @@ DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST reqwest-0.11.5.crate 136526 BLAKE2B 23ed54d3bd88a1c545727283b1090ef2eb8806537cd1f0e584fb899b9db1c0850d25a471ac57f92dea464e121879c28f199774b1400616ab877e147a4bfb9d09 SHA512 59f624e7018fbbd9eb47b448356178196d315792e2418428ea1371a3c2b87417be4aa27d3c75e992bac525cbe95976a6ff481fd2a7661d56aaad3a8c3052cf84
-DIST reqwest-0.11.7.crate 139871 BLAKE2B 6120cf1c7419d373a6efe6f4b12714ca5eeb06b27c561c4d4420825ed4f839effb934aed0cce0f6361ed135662e1cea02944cb0d727d2102206a149d964ac38c SHA512 fee86d3ebc2d954e24faec1e7f42514395b106fbca689e5e5f3a9f9689e8f0024a5bc602095483353fba9b4c50b5e85a9141b59e1fd189bd8badc0ce2a31d0b2
 DIST reqwest-0.11.8.crate 139821 BLAKE2B 971d05cdd3f3742bf40fd015a6e193e6150e7cf41c2f7554390c597a665affc1db3ad2893cd665844bcd01eeedc6f3468ca6b6a4f73e273ebd0e06ab789dc005 SHA512 77b06eaa5667a620dca0134aa80b79a5f7516c6ee4e49e56c8d3ace747a8b498bd2812dccdda5cb74904122eee9d2d488c920533dd5d97949e36814c3be7c2c4
 DIST rfc2047-decoder-0.1.2.crate 6023 BLAKE2B 75d98aadeaed734cca80e21fe8d94e8a4a87f6eabc7cfee63052c51d257058f5589d87c757d2e40f223ef8c4bdd6f5c8335160f67e8f5367b80807ca8c7486c3 SHA512 302893aba05b32dc8262fa9b034fee2f760a09f7af860f99e2e5463bb7f3ee8f9b984d8f9b41b0acbd0703b38373ed7722923b85dee766d7c5f25571b2d842e6
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
@@ -368,6 +361,5 @@ DIST zip-0.5.13.crate 48237 BLAKE2B 0ffd9c41535f3e49d091b831925e8b639f3128702dea
 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.11.5-r1.ebuild 6045 BLAKE2B 1f068b117019c68821bb6b2a24bee8b0d5f9330424571855257d145f79f48b01cc496ee2a99dc50a54d37be036658819b7845dba7e3ef2d1ef027a0772ced545 SHA512 55dad40584fec96a1b48cd397ae50069319e669707946ad2564c9dd6071d3fa4dfc45a942fe34375906e2163800645b88b5797a0bbf2b00357bad41517499802
-EBUILD maturin-0.12.5.ebuild 6918 BLAKE2B ea38ae3ae6a13257329a0da37f9af4f01a381730b58bad886d754a22f91c90c1f5f4e51330aec690f52e4c3899ab2b0536ac9493554e186bd74005c4529ddf41 SHA512 3d7216d776ab655872df2af3a42499023deb285355ca7fdd51689f342da5f76d5dfc5646163603954f8b38b463028c94d1432936f0a5adfd41d170ed79cdcbed
 EBUILD maturin-0.12.6.ebuild 6901 BLAKE2B 7cd2f8636d45ba03e286a535c12d2ca54d98d629e61582b1e8585e297528a94990189bcd320715ef8cf58bf1d0c716c1e325d74bc4871413fcfaa34ef1a891ee SHA512 31cd60bd70590794e00e337b2c32324d1721603bc7ab6c89213432310538aeee6fb824e462abfa971a62ad1aebfd1cc51ecbe1c1ee08ae59fdc458e4a2bdaac2
 MISC metadata.xml 536 BLAKE2B a94fef48d69a1f23ab4cb0c676c47c8b3b3337f78f2095384e9ef73fcf04a9c117766b633cca82c8bde782e70051a944d7508863e36e69f821de7399ea4afab8 SHA512 b66a31403684e70656c7cc25cb0654ac04e4e5c79f822ef3c4ae8aa9ff44fbd13914a90290c922e98c2e55e90a06f9250b93d71fdab51a7d2a727c33d872f247
diff --git a/dev-util/maturin/maturin-0.12.5.ebuild b/dev-util/maturin/maturin-0.12.5.ebuild
deleted file mode 100644
index 2cd0ac1e77cb..000000000000
--- a/dev-util/maturin/maturin-0.12.5.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.17.0
-	adler-1.0.2
-	aes-0.6.0
-	aes-soft-0.6.4
-	aesni-0.10.0
-	aho-corasick-0.7.18
-	ansi_term-0.12.1
-	anyhow-1.0.51
-	async-io-1.6.0
-	atty-0.2.14
-	autocfg-1.0.1
-	backtrace-0.3.63
-	base64-0.13.0
-	bitflags-1.3.2
-	block-buffer-0.10.0
-	block-buffer-0.9.0
-	block-modes-0.7.0
-	block-padding-0.2.1
-	bstr-0.2.17
-	bumpalo-3.8.0
-	byteorder-1.4.3
-	bytes-1.1.0
-	bytesize-1.1.0
-	bzip2-0.4.3
-	bzip2-sys-0.1.11+1.0.8
-	cache-padded-1.2.0
-	camino-1.0.5
-	cargo-platform-0.1.2
-	cargo_metadata-0.14.1
-	cbindgen-0.20.0
-	cc-1.0.72
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	charset-0.1.3
-	cipher-0.2.5
-	clap-2.34.0
-	concurrent-queue-1.2.2
-	configparser-3.0.0
-	console-0.15.0
-	core-foundation-0.9.2
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.1
-	crc32fast-1.3.0
-	crossbeam-utils-0.8.5
-	crypto-common-0.1.1
-	crypto-mac-0.10.1
-	derivative-2.2.0
-	dialoguer-0.9.0
-	digest-0.10.1
-	digest-0.9.0
-	dirs-4.0.0
-	dirs-sys-0.3.6
-	encode_unicode-0.3.6
-	encoding_rs-0.8.30
-	enumflags2-0.6.4
-	enumflags2_derive-0.6.4
-	env_logger-0.7.1
-	fastrand-1.6.0
-	fat-macho-0.4.4
-	filetime-0.2.15
-	flate2-1.0.22
-	fnv-1.0.7
-	form_urlencoded-1.0.1
-	fs-err-2.6.0
-	futures-0.3.19
-	futures-channel-0.3.19
-	futures-core-0.3.19
-	futures-executor-0.3.19
-	futures-io-0.3.19
-	futures-lite-1.12.0
-	futures-macro-0.3.19
-	futures-sink-0.3.19
-	futures-task-0.3.19
-	futures-util-0.3.19
-	generic-array-0.14.4
-	getrandom-0.2.3
-	gimli-0.26.1
-	glob-0.3.0
-	globset-0.4.8
-	goblin-0.4.3
-	h2-0.3.9
-	hashbrown-0.11.2
-	heck-0.3.3
-	hermit-abi-0.1.19
-	hkdf-0.10.0
-	hmac-0.10.1
-	http-0.2.5
-	http-body-0.4.4
-	httparse-1.5.1
-	httpdate-1.0.2
-	human-panic-1.0.3
-	humantime-1.3.0
-	hyper-0.14.16
-	hyper-rustls-0.23.0
-	idna-0.2.3
-	ignore-0.4.18
-	indexmap-1.7.0
-	indoc-1.0.3
-	instant-0.1.12
-	ipnet-2.3.1
-	itoa-0.4.8
-	itoa-1.0.1
-	js-sys-0.3.55
-	keyring-1.0.0
-	lazy_static-1.4.0
-	lddtree-0.1.4
-	libc-0.2.112
-	log-0.4.14
-	mailparse-0.13.7
-	matches-0.1.9
-	memchr-2.4.1
-	mime-0.3.16
-	mime_guess-2.0.3
-	minijinja-0.8.2
-	miniz_oxide-0.4.4
-	mio-0.7.14
-	miow-0.3.7
-	nb-connect-1.2.0
-	nix-0.17.0
-	ntapi-0.3.6
-	num-0.3.1
-	num-bigint-0.3.3
-	num-complex-0.3.1
-	num-integer-0.1.44
-	num-iter-0.1.42
-	num-rational-0.3.2
-	num-traits-0.2.14
-	num_cpus-1.13.0
-	object-0.27.1
-	once_cell-1.9.0
-	opaque-debug-0.3.0
-	os_type-2.4.0
-	parking-2.0.0
-	percent-encoding-2.1.0
-	pin-project-lite-0.2.7
-	pin-utils-0.1.0
-	pkg-config-0.3.24
-	plain-0.2.3
-	platform-info-0.2.0
-	polling-2.2.0
-	ppv-lite86-0.2.15
-	pretty_env_logger-0.4.0
-	proc-macro-crate-0.1.5
-	proc-macro-crate-1.1.0
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.34
-	pyproject-toml-0.3.1
-	python-pkginfo-0.5.0
-	quick-error-1.2.3
-	quote-1.0.10
-	quoted_printable-0.4.5
-	rand-0.8.4
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	rand_hc-0.3.1
-	redox_syscall-0.2.10
-	redox_users-0.4.0
-	regex-1.5.4
-	regex-syntax-0.6.25
-	remove_dir_all-0.5.3
-	reqwest-0.11.7
-	rfc2047-decoder-0.1.2
-	ring-0.16.20
-	rpassword-5.0.1
-	rustc-demangle-0.1.21
-	rustls-0.20.2
-	rustls-pemfile-0.2.1
-	ryu-1.0.9
-	same-file-1.0.6
-	scoped-tls-1.0.0
-	scroll-0.10.2
-	scroll_derive-0.10.5
-	sct-0.7.0
-	secret-service-2.0.1
-	security-framework-2.4.2
-	security-framework-sys-2.4.2
-	semver-1.0.4
-	serde-1.0.132
-	serde_derive-1.0.132
-	serde_json-1.0.73
-	serde_repr-0.1.7
-	serde_urlencoded-0.7.0
-	sha2-0.10.0
-	sha2-0.9.8
-	shlex-1.1.0
-	slab-0.4.5
-	smawk-0.3.1
-	socket2-0.4.2
-	spin-0.5.2
-	static_assertions-1.1.0
-	strsim-0.8.0
-	structopt-0.3.25
-	structopt-derive-0.4.18
-	subtle-2.4.1
-	syn-1.0.82
-	tar-0.4.38
-	target-lexicon-0.12.2
-	tempfile-3.2.0
-	termcolor-1.1.2
-	terminal_size-0.1.17
-	textwrap-0.11.0
-	textwrap-0.14.2
-	thiserror-1.0.30
-	thiserror-impl-1.0.30
-	thread_local-1.1.3
-	time-0.1.43
-	tinyvec-1.5.1
-	tinyvec_macros-0.1.0
-	tokio-1.15.0
-	tokio-rustls-0.23.2
-	tokio-util-0.6.9
-	toml-0.5.8
-	tower-service-0.3.1
-	tracing-0.1.29
-	tracing-core-0.1.21
-	try-lock-0.2.3
-	typenum-1.14.0
-	unicase-2.6.0
-	unicode-bidi-0.3.7
-	unicode-linebreak-0.1.2
-	unicode-normalization-0.1.19
-	unicode-segmentation-1.8.0
-	unicode-width-0.1.9
-	unicode-xid-0.2.2
-	unindent-0.1.7
-	untrusted-0.7.1
-	url-2.2.2
-	uuid-0.8.2
-	vec_map-0.8.2
-	version_check-0.9.3
-	void-1.0.2
-	waker-fn-1.1.0
-	walkdir-2.3.2
-	want-0.3.0
-	wasi-0.10.2+wasi-snapshot-preview1
-	wasm-bindgen-0.2.78
-	wasm-bindgen-backend-0.2.78
-	wasm-bindgen-futures-0.4.28
-	wasm-bindgen-macro-0.2.78
-	wasm-bindgen-macro-support-0.2.78
-	wasm-bindgen-shared-0.2.78
-	web-sys-0.3.55
-	webpki-0.21.4
-	webpki-0.22.0
-	webpki-roots-0.21.1
-	wepoll-ffi-0.1.2
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	winreg-0.7.0
-	xattr-0.2.2
-	zbus-1.9.1
-	zbus_macros-1.9.1
-	zeroize-1.4.3
-	zip-0.5.13
-	zvariant-2.10.0
-	zvariant_derive-2.10.0"
-CRATES_TEST="
-	indoc-0.3.6
-	indoc-impl-0.3.6
-	libc-0.2.107
-	libc-0.2.108
-	libc-0.2.110
-	lock_api-0.4.5
-	once_cell-1.8.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	paste-0.1.18
-	paste-impl-0.1.18
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.32
-	pyo3-0.15.1
-	pyo3-build-config-0.15.1
-	pyo3-macros-0.15.1
-	pyo3-macros-backend-0.15.1
-	scopeguard-1.1.0
-	smallvec-1.7.0
-	syn-1.0.81"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cargo distutils-r1 flag-o-matic
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://maturin.rs/"
-SRC_URI="
-	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl
-	doc? ( CC-BY-4.0 OFL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( app-text/mdbook )
-	test? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/boltons[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# use setup.py only for pure python and handle cargo manually
-	sed -i 's/cmdclass.*/packages=["'${PN}'"],/' setup.py || die
-
-	if use test; then
-		# used to prevent use of network during tests
-		cat > "${T}"/pip.conf <<-EOF || die
-			[install]
-			no-index = yes
-			no-dependencies = yes
-		EOF
-
-		# run plain 'python' from eclass rather than auto-detect 'python3.x'
-		sed -i 's/"build",/&"-i","python",/' tests/common/integration.rs || die
-	fi
-}
-
-python_configure_all() {
-	filter-flags '-flto*' # undefined references with ring crate
-
-	cargo_src_configure
-}
-
-python_compile_all() {
-	cargo_src_compile
-
-	use !doc || mdbook build -d html guide || die
-}
-
-python_test() {
-	local -x PIP_CONFIG_FILE=${T}/pip.conf
-	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
-	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock \
-		--test-threads 1 #825242
-}
-
-python_install_all() {
-	cargo_src_install
-
-	dodoc Changelog.md Readme.md
-	use doc && dodoc -r guide/html
-}
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 4b5e613c8f13..1771f574a800 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,3 +1,5 @@
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
+DIST cuda_11.5.1_495.29.05_linux.run 3420998120 BLAKE2B 0d3f9626f97c60291397ebd0edc04e2c84942473d943d95af6fae244e5809721335bb90eaa6c019c9391de516d20599ca5631e99764616b6d25eacf1899d99d9 SHA512 71fb354714cac09265b5102223f919e34e3a8503593dd4f2e7b9542ae7787de96d64c490276b36b685da9e691cc2704419b67cfa376dcd3647e4d0f93b02db9b
 EBUILD nvidia-cuda-sdk-10.2.89-r1.ebuild 3873 BLAKE2B 6af411229608873efcb1cab6b1883f3727b304708fdbc3bf959b307198e33f5c6c3d94b86d51fb1cb4fca5c32858e7efba3cc0a57623c8c6491ebdfa4df89dde SHA512 930fb95d6c805322ac76644846fda59aecb2ac1852686ecdd17f66d0002a42c62f20a0df30d2502d3dce7ca80ed48fe1b59185df0926b12e2ab80269c00dd681
+EBUILD nvidia-cuda-sdk-11.5.1.ebuild 3864 BLAKE2B b82883013137562211db19ddbfe6a16cf7d1ecc77ec31a0eee0faa18a210576e69ead55c6e61d3292059f5c60f69cecf3c60aadcce1bd8863ea0a314d286e8b0 SHA512 18fea69d2ccc4e115d2b3135998cd25c548db7d6584841fbbfa32fb38e284b38dd3de61df5675e2d836ee427551648ab19a46c56e4e80ba94cb0c2a046da345f
 MISC metadata.xml 367 BLAKE2B 380a027ceec1e6e23fbde9a39fa2a7653a12b5e9e4cb409538245ddbe7420bf1b8ba46b5cc21aed44c6e67966a6e163061114e755ef0fd077ebbe61aebbd06c0 SHA512 7127047682608f4e36f2d44f8bebc26d48b0fa83b010d439a346bd1282034e8711a5de43d76c4cf17e11a12921ef821b9dbb0209a34c514965e05612f742edeb
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-11.5.1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-11.5.1.ebuild
new file mode 100644
index 000000000000..f919d837304d
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-11.5.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cuda flag-o-matic portability toolchain-funcs unpacker
+
+DRIVER_PV="495.29.05"
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}/builds/cuda_samples"
+
+LICENSE="CUDPP"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+cuda debug +doc +examples opencl mpi"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew:0=
+		!prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm(+)] )
+		mpi? ( virtual/mpi )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="test"
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_prepare() {
+	cuda_src_prepare
+
+	export RAWLDFLAGS="$(raw-ldflags)"
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		sed \
+			-e 's:-O[23]::g' \
+			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+			-e "/CC/s:gcc:$(tc-getCC):g" \
+			-e "/GCC/s:g++:$(tc-getCXX):g" \
+			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
+			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+			-e 's:-Wimplicit::g' \
+			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-i "${file}" || die
+	done < <(find . -type f -name 'Makefile' -print0)
+
+	# Upstream suggested us skip cudaNvSci https://github.com/NVIDIA/cuda-samples/issues/22
+	rm -rf 0_Simple/cudaNvSci || die
+	rm -rf common/inc/GL || die
+	find . -type f -name '*.a' -delete || die
+
+	eapply_user
+}
+
+src_compile() {
+	use examples || return
+	local myopts=("verbose=1")
+	use debug && myopts+=("dbg=1")
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		"${myopts[@]}"
+}
+
+src_test() {
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	local i
+	for i in {0..9}*/*; do
+		emake -C "${i}" run
+	done
+}
+
+src_install() {
+	local f t crap=( *.txt Samples.htm* )
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			while IFS="" read -d $'\0' -r f; do
+				treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
+			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
+
+			while IFS="" read -d $'\0' -r f; do
+				docompress -x "${f#${ED}}"
+			done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+		eend "Done"
+	fi
+
+	ebegin "Cleaning before installation..."
+		for f in "${crap[@]}"; do
+			rm -f "${f}" || die
+		done
+		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
+	eend "Done"
+
+	ebegin "Moving files..."
+		while IFS="" read -d $'\0' -r f; do
+			t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ -x ${f} ]]; then
+				exeinto /opt/cuda/sdk/"${t}"
+				doexe "${f}"
+			else
+				insinto /opt/cuda/sdk/"${t}"
+				doins "${f}"
+			fi
+		done < <(find . -type f -print0)
+	eend "Done"
+}
+
+pkg_postinst() {
+	if use examples && use prefix; then
+		ewarn "Gentoo Prefix does not manage kernel modules.  You need to make certain"
+		ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}"
+		ewarn "is available from the host"
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 9ce0f0684beb..c18e6210526d 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,6 +1,8 @@
 AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d2fed24c0639f8e6ff43428701c5a2d1538e444356db5e9854e6ea629a1e3b2e1399ebacef2ca388 SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_11.5.1_495.29.05_linux.run 3420998120 BLAKE2B 0d3f9626f97c60291397ebd0edc04e2c84942473d943d95af6fae244e5809721335bb90eaa6c019c9391de516d20599ca5631e99764616b6d25eacf1899d99d9 SHA512 71fb354714cac09265b5102223f919e34e3a8503593dd4f2e7b9542ae7787de96d64c490276b36b685da9e691cc2704419b67cfa376dcd3647e4d0f93b02db9b
+DIST cuda_11.6.0_510.39.01_linux.run 3488951771 BLAKE2B f66d8b7779dc8e1e06ef5b83f1b565b6d500eb802aac1726c1393e0c0f065960761e8f6cdee955fd87362446331f7cb14febeb42efa5b89d86050e77b61b6ce9 SHA512 257b7b0bce1fa93cc442d8f335aec78681a3e4d457e31f04fb1cd01b91208aa35833f3793d8e2ef6d5db15e86c4d7659adb6ad127c57cbdabaa8dd14ef36a931
 EBUILD nvidia-cuda-toolkit-10.2.89-r4.ebuild 3892 BLAKE2B 3e568112666881cb9c7082dbde2e495642e063ab5826b1fbe1c854a2956ce515f118d6b6d92886b589c1b96e8eaf0e1116f6161f79b3d283752ef7b37006b06e SHA512 8596fb4aa038a2b1ce3f16e2c496a2578ba53d64d68a951744cf27cc8c6924d0df8b89dfbfe67fdab73014e5aa803592acfc7ee06706e547838fcfe485329fa0
 EBUILD nvidia-cuda-toolkit-11.5.1-r1.ebuild 7593 BLAKE2B e428e8a25ea69f0274eb87ace918fcb5f13d0c60635a0ead0edbaaf29b85149610b703d41c19094f0d159566d9f5a741841bdc2f5187ec9b50cd5a71f3cd86cd SHA512 d7238f3a1fd3b4585b2e1a374d4ae3ce02bcc2938488bc2a4755f624d6e24fb8650a5f580fd6501e5d28f38879a81c9f19cd5b8af7914b107f5e707e1d0b1e91
+EBUILD nvidia-cuda-toolkit-11.6.0.ebuild 7883 BLAKE2B 77a825c4a6f4d92910a36d47e8de59d7c0ceb3593c90592c9adf7566f6c89dc0694029ec84e6a13f37c3079d9f78e99aa1ff4b38437d9e82c2141359d024c3e4 SHA512 f1e565ed37015a363256b31c1aff63dd894ee12dd4e87fb10705f6425dd5cddc890f0f951b97119dd8fd3473f6dd63225b9b04751b8a29a80e311f392caaa332
 MISC metadata.xml 725 BLAKE2B d956929a7ec405eda0ca359de7edac9760a5b781af053c1ef54405612eae5380796601d13a443c48aed6ff0e7819339d8728dfe3b7a27fef17781aa1a1b6b36a SHA512 c8f9bce93904f604b5bd89367dc7d06c977ba574f3ed8bfe9f8afde0bd7b55706987a79e3e4d3cd79d609cac83a8db2efa693e348a6c825136872ea5d0de4df1
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild
new file mode 100644
index 000000000000..78e78d4974bf
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="510.39.01"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
+# actual required minimum driver version are different. Lowering the
+# bound helps Kepler sm_35 and sm_37 users.
+# https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#cuda-major-component-versions
+RDEPEND="
+	<sys-devel/gcc-12_pre[cxx]
+	>=x11-drivers/nvidia-drivers-450.80.02
+	debugger? (
+		dev-libs/openssl
+	)
+	nsight? (
+		dev-libs/libpfm
+		dev-libs/openssl
+		sys-libs/zlib
+	)
+	vis-profiler? (
+		dev-libs/openssl
+		>=virtual/jre-1.8:*
+	)"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump
+	local cuda_supported_gcc="8.5 9.4 9.5 10.3 10.4 11.1 11.2 11.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend $?
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend $?
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend $?
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend $?
+	fi
+
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend $?
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/ncu
+			${ncu_dir}/ncu-ui
+			${ncu_dir}/nv-nsight-cu
+			${ncu_dir}/nv-nsight-cu-cli
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend $?
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend $?
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+
+		# unbundle libstdc++
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
+
+		# unbundle openssl
+		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libssl.so* || die
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libssl.so* || die
+
+		# unbundle libz
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libz.so* || die
+
+		# unbundle libpfm
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle mesa
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 9360eaca0e9a..35a19bbdedd4 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,7 +1,9 @@
 DIST ostree-2021.3.tar.xz 2089804 BLAKE2B 5df33b676173b1ec08ac7592d4ddf8e3bfdcd84df1b3ce19e2f24c85780fed1f210b8adce1baf4ec87869c72984502276bf6e5a72268daaae6ce9b3d6dc6f88b SHA512 0df0d8f9bd82b16562dd5146997eddfb7cb6cffc1886601307d97a1cb1dc926bda7d0c899db26c974ed0dff1012dee11937e47c11c4d03307fa3d2d430adc60e
 DIST ostree-2021.4.tar.xz 2048424 BLAKE2B 386ed38f6dc8035a429505d8392682f739bc9a57a8cf9d7960942cd0ff0b61eee314116866c3b520d802a3f16f6dfecd1ea45a7b1d44cac8d065ad56a1ed2c2f SHA512 9bde7281afa456b30253149639854f579c1f1bdf6c429059eeb69042515b5ebfdf6426b4c9780ca8e700a11f0ec05cfc03e48baa8d0858ddbca7d3942aab9bbd
 DIST ostree-2021.5.tar.xz 2049572 BLAKE2B 946e863470e53a27f9936e224e2fdf00aa70c47d141b4101e00935f597aee037fd60d0d5660e7f41cb7a3fc7051a5f286a96e10a16b7f35da2be26c29c745346 SHA512 73d463e9cfaa027ac640051615b312c1800e71b2587e33cbae1e60356cb3c3f5d4afcda8ace680636ebd1d112061f2a8a7c25c46aa24a1b260244451157ffe8a
+DIST ostree-2022.1.tar.xz 2101172 BLAKE2B 52f6723acfb2889ef232f0fdec39fc50a879b110fcc89aa318dc0eb336e50ef2c3cc0d4df4319601b6198b7789da3605a55979d0c9ee31029ae47832b0cb385f SHA512 73da367d3b9b5facc5ba894bd0f9297a7fc688fa69871b668e6568663fefc1f44433c8be352d57c23153b09144c6535e52d8c184a2ab103190ec37dc1abc2818
 EBUILD ostree-2021.3-r2.ebuild 2572 BLAKE2B b8f71329ad5cb45ed8997eb3c95f595d49cf1c58dc86053b3ef1a8d7514c98e92e710b622013b3dba85affbcc6b249d97188a4dab9168062567a23ccdd5cc269 SHA512 db3f9b89e381d468032a66c4e3878dadb33b43e03ddf2cffcdf6fa825adb36527be119e0fc90e2caed7fb5071e544e5bda46c8684b1876c2fad6da48e211e609
 EBUILD ostree-2021.4-r1.ebuild 2626 BLAKE2B 8fbfe226dc7dc402afd4ad81de474359683e70f9b1f7ef7ac34b1f5a351d250531c985da12f317b16ef868e1abe2b8fb0a9827fe6606ec7d0f20852bf425fd75 SHA512 0848d822f107fd485661ce9d60aea8c8a06ff5e9193f815bc3f4fc120c7c78cac4b5bfdeac86f08b573b86110612be114405ab5191b979eb1652d3f4f3bd618d
 EBUILD ostree-2021.5.ebuild 2626 BLAKE2B 8fbfe226dc7dc402afd4ad81de474359683e70f9b1f7ef7ac34b1f5a351d250531c985da12f317b16ef868e1abe2b8fb0a9827fe6606ec7d0f20852bf425fd75 SHA512 0848d822f107fd485661ce9d60aea8c8a06ff5e9193f815bc3f4fc120c7c78cac4b5bfdeac86f08b573b86110612be114405ab5191b979eb1652d3f4f3bd618d
+EBUILD ostree-2022.1.ebuild 2626 BLAKE2B ed6aa3b76c7eca92935dd2dcb96854a43fe05ccc111141f5fa536a08115be61c139466922c8675fe16a45b500bde32abda2579de1b2bf546a38e4ccf55cabe91 SHA512 ff349924c98a2654b14deea4d908af137ca33128317f838b2a6a374048988d87e7b682666e4387096dd83d884858d354c64cf1d3ba61ea9d8cd53f77fdbf3a79
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2022.1.ebuild b/dev-util/ostree/ostree-2022.1.ebuild
new file mode 100644
index 000000000000..7d7c40cdc1c4
--- /dev/null
+++ b/dev-util/ostree/ostree-2022.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostreedev.github.io/ostree/"
+SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
+RESTRICT+=" test"
+REQUIRED_USE="
+	dracut? ( systemd )
+	http2? ( curl )
+	httpd? ( || ( curl soup ) )
+"
+
+COMMON_DEPEND="
+	app-arch/xz-utils
+	dev-libs/libassuan
+	dev-libs/glib:2
+	>=sys-fs/fuse-2.9.2:0
+	sys-libs/zlib
+	archive? ( app-arch/libarchive:= )
+	curl? ( net-misc/curl )
+	dracut? ( sys-kernel/dracut )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	grub? ( sys-boot/grub:2= )
+	introspection? ( dev-libs/gobject-introspection )
+	libmount? ( sys-apps/util-linux )
+	selinux? ( sys-libs/libselinux )
+	sodium? ( >=dev-libs/libsodium-1.0.14:= )
+	soup? ( net-libs/libsoup:2.4 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( dev-util/gtk-doc )"
+
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig"
+
+S="${WORKDIR}/lib${P}"
+
+src_prepare() {
+	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+		-i Makefile.in Makefile-man.am || die
+	eautoreconf
+	default
+}
+
+src_configure() {
+	local econfargs=(
+		--enable-man
+		--enable-shared
+		$(use_with archive libarchive)
+		$(use_with curl)
+		$(use_with dracut dracut yesbutnoconf) #816867
+		$(use_enable doc gtk-doc)
+		$(usex introspection --enable-introspection={,} yes no)
+		$(use_with gpg gpgme)
+		$(use_enable http2)
+		$(use_enable httpd trivial-httpd-cmdline)
+		$(use_with selinux )
+		$(use_with soup)
+		$(use_with libmount)
+		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
+		$(use_with sodium ed25519-libsodium)
+		$(use_with systemd libsystemd)
+		$(use_with zeroconf avahi)
+	)
+
+	if use systemd; then
+		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
+	fi
+
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}/etc/grub.d/15_ostree"
+}
diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest
index 4eec79c6ad71..520104c5ba09 100644
--- a/dev-util/premake/Manifest
+++ b/dev-util/premake/Manifest
@@ -5,8 +5,8 @@ DIST premake-4.4-beta5-src.zip 596883 BLAKE2B f4bf2b75946b6a442aced79f1f29b08e61
 DIST premake-5.0.0_alpha12.tar.gz 3548788 BLAKE2B 30f7b0e139ac8b7639c78b06ae139137d4f62b4a7690b180d6c292f57205e7ab352042241735f472d20163c24277b835e9b14e307d66602d5c1bc1a7c65da036 SHA512 6f458fada8af9d93e99f9511b0cf1a2cad87eacf155c8330cab9f830c89aac0ba137ea466b8b2ecfd4a104132c7cd79eefbd06b9780066d27760bc695a4b94a2
 DIST premake-5.0.0_alpha16.tar.gz 6462956 BLAKE2B 27c27eeef77986f6e8244ecd1a08e19d753dafcd0292d593ac758e04c2cb2307e05aaf325d2afc6ad8936ab2bbd97af6269841b9b7489b50dd4ce56e39120f05 SHA512 7ddb5ffe48484157336c7309fb611d34ff670fb20f92da309af3a4ae6f664a4b8abd2c0575036abbed1e346b155a03bf6fbac0587b47d5c97d9a22f08dd2deea
 DIST premake-src-3.7.zip 427727 BLAKE2B 2f9cc7b045f75ceb52a8e71507cb5576f042a93be4f6c097e8bc1166e3bbb9e271a02f5fbd648f79e0d24867a09bba9ac72a268fdc47140219c5d6a36cda1a16 SHA512 351b26b9ee738e97b1828e7c26fe1538fb1509fbdc030da3d87fc28b1daa7966bc50ba8043062d35b37fa3929d909533b723241e1f98e438a039c6f9d61a46f4
-EBUILD premake-3.7.ebuild 447 BLAKE2B 9a52bc3e693e3500fe706db1e400ef552961952d06106e43c38fb4ef62c172600469fe266b26a9bd3ef7504164cdebb9db2abbb9f9c96d893b85bb0a9d7fbd93 SHA512 8e77f419f850b861e66e77ac0140fc0de4ead84b23d0abd82ab568d6e9dc06c6537eed6ea2b5db8b3a0b88f44f3b915009ae173f6165c53b56bbc5a0b384d1c8
-EBUILD premake-4.3-r1.ebuild 539 BLAKE2B 831f585242a1722e38e1fbe8a6757bae8f7aa7d82bf9dc26667de0a1b4f02d410a2154a8779b6eb0ee40542003e433fa613e3cfec1a11231ff0472855c60249e SHA512 6a238c75005f7bc0c9e598543274ba4ddf4acf32806ee5fa9fe7e7188e7cce4f1de0bb6a242e6994d1a20d2d1786c95578e91867f46e7f9cfa2a7dd2ea56f104
+EBUILD premake-3.7-r1.ebuild 389 BLAKE2B 12a26f7da1d016d762b51e1ac7f703f4dbe72c1f22eb5259affb8244286ba4018be6e9eb7acfd07573950726401b1d74315b42bb5f5331e5cbbacc2c499591aa SHA512 dad1c9e2143d633b7becb624babb63af459cb7c9ecd5105e11854703f91e68c88dd91e43e9a5aa894d21e8c0f6eaaa1f0df01b4c0f4bf1992d14c08c270efc39
+EBUILD premake-4.3-r2.ebuild 463 BLAKE2B c4783cbf2d86ec85af56000494b9dc321d25914881caf416f986002ec7e4452c70af828fdff8331be899a026f937edd0c3113fc83f93256a5dcce08fd475a677 SHA512 8a9f5e4e4690e00faf4e7815bd27940c9a310eafd45ec78b85702e98ddb0f8f7444a903125e4a4d387b7855fe08375a191eba5e124bc705bb415cea8a0c92fb1
 EBUILD premake-4.4_beta5.ebuild 610 BLAKE2B 576418d3d18c1fc2f3a020368711ae33f19cd65c7e0c9300a084fa165cb57e028ef224c9abc2044801f8c247acf80d79b418dedf69a82f867355446629d93875 SHA512 43709cba1c064040a61423808e75dc5d490807a89cffdae21068fa12855a2f1386be90a4d5c975eab370242b1aba41cfce58e1a92d8e8bb94ecf9d7cb6807d75
 EBUILD premake-5.0.0_alpha12.ebuild 611 BLAKE2B a7d0c3cb4eea07b3831665b6cf33faa5a93b7488759f44aab91babbacf9da6d027877c9a92d6388ad1e20192cda8a94f33830f88942a82e70aec0fcc8095c796 SHA512 5515fee0f01f446f180feadb3a3c045b135f50ae3cf10c7b4cefa252a9703e8ccdb50a0f0e635152be188a79fbfc0c5c8758fe95bca119d946cf8b818a5494be
 EBUILD premake-5.0.0_alpha16.ebuild 699 BLAKE2B 0ae5d55430621930b00b87ec3ab11524af714e8e5f4c1e75c3984162f3e86292558261f057d07196a790ea45da252795a1b61bea82f2b88fc1ed1313f77fee37 SHA512 45217a60a4f9d4e14003fbe0452b48c2abcd11517eddeca90b20ca6182dd83e99494f6e6c659967752b3f404585ebd5af297682bb8f859a813c40254aecc1b9d
diff --git a/dev-util/premake/premake-3.7.ebuild b/dev-util/premake/premake-3.7-r1.ebuild
index 91026f3efad0..ae7f896f0a9c 100644
--- a/dev-util/premake/premake-3.7.ebuild
+++ b/dev-util/premake/premake-3.7-r1.ebuild
@@ -1,23 +1,18 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit versionator
+EAPI=8
 
 DESCRIPTION="A makefile generation tool"
 HOMEPAGE="http://industriousone.com/premake"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
+S="${WORKDIR}/${P/p/P}"
 
 LICENSE="GPL-2"
-SLOT=$(get_major_version)
+SLOT="3"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
 
-S=${WORKDIR}/${P/p/P}
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	dobin bin/${PN}
diff --git a/dev-util/premake/premake-4.3-r1.ebuild b/dev-util/premake/premake-4.3-r2.ebuild
index 78be7cc0d8e1..3b333e7719c4 100644
--- a/dev-util/premake/premake-4.3-r1.ebuild
+++ b/dev-util/premake/premake-4.3-r2.ebuild
@@ -1,25 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit versionator epatch
+EAPI=8
 
 DESCRIPTION="A makefile generation tool"
 HOMEPAGE="http://industriousone.com/premake"
 SRC_URI="mirror://sourceforge/premake/${P}-src.zip"
 
 LICENSE="BSD"
-SLOT=$(get_major_version)
+SLOT="4"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-src_prepare() {
-	epatch "${FILESDIR}/archless.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/archless.patch
+)
 
 src_compile() {
 	emake -C build/gmake.unix/
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index e22730a7f912..0bd1fb888389 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,5 @@
 DIST RBTools-2.0.1.tar.gz 229394 BLAKE2B a3864c5a39854ffd8744cc562fb888aded06b86945b7b08bab1b172e557b80c0183352068722e6d530a7b0c2fae85f24ae1bbef9116538c5c31735ae5c47f313 SHA512 41ef3f6ad030e3551b76cce5358806442ddc78ad14cb3f2f5978d25858b44647fc80a8a98c84edc112d3e121748fa49aeca0ae24287c392d2f8d1d3b72df12ff
 DIST RBTools-2.0.tar.gz 229078 BLAKE2B 23a0c9e9241a6d989044a4197ed5812d81d43b10195788c7754265969166f654af5fafc5ac027f1cf6e9d00bdd7938455beef6719380e09eacf219fa13bc74ab SHA512 aa773744365fcb5bd2ed5413684290c1d794c8bc76f9f9d0fb9400ab1e2baa1b647db85b8992dfea3e3bffe7ee87f2d735b1e6d5385d621d011be62a64d8890b
-EBUILD rbtools-2.0.1.ebuild 1249 BLAKE2B 1a8135f3f19d2beb2eeeb1933315b8a062cc7b90d457c70d346399c91f6bf8f816f0094fb6bede9f66296a0e9dd8fc6594ba53b7d6b69f1507600ead1d045c8d SHA512 5ebc8893faa9ec82d12fc387f768ad09f7dd89d9956bed21954fa4f9ac38717ee47ca55ef9d5c631f622a17440b9985e8f5f1fb42a81520e3d3aabcd467396d5
+EBUILD rbtools-2.0.1.ebuild 1252 BLAKE2B a63fd7c4eb3e0d532444f5a5afb31b85897c229128236e8c8a0e84df00fe185082386cf69155d71fad439cb93fb7b0d3589e92d891cb406e40fd1db34a648646 SHA512 79a501cb726f3a0b9995dfc8a06733f5e59e58cc5cb4989bb18d34ad6ff1f7ac08b2cec91bf75bd158b48728c8b8ac1731a715fea5854fdbb1b2db0990873f8d
 EBUILD rbtools-2.0.ebuild 738 BLAKE2B d88fb41903444f565e20c78ddf05b73a75526f6b87f113012b40469f4983d80bff471ddd265c716875246d895df19476bdae8236f1b95aeb6f74117bb9b65070 SHA512 be221d9bd604c9f3780352d51ecace526779277354a8209235520c775f56d0b06ef402b50d34c9f3a719ef722f1db9ee4543642c8c56fc8b4e7528ab3f55033f
 MISC metadata.xml 218 BLAKE2B e25e8013045a9887590c6b042f7b200cff82f721b120d495d01d69fa07fe49cbbbb996b77f4f6af08527d5f89194b3fa650c9ffc7c279328652b21709353bece SHA512 ac49327c1e8833a999126e219e7f7b0008fbaee02eabda53f36d0957a264619e5bd695edf6279a932cc49bd4aa48ca22373177afed7ab427cb454c9de53d01b1
diff --git a/dev-util/rbtools/rbtools-2.0.1.ebuild b/dev-util/rbtools/rbtools-2.0.1.ebuild
index 7baa5961051d..49b1123b1a0d 100644
--- a/dev-util/rbtools/rbtools-2.0.1.ebuild
+++ b/dev-util/rbtools/rbtools-2.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit distutils-r1
 
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 32ae4498cb4c..fd26d9276c82 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,9 +1,6 @@
 AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c0964f6f00c1bcd01cba51a56e6626fe50c6ad2c36bece4db326f7b128d6ea5786970eb454832e32f9d837458f92f2a596 SHA512 241a72a7f1c3ec8ba831ca696faf0cfc09a58207c6d3db7005b09b9016a71ed9238bcb9441a389116083557538a0ff1a6adf55e78e1aa35d67aa206f30774391
-AUX rizin-0.3.1-CVE-2021-43814.patch 3292 BLAKE2B 4d9e9f43296dc906839fee4b97794141157dea5e3af7b0f96f5c35369b44f2d04a1f4363366d0e495112d29b658927953b3c19a1375c7ad2377bb3504be3e9ef SHA512 0bcfe32bab666d99fa68e825f4d7406024d2d1f76abc7b3fdbd7803be3f3c27205bbe7d91a671e2679094bedc944a59980a798e07adf20e6bf6d2c46e884b297
 AUX rizin-0.3.2-never-rebuild-parser.patch 1493 BLAKE2B fd5a4d306336ccba939e9d96e97d4b653b83407352f9babf9c39bbad28a18b4fc1a3e2f1eb57b25b7f8dad35b3400271cf6a6bf1cec55c74dc00f424da715c91 SHA512 7a105831cbdb99633c43411b7a407ff6970cb8e89cae561886ade96c75579c0484271641e957762189fc68762952a26ca0a2536bd1342802c408041066852b16
-DIST rizin-src-v0.3.1.tar.xz 64089580 BLAKE2B 04f7e3cfa20a787f47af90c78405f295b346cc0c7d81164ff01bc6a69df526f3f9112ab4cb62092297ae2dda1fa738a2e7feff35e0f1b7f3e7467a8c6e4d1a1e SHA512 743f8f2c9ddb045f39147de9ad971d47f1a26bfcc233f41c12c64ade5e31c992104cf3f93c44c5035142b554779e895224b68f839cd87a59aaf344b4ec88d5fe
-DIST rizin-src-v0.3.2.tar.xz 64170200 BLAKE2B fe11317e4acc1a803323f42fd4c2c6435a2fe4032581ed509f37f7221ec53e0afac04ebe8cb9da693ac283b61c0a70e135007d635c4c5010519a5c7e7cfa19cf SHA512 c472770ee1b156d42a98d4641f365e2255f16489b2223b117c8b88dcac0d72065d1fd7eedad70046188231889e492bafb7b8462987c68311143f14808eaab1cc
-DIST rizin-testbins-d66fa0feaf3b1ecdad261ca17542f1d5d0b101cc.tar.gz 126773703 BLAKE2B f5eaeb7e99e9091b6ca043dd50d03143950adc06b75b5834886d96d6280207c0bea73101a5f9e06c38ba60c0d4cff82dbf1f00364f7d87fe183c0687b06d1904 SHA512 0a017954017c8d57133d51b441411a50aa9ed062c0cc61e1561951fdf0703f5244230cda377885199e9e35dca6780d8582a445ac92286b63ef2ac784777ec0c4
-EBUILD rizin-0.3.1-r2.ebuild 2910 BLAKE2B 3b1817a02c425f703168c5b5c78c7df0106f64df1d2420f59f2d4b66581b1439d18f9e22cb9db3ef08b4580f6e37ace6797113a0a461e5ef7c657b527193c5bb SHA512 4540a23f9a6ca9586a45fb8fbac22762886e54bba5d3863d098bf40a291c09fb5a49f24107352f7a9230749de0aafaec002c91ff3ba6d8b2cd38c281cbcd9b85
-EBUILD rizin-0.3.2.ebuild 2945 BLAKE2B a8887f8f05d71b972076e46f8a41d7d7b2122e699d26dfaeaff720722ae80afcd8d4eb8c6b2b3a2b60232bfc17960f52028f91bf088b6fd3233feaadb8ebfe95 SHA512 a80e5d328a25a464f1ad6c96be3930422c663ab164d00bbb489305932b35619e1d35f6dc6bd8aa32ea2fcf8b7e9b875a3535b51023181cc09a81a744c402dcdd
+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.ebuild 2945 BLAKE2B 0a2591f74cb16d23957114fadff4ec2279c3b7f21423d65ea6674f486f9f5ad55dfd347464d1f0af93edda904fc8f71be5bdf21b34f54f3186980670f7d40312 SHA512 af755c1a1a23ced8d2e67f2b7178303c8e1875a5a1cd26898fbe473a97c05b157fbc1674d1e567d95be72895eeed24a5961ae36d72a4365174c2756c4aa96d97
 MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/files/rizin-0.3.1-CVE-2021-43814.patch b/dev-util/rizin/files/rizin-0.3.1-CVE-2021-43814.patch
deleted file mode 100644
index f7c511b5a0cf..000000000000
--- a/dev-util/rizin/files/rizin-0.3.1-CVE-2021-43814.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From aa6917772d2f32e5a7daab25a46c72df0b5ea406 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
-Date: Fri, 10 Dec 2021 15:43:12 +0100
-Subject: [PATCH] Fix oob write for dwarf with abbrev with count 0 (Fix #2083)
- (#2086)
-
----
- librz/bin/dwarf.c         | 40 ++++++++++++++++++++++-----------------
- test/db/formats/elf/crash |  8 ++++++++
- 2 files changed, 31 insertions(+), 17 deletions(-)
-
-diff --git a/librz/bin/dwarf.c b/librz/bin/dwarf.c
-index 1ed1d3517c2..23dd1f9f0b1 100644
---- a/librz/bin/dwarf.c
-+++ b/librz/bin/dwarf.c
-@@ -1220,9 +1220,13 @@ static int init_die(RzBinDwarfDie *die, ut64 abbr_code, ut64 attr_count) {
- 	if (!die) {
- 		return -1;
- 	}
--	die->attr_values = calloc(sizeof(RzBinDwarfAttrValue), attr_count);
--	if (!die->attr_values) {
--		return -1;
-+	if (attr_count) {
-+		die->attr_values = calloc(sizeof(RzBinDwarfAttrValue), attr_count);
-+		if (!die->attr_values) {
-+			return -1;
-+		}
-+	} else {
-+		die->attr_values = NULL;
- 	}
- 	die->abbrev_code = abbr_code;
- 	die->capacity = attr_count;
-@@ -1726,25 +1730,27 @@ static const ut8 *parse_die(const ut8 *buf, const ut8 *buf_end, RzBinDwarfDebugI
- 	size_t i;
- 	const char *comp_dir = NULL;
- 	ut64 line_info_offset = UT64_MAX;
--	for (i = 0; i < abbrev->count - 1; i++) {
--		memset(&die->attr_values[i], 0, sizeof(die->attr_values[i]));
-+	if (abbrev->count) {
-+		for (i = 0; i < abbrev->count - 1; i++) {
-+			memset(&die->attr_values[i], 0, sizeof(die->attr_values[i]));
- 
--		buf = parse_attr_value(buf, buf_end - buf, &abbrev->defs[i],
--			&die->attr_values[i], hdr, debug_str, debug_str_len, big_endian);
-+			buf = parse_attr_value(buf, buf_end - buf, &abbrev->defs[i],
-+				&die->attr_values[i], hdr, debug_str, debug_str_len, big_endian);
- 
--		RzBinDwarfAttrValue *attribute = &die->attr_values[i];
-+			RzBinDwarfAttrValue *attribute = &die->attr_values[i];
- 
--		if (attribute->attr_name == DW_AT_comp_dir && (attribute->attr_form == DW_FORM_strp || attribute->attr_form == DW_FORM_string) && attribute->string.content) {
--			comp_dir = attribute->string.content;
--		}
--		if (attribute->attr_name == DW_AT_stmt_list) {
--			if (attribute->kind == DW_AT_KIND_CONSTANT) {
--				line_info_offset = attribute->uconstant;
--			} else if (attribute->kind == DW_AT_KIND_REFERENCE) {
--				line_info_offset = attribute->reference;
-+			if (attribute->attr_name == DW_AT_comp_dir && (attribute->attr_form == DW_FORM_strp || attribute->attr_form == DW_FORM_string) && attribute->string.content) {
-+				comp_dir = attribute->string.content;
-+			}
-+			if (attribute->attr_name == DW_AT_stmt_list) {
-+				if (attribute->kind == DW_AT_KIND_CONSTANT) {
-+					line_info_offset = attribute->uconstant;
-+				} else if (attribute->kind == DW_AT_KIND_REFERENCE) {
-+					line_info_offset = attribute->reference;
-+				}
- 			}
-+			die->count++;
- 		}
--		die->count++;
- 	}
- 
- 	// If this is a compilation unit dir attribute, we want to cache it so the line info parsing
-diff --git a/test/db/formats/elf/crash b/test/db/formats/elf/crash
-index ea6c2c214bb..fb8a572bd56 100644
---- a/test/db/formats/elf/crash
-+++ b/test/db/formats/elf/crash
-@@ -25,3 +25,11 @@ nth vaddr bind type lib name
- []
- EOF
- RUN
-+
-+NAME=ELF/Dwarf: abbrev empty
-+FILE=bins/elf/dwarf_fuzzed_abbrev_empty
-+CMDS=<<EOF
-+aaa
-+EOF
-+EXPECT=
-+RUN
diff --git a/dev-util/rizin/rizin-0.3.1-r2.ebuild b/dev-util/rizin/rizin-0.3.1-r2.ebuild
deleted file mode 100644
index 5148796711c6..000000000000
--- a/dev-util/rizin/rizin-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=(python3_{8,9,10})
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="74b6e4511112b1a6abc571091efc32ec2a7d98a6"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/"
-
-SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz"
-	#test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/${PV}"
-IUSE="test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="test"
-
-RDEPEND="
-	sys-apps/file
-	app-arch/lz4:0=
-	dev-libs/capstone:0=
-	dev-libs/libuv:0=
-	dev-libs/libzip:0=
-	dev-libs/openssl:0=
-	>=dev-libs/tree-sitter-0.19.0
-	dev-libs/xxhash
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
-	"${FILESDIR}/${P}-CVE-2021-43814.patch"
-)
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
-	default
-
-	local py_to_mangle=(
-		librz/core/cmd_descs/cmd_descs_generate.py
-		subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
-		subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
-		subprojects/lz4-1.9.3/tests/test-lz4-list.py
-		subprojects/lz4-1.9.3/tests/test-lz4-speed.py
-		subprojects/lz4-1.9.3/tests/test-lz4-versions.py
-		sys/clang-format.py
-		test/fuzz/scripts/fuzz_rz_asm.py
-		test/scripts/gdbserver.py
-	)
-
-	python_fix_shebang "${py_to_mangle[@]}"
-
-	if use test; then
-		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcli=enabled
-		-Duse_sys_capstone=enabled
-		-Duse_sys_magic=enabled
-		-Duse_sys_libzip=enabled
-		-Duse_sys_zlib=enabled
-		-Duse_sys_lz4=enabled
-		-Duse_sys_xxhash=enabled
-		-Duse_sys_openssl=enabled
-		-Duse_sys_tree_sitter=enabled
-
-		$(meson_use test enable_tests)
-		$(meson_use test enable_rz_test)
-	)
-	meson_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
-}
diff --git a/dev-util/rizin/rizin-0.3.2.ebuild b/dev-util/rizin/rizin-0.3.4.ebuild
index f0f118bdd3dc..b4bfee6c1042 100644
--- a/dev-util/rizin/rizin-0.3.2.ebuild
+++ b/dev-util/rizin/rizin-0.3.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=(python3_{8,9,10})
 
 # This is the commit that the CI for the release commit used
-BINS_COMMIT="d66fa0feaf3b1ecdad261ca17542f1d5d0b101cc"
+BINS_COMMIT="aa6a88dcdfaad54335e3935c16ce21a124ff861d"
 
 inherit meson python-any-r1
 
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 7a1cd604d26d..399380b95160 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,8 +3,10 @@ AUX strace-5.12-detect-ipx-presence.patch 3902 BLAKE2B bc61d359e670462daafa88951
 DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
 DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
 DIST strace-5.15.tar.xz 2248664 BLAKE2B fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94 SHA512 67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
+DIST strace-5.16.tar.xz 2265944 BLAKE2B 0c0fb133e8642c30a8c706ba23c2d0976ff4e6662a1d07c6cd3cb70aaa980020d54220fe0baddcb70e3c3eb24bc2a8733e4b52ef4e99da5c11ed852c192a5c21 SHA512 db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817
 EBUILD strace-5.12-r1.ebuild 2481 BLAKE2B a306eb30dcc7685c9637572d61e29fce39d1618e2d5ac38bcffffca953d65ab89847af3df7de80596af9b18484f5116db89b58420d11bdbaf2d002c6ad126a35 SHA512 82347d065e746dbe4e3f5fc8f39b302daa5cacc2296c67032b16db2f2d3dc44f9ae3b1a003cd597be14f1edbcb34cc4d8f945994206550f3f21976e9f25e4775
 EBUILD strace-5.14-r1.ebuild 2481 BLAKE2B a306eb30dcc7685c9637572d61e29fce39d1618e2d5ac38bcffffca953d65ab89847af3df7de80596af9b18484f5116db89b58420d11bdbaf2d002c6ad126a35 SHA512 82347d065e746dbe4e3f5fc8f39b302daa5cacc2296c67032b16db2f2d3dc44f9ae3b1a003cd597be14f1edbcb34cc4d8f945994206550f3f21976e9f25e4775
 EBUILD strace-5.15.ebuild 2441 BLAKE2B ad57aeb288b3a5e2ba836c3eadc267084a3be7bc4fd73cab6edab02b0ee13adc7383342095f0df5dac494f53e1ebb881f752a367ddb1a57bd18ebf16ece20098 SHA512 036814f5d4917313557e6672e580abdcadb6f15b326f37268bc8a215bd3c1ea569d32e74562a37c6e439877ee303d3cbb77199999a7575815869b947b529d993
-EBUILD strace-9999.ebuild 2437 BLAKE2B 13ebd8db417683989394b244d639a9b62d297849c09189cc5dfd6c49eae0adf0da128efcfb817c95e5e1828150c9d1d550c8e21769490ff8a9cce877d44f6f28 SHA512 30049cf1f1dda579d8c21dac484698c8a1b25f2e13f8e85cef9fca621b1f9da84e0fa336a7f5680d43c4cf68476fedbaa02c7ee5a98f0af405ca8cbd9e6582ee
+EBUILD strace-5.16.ebuild 2449 BLAKE2B 39f4b09dcd44d6e4e4a717015cc25cce55591eb87b85e67ff0a9f25c1f2e2b47006e2e5f19b19de5a7762c0ecc2914322c0d2d72463a0193f8260ce45b703ea7 SHA512 f2d686319849a3c2d1756a36b0d21bba51ffa790f1d9b978d3e943aa1884380a69bc7c8acdd5e4a7009bb2d41771a863cf2a0a56105c6924552de009430799f1
+EBUILD strace-9999.ebuild 2449 BLAKE2B 39f4b09dcd44d6e4e4a717015cc25cce55591eb87b85e67ff0a9f25c1f2e2b47006e2e5f19b19de5a7762c0ecc2914322c0d2d72463a0193f8260ce45b703ea7 SHA512 f2d686319849a3c2d1756a36b0d21bba51ffa790f1d9b978d3e943aa1884380a69bc7c8acdd5e4a7009bb2d41771a863cf2a0a56105c6924552de009430799f1
 MISC metadata.xml 761 BLAKE2B 261db0087db2a12c260efcd80bae1dcabd1b518c7b7d65a7ce4cbd5a2fcf878af3787985d629b43dac0944fe97f7f78df964082c5dbc52da06360ec112a0e7f0 SHA512 dfe6bb1b1149f51947c964d55396c10df38ad68dd987ae3df66b1850b812717d282d41e59a38f35863d22eb7391b7be636b5272e361641c26622618c2cbff19e
diff --git a/dev-util/strace/strace-5.16.ebuild b/dev-util/strace/strace-5.16.ebuild
new file mode 100644
index 000000000000..a0531b88dede
--- /dev/null
+++ b/dev-util/strace/strace-5.16.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 035be39c8354..a0531b88dede 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.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=7
@@ -19,12 +19,9 @@ HOMEPAGE="https://strace.io/"
 LICENSE="BSD"
 SLOT="0"
 IUSE="aio perl selinux static unwind elfutils"
-
 REQUIRED_USE="?? ( unwind elfutils )"
 
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 LIB_DEPEND="
 	unwind? ( sys-libs/libunwind[static-libs(+)] )
 	elfutils? ( dev-libs/elfutils[static-libs(+)] )
@@ -58,12 +55,7 @@ src_prepare() {
 		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
 	fi
 
-	filter-lfs-flags # configure handles this sanely
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
+	# Stub out the -k test since it's known to be flaky. bug #545812
 	sed -i '1iexit 77' tests*/strace-k.test || die
 }
 
@@ -76,10 +68,17 @@ src_configure() {
 		export "${v}_FOR_BUILD=${!bv}"
 	done
 
-	# Don't require mpers support on non-multilib systems. #649560
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
 	local myeconfargs=(
 		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
 		--enable-mpers=check
+
 		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
@@ -90,7 +89,8 @@ src_configure() {
 
 src_test() {
 	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
 		return 0
 	fi
 
@@ -99,6 +99,7 @@ src_test() {
 
 src_install() {
 	default
+
 	if use perl ; then
 		exeinto /usr/bin
 		doexe src/strace-graph
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index b8a90854df2d..93c4143a5029 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -2,7 +2,11 @@ AUX umockdev-0.16.1-Werror.patch 596 BLAKE2B 029f0db068fa900a1b0acff33e38634194b
 DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea
 DIST umockdev-0.17.1.tar.xz 485480 BLAKE2B 5768d08c3f1cd2334afbf095c7d3f0d9290b92c8b4fbc9ae17f81168ab6320c0e86ef9709d1fee547b624cf084c0a29e1f653d67574a639a65ae71d5950c7f05 SHA512 b747a25cb83c7cf222693818c37fb917e599567a04e69784fae6afa97381cfa630641c2858a6fa156fc1e5f872ae40ea360f9b8e2a20c5adb69fb9eca3852164
+DIST umockdev-0.17.2.tar.xz 486076 BLAKE2B ae1df8b07d93290c9f2be267c4aaf795e8e2e0a9fd492fad4cfe46d8929bb020d9482f7769a62d9b3325a361c3ef276b92454026741f0b985e12f283e2a4f7cc SHA512 fcf8c972dfa063922286702eeede8c273b9e78c1b1274a67ec459f64d17373a172400bff27f2fd9baee19af188fbd28c0f5e97b71bd7c8b50886933ad75547f3
+DIST umockdev-0.17.3.tar.xz 486052 BLAKE2B f1a2bf53de0a041abb23558c0ca245f86bf30453bf1f8b211fec3b654984feef3e9d62bca2e3625594538bfc9070e8a02dde81f62b0fb58c77e9b7e2d72961be SHA512 93bd60097541f6821e6d5d2b407b0e59223a9eede0f1e2d44facd3a407599802ea5fad7cc3cc148a8bdb2b2a34c5c4c017346640f10a5f695600f23418a9afc5
 EBUILD umockdev-0.16.1-r1.ebuild 1189 BLAKE2B c12e23c8fd73e5b7bf152820300bb74c0b0bf28623800aac162a7e95828f54f6a21a934285d694c8840968a3338c5fa4d078e419d7eecf9db5597b6c0c8d7284 SHA512 2c29ab977fe681fc5f9c1054858a7af993689f3db59d00c088cbf0857ed5039852d3060659c292167890f4bbf422c23bbd34bb800c627c93e3d9688a0ef5659a
 EBUILD umockdev-0.16.2.ebuild 1208 BLAKE2B 126666b85478185a70e38b23f0b9940f4d00d18e53058cb1f0e49002c6e5f42a1c929663dcd05019e88b7c02260bfd1b8577fd71dc4f37111981244615bac780 SHA512 023b535bdf6ef5ab951b4ec1812cd31bc1c8b2233ee98d67abf3accf7d7d43e78dea4eed6c9f27e810dbc225d6818fe55a304ad213ed4a469ed352e946daf955
 EBUILD umockdev-0.17.1.ebuild 1143 BLAKE2B 49fa6878982a7ea2028b8061253ef3133c92fb1ea7d5df0608bd4df3b36bd01dd563823f8559f3fde8d73ae951b3efd6f728b6c933f0e76cfb07cffd58254275 SHA512 8fb0bc69fa5e7db04c409b8aea9ec93a1008e5cb01ea89ada29d04d6b2417b7364cc0faf4ee546e6345927e91ab0c590c0c16ca566fb3ccec35d4e22ce7ae9b6
+EBUILD umockdev-0.17.2.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
+EBUILD umockdev-0.17.3.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.2.ebuild b/dev-util/umockdev/umockdev-0.17.2.ebuild
new file mode 100644
index 000000000000..7a53f924c567
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.17.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap[${MULTILIB_USEDEP}]
+	virtual/libudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	)
+"
+BDEPEND="
+	$(vala_depend)
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_src_prepare
+}
+
+multilib_src_configure() {
+	export VALAC="$(type -P valac-$(vala_best_api_version))"
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --no-suite fails-valgrind
+}
diff --git a/dev-util/umockdev/umockdev-0.17.3.ebuild b/dev-util/umockdev/umockdev-0.17.3.ebuild
new file mode 100644
index 000000000000..7a53f924c567
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.17.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap[${MULTILIB_USEDEP}]
+	virtual/libudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	)
+"
+BDEPEND="
+	$(vala_depend)
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_src_prepare
+}
+
+multilib_src_configure() {
+	export VALAC="$(type -P valac-$(vala_best_api_version))"
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --no-suite fails-valgrind
+}
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index 4cae255e0bba..cc25bec15716 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,6 +1,6 @@
 DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
 DIST uncrustify-0.72.0.tar.gz 1530850 BLAKE2B 59b3ff4b47fee1f2a303e237d46b5fb656041e4d397aa97862cc7aebb6a5e705d036889a7b492bbe4393537ff52cf78af46bbe513e71aef19fca1388e3ffa79b SHA512 bfcbdf0d8198e1dd91f1c8283441a56669610a84d55a17cdd504571da09b26fef026fd3f753acd9950e498f574e6771a206c72b76ffdea97747b7a4fdb481862
-EBUILD uncrustify-0.71.0.ebuild 744 BLAKE2B 6d466a70bd6ea03c84f7f4dc65f54a9a97b675b80ed02c71992e56e71916bfd361b9425a55b220cf855ac4aa82ac31d7e3817d42a19896c5e5e99322d8ffe805 SHA512 c4530d02300987cf93c7b6863d38826ae967ca470ab324b9d2e3d4ee54e73ee57c4f3cda7380ac2a2fbfde1fb759e6a6c429d01f2cf6ba53d2e5971b8658508a
+EBUILD uncrustify-0.71.0.ebuild 746 BLAKE2B cc50017e10b3dc947493ff252e5b2121cb39cd231eca3fa3e3e16026e3342776a0e138e9923c7d83908a16e84a7ff3c0bcbf7d9c0bc5a8ba9500c301a1bdb9c5 SHA512 5b07fdd1375c28b2b4723dbb59bcb3ee2144085182e8722765965db530539302c9c6a76c0433525fcec38a5623a6e1044779bc91b46fa512fc0bfe27305a3129
 EBUILD uncrustify-0.72.0.ebuild 739 BLAKE2B 4e3de929909ab880480826c404e237a40102beae3068b47d7d5d7d6fb8017dadb5a34a24dd916d344f01dfd7309d55a493c8924cac80b2e7eaae320d286a0915 SHA512 c172e63fea583fa3e1ccd313379d08130b7c03eebaf012f75fe2d0eb264db60ed1addf6691e1d215716adebf693f448396006bcacb2f0cf2d23e4ea1a3b6eba2
 EBUILD uncrustify-9999.ebuild 748 BLAKE2B 8fc9c14f7784c1386a3f52c6a56e7e37c010afeb80d744ac2f368952e9ca012649bf1a57535052b601243cdaf6aa7e9918c2e3e1a5081991567440aaf681780f SHA512 c1c6665a8a3cf0726d781e8fb75b1098e4d57c8d9b2f0aa1e85345a666e26d52967e80da4f1dae8b507c01887861837f1171fa613b13286b4556657a83b07efc
 MISC metadata.xml 500 BLAKE2B bc52827b6bca6fe3529586004a180234601307881f2ffabc23bea7210093e42ca29fc4baf2a81f45793d9bcd2bfbd546622d7703b9680200159bbf8e52d76fcc SHA512 5a039d7b7a857226c80a557ceb868a625b85b3a2205437badb4c85241f4aa51c14b6aade595d52468347c998f8a5cf1bf0030ec932e54907387803b782387b38
diff --git a/dev-util/uncrustify/uncrustify-0.71.0.ebuild b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
index 5bd13fa54668..f1a9dd1829cd 100644
--- a/dev-util/uncrustify/uncrustify-0.71.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.71.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=7
@@ -14,7 +14,7 @@ fi
 
 inherit cmake ${scm_eclass}
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-any-r1
 
diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
index 63c57626a111..c88d49905779 100644
--- a/dev-util/weka/Manifest
+++ b/dev-util/weka/Manifest
@@ -1,7 +1,4 @@
-AUX weka-3.7.13-build.xml.patch 576 BLAKE2B aa7535a003410f9ec6aa091e3fd98918206803b1cba85684739648790ace23b4de82f5f07911983deebc91f64ed2882254179eaba490516c1fc11d537f5e180f SHA512 7d187da1ebd6f2e774ff8441d742eed37c9e804da2b9f6df905c02ceea2a5fdc2c210b7a195b052e7b4eeb062225b8bed315ad38ac9323adf8a3cf11fc29e143
 AUX weka-3.8.0-build.xml.patch 568 BLAKE2B 777233f959ec5adcfffb0e12042e11c0dce154a1ab8d54068a6a4d3bffcc059102ebbd96776c24488159230b4b6426a6d7ed7c55810cd98fe95347d340ec010c SHA512 8b1cd5ff6867bf5d43ec1b95d98288f1d035f37878c8fd99f33bb6389dd24e29ba8112f718c02b25cfbae6ed67f02c22643af39cae06e3a2d58081600a918c39
-DIST weka-3-7-13.zip 42159458 BLAKE2B ede4e225dac3d2eb875eaddfee8209a8c50b0095a885c4c9384703aa476d75ec9f1bc4dfcdc2e2874b623f0cf4090f281fe77d8363c1fb5300409c4a6e119f44 SHA512 aa15b857d3b3b35720468206e42a157cc8c63d6bf3f4fdda93845da7e4e4ffca0201b2b92056486a2245681f7e0052dc75959194be954d84b391e812bd49ce5e
 DIST weka-3-8-0.zip 50550487 BLAKE2B 85d7e68155c02f89e296ea1a4ee6e544287458135a941a4f618807f5c5b3e88edc6952fbdf632cfb642ef08fafcb7084dda3bda9269629610e8c532dd63d165e SHA512 7e38646a59e3d3d5fa314d269747ed7c526605253339e20f24bae55684a6cd77eeefb267b05825d8de44ae0e827873ba11ce6759b1d78a1a1975d100fd910b33
-EBUILD weka-3.7.13.ebuild 1461 BLAKE2B 4b43783512a70d6b67d3b042914ff3a6f0188fed3244808aa373cf2ff12b356ceab0366bc9ee7844ac843b0b576cbb9f1fe6327b4ec9ecabccaa03c9a88f798d SHA512 d6fa3b52b23adbf22c4cbd9e8fec9ef6a113ac83a68a98ca77f489dd364500670a93f21b570ae748437c0cb5d77ee017d9d8d9f608bd7352fd3ebf3a5f67ee9c
-EBUILD weka-3.8.0.ebuild 1776 BLAKE2B 233d1f1d2e51086bc78a5b8c6d2b99dea0eef5a998f8ba99a6c5ceccf22e99b243cae5c171fb69acac04a751d1115fe398615c51c2bdfd37d0348e44820c552c SHA512 f684824f58f527210c932662124d3ab3e3ff77398c4e592bf5e238a3caf57329d8536155a1a54e0efe14a9def8306325ef524ee5d00c1703d6bf1dc7448d80b1
+EBUILD weka-3.8.0.ebuild 1771 BLAKE2B 073161608febfc2558c8c0be594de5c78c9e9354f8faff2fddbf6576c1bd3435f44b523bd00575ac233ad544bad133dab80496d9c7b4f8c665dee60cfe4e4408 SHA512 4138be27eddd1b14019a2e29a973f044d5b9800c09d85bc0c32deb377d74c42860fe5476a920cfba0f385055e7f36f05b83570093a9a688bc5a9d173370de72d
 MISC metadata.xml 389 BLAKE2B 9b270710fd1ce5f8e0fb94fe524c8f197d73c796f7279e50cbc653251b147f7f3fe0eb14bcd70841a27dac14f68edebf1b1aad30f9db5c464d5f6ea831cace6d SHA512 4863d852d095b72a3854acf3d70492e2a77ed17ff079273e24b91a9a148f1d2ddedb11d387affeab69b5f00ad09eb73cbbeaae95455ff7ef62a4e0be4c694565
diff --git a/dev-util/weka/files/weka-3.7.13-build.xml.patch b/dev-util/weka/files/weka-3.7.13-build.xml.patch
deleted file mode 100644
index 05da33df23d6..000000000000
--- a/dev-util/weka/files/weka-3.7.13-build.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build.xml	2016-04-11 16:45:18.592385569 +0200
-+++ b/build.xml	2016-04-11 16:48:01.756389582 +0200
-@@ -603,13 +603,6 @@
-          <include name="**/*.default"/>
-        </fileset>
-     </copy>
--    <rmic base="${build}/classes"
--       classname="weka.experiment.RemoteEngine"/>
--    <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
--      <patternset>
--        <include name="java_cup/runtime/**/*"/>
--      </patternset>
--    </unzip>
-     <unzip src="${lib}/packageManager.jar" dest="${build}/classes">
-       <patternset>
-         <include name="org/**/*"/>
diff --git a/dev-util/weka/weka-3.7.13.ebuild b/dev-util/weka/weka-3.7.13.ebuild
deleted file mode 100644
index 3b118c2f74e3..000000000000
--- a/dev-util/weka/weka-3.7.13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-$(replace_all_version_separators '-')"
-DESCRIPTION="A Java data mining package"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	>=dev-java/javacup-0.11a_beta20060608:0"
-RDEPEND=">=virtual/jre-1.6
-	>=dev-java/javacup-0.11a_beta20060608:0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${P}-build.xml.patch)
-
-EANT_BUILD_TARGET="exejar"
-EANT_DOC_TARGET="docs"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-
-weka_get_max_memory() {
-	if use amd64; then
-		echo 512m
-	else
-		echo 256m
-	fi
-}
-
-src_prepare() {
-	unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
-	rm -v weka.jar || die
-	rm -rf doc || die
-	java-pkg_jar-from --into lib javacup
-
-	sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
-	default
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
-
-	# Really need a virtual to list all available drivers and pull the ones
-	# instaled
-	java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
-
-	use source && java-pkg_dosrc src/main/java/weka/
-
-	dodoc README
-
-	dodir /usr/share/${PN}/data/
-	insinto /usr/share/${PN}/data/
-	doins data/*
-}
diff --git a/dev-util/weka/weka-3.8.0.ebuild b/dev-util/weka/weka-3.8.0.ebuild
index 134f1ad611ba..e5bc75967bf2 100644
--- a/dev-util/weka/weka-3.8.0.ebuild
+++ b/dev-util/weka/weka-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND=">=virtual/jdk-1.7
 	app-arch/unzip
 	>=dev-java/javacup-0.11a_beta20060608:0"
author	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
commit	2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree	4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-util
parent	c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)