gentoo auto-resync : 31:08:2022 - 04:49:49

author: V3n3RiX <venerix@koprulu.sector> 2022-08-31 04:49:49 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-31 04:49:49 +0100
commit: c8f83ad526fb6b554daf375e0ad65eb2d56e669b (patch)
tree: cafe57965da48ad47a4e5e88ae7885492f21da6f
parent: 6cef603bfc4353c863a1a0b460a0aa882d2dc51c (diff)
237 files changed, 2472 insertions, 2924 deletions
diff --git a/Manifest b/Manifest
index c1a22250d1a1..164207025282 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29612 BLAKE2B 87cad0b7c480d27a7e4a53c6385584043aedbb66285db11141668da621bca215f148e0940180d44153e4bdd38179a18b1cd6c5f7f409d88818eff9595e0aca19 SHA512 cbbf34d9c4ad6087be8a76fee83780a3883f98c0b75b77e89b639088fbcb23391fb1b20d2f79bd1ec97d02909f4063bcd38e4a88154f30103d27b0947d1d03a5
-TIMESTAMP 2022-08-30T21:09:46Z
+MANIFEST Manifest.files.gz 29608 BLAKE2B 4f4c378e1edc3c1b1bfe42f985f0c928f50a810ab863891195b27cb40b6f95f492916f4bd1fd944185533eece9d47e9ccba458ad22277e177fa7a3f4ac11708c SHA512 16ed427cb4fcaaf9b6dd65733ec53506c44d7318d1ca409782c00910a8c0f05c041490ec6a3f9a9c54ebe90c4b203fad688c84dc451a9aea121b86a44cbee66d
+TIMESTAMP 2022-08-31T03:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMOfJpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMO0PtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC9CQ//cUN8ecKhVjqJDs7bMqMGomIZVUvjm8nVCIAjCK9oaz0qo9+PGzI5SXYJ
-4oFtBEZnTO0Q0XMmNGQLLq+Mwx9INAdl3ljO8xFwNDwK0dt2eyC2uJeNZeBIPpXQ
-YDfhL0kkwTkdr+NrOD1pk0oWtRgaiIww1QloHWZ9F54ya02wHFfr+hcEt+7qceNF
-OBPBaSsqWjaUMZxvlJa3YyWOUXfn09zm5/ss+xwes+zKLJ6E8rKlElasd1H45C5N
-kk4qbIn06xWPvo4YITqfN70JZWjKcJSYdfCY0rmfsOaoYTV847zb3+OSIY1OFBPq
-Cg7jTco/ztjX/rjXH2jl33ZFt5cIq4my6pp0RlwyNww0EZo5mfoCjiZJOU9CtyfK
-y3OguXl+vZaYFjpyqZ0y0whCTJkqp2Qj7N/nEk/0xSY4ocFK3QzY2YiP9Ge9i4FW
-/XHaDd9oIr5z8N+Q1w6bdEsQ+fQczWiYT+FscE2n+DC+W4zhzvtEjPXc7UVqq2Wp
-pUt4mI+F0V6kKJryT2cuyoy1ShOkW1ZNH3dIJvWfvQ+30zgeliTQXk+Ip6GAXiMd
-nb9pkO8fh8X7xlQzohV+5tx0pwyfgiL4ha0NyW6WZ2OO1nNlQj7TFpg+Tsc/LEUP
-Z4E+hOiez/UMoY6zNH1feyeHLp+LDL0gQVLiwjstAdEldXOTTnM=
-=5BBY
+klCToxAAnTvCcBkFHRQ96PDwAFgce3cDZ09TN6tDqH3iUAdmurBdrfzU16mmHVLH
+S4EZXDJeZkV/6OrO7HMusiDr5HCHXid18XMwdoXGnDRDP+V5yYpH6WHS70A/1pcy
+Lmf5YlMAwVX6Y84FbvxLqO6P76OiT/gOhFf/gefQr6z2WrdrhbYcmo/jsMDGO+sX
+h98m+uk32xFmiDZkh+ijHboZfl4h3T05LuLHF6Dk1NZwJ6y4lJCCrS3Tm3TToyOi
+lEHsrco94mdanuDgtn3Ti6SrZubgcBJGy5Twc6jFVXDjq6FP+Q+62ayF2YR+O+FW
+lk6YRsn+3T7+fQ8X0LoIhCYceR78/s0KFNZoXqd32QNSJ6Ak0Hefbfe0Db3UgCx5
+AQtKP33Bk1v52k0/4qnXxSTV0ifrZkU9WPQ4F53t8c/gCVe+sbsP9SMROj7pQX/t
+Y7gaBfVy30bNdE34/2Q+ygMCmNF9PIqVtnrZOAGkVul0YGgDv7gftl4tOnq16kcX
+VmxzbBsXsVeuZ674z1q4cB6v06QUKauNMkq51A7g4VJTLSbVgT4kstTH5OJ5tiqC
+oskvL03n/f6hEX9k50sSisr2rjuzSwS2r426nKx9uoXiKIoINBspeTXovskMNlYy
+4gn06Y+WySh2iv0rYeIOcT35RD8YnYwNAYmxlMWvodnBkkK+Zgg=
+=tR5+
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ffe254a3b1be..0c6984e37cd6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 33c56ec8d0c9..739ca876f768 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 05765b58470d..7e4eb4efd2e5 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,5 +1,4 @@
 AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
-AUX etcd-F_OFD_GETLK-fix.patch 868 BLAKE2B 478be67388bc9001c90031c47e001c8bcc0435433df44b42ea4c15cdb595d2169c0b2d05a4e774d20f7f971e64c08e132b736e8847cf0966c65bf1816f6a958c SHA512 4caf8a8a1f4363545d02695fed4a06ce96fdad181d5773188ae8c2ef95e4f4fbfee6d7906ece6bf0d85dd57e159f2a3774aa228f0e6e1da0cdfef63ced62a434
 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff
 DIST docker-20.10.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e8f7a4aefd89e5b374355bd7907f3ba5eaae37d7ce3aed0d1add8fa025b8e5ac3c46c4dc90adf757426fd40af39dbf SHA512 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4
 EBUILD docker-20.10.17.ebuild 8002 BLAKE2B a5967d16b5f5ad0cb674696e19451e0475ffb9edcfa9e49d9a236d68b3560fab38e2acc3952749023ff8bcdcede5babf464f21055c2c166e350ba9f9e9d748a8 SHA512 d9ad2d0cdc3aa182fbcbbfeaf596af1ffc369237a85440142c48be0f6d1a6c5b868e3a877e8d54222fa3ffe2ce9a435a5e4016398c62598fd931f4507a850206
diff --git a/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch b/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch
deleted file mode 100644
index bd574e26f040..000000000000
--- a/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ec81adb21605acd56b122bc35c53644b13d3ab7e Mon Sep 17 00:00:00 2001
-From: Moritz Both <mb@aldebaran.de>
-Date: Sun, 1 Nov 2020 23:20:12 +0100
-Subject: [PATCH] pkg/fileutil: fix constant for linux locking
-
-The constant F_OFD_GETLK is 36, not 37, according to
-/usr/include/bits/fcntl-linux.h
-Credits go to joakim-tjernlund who digged deep enough
-to find this.
-
-Fixes #31182
----
- pkg/fileutil/lock_linux.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pkg/fileutil/lock_linux.go b/pkg/fileutil/lock_linux.go
-index 939fea62381..004d35fa23b 100644
---- a/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go
-+++ b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go
-@@ -29,7 +29,7 @@ import (
- //
- // constants from /usr/include/bits/fcntl-linux.h
- const (
--	F_OFD_GETLK  = 37
-+	F_OFD_GETLK  = 36
- 	F_OFD_SETLK  = 37
- 	F_OFD_SETLKW = 38
- )
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 6b2fd8755f66..b3877b8247e7 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/company-ebuild/Manifest b/app-emacs/company-ebuild/Manifest
index b9450b8c18ec..3838a8cd01ad 100644
--- a/app-emacs/company-ebuild/Manifest
+++ b/app-emacs/company-ebuild/Manifest
@@ -1,7 +1,9 @@
 AUX 50company-ebuild-gentoo.el 210 BLAKE2B 669e2366c1c28ad32136578f1f996bfbcd94f654e9b683958f7efb0f542b07f5f580b293b706ab996df07a7e5d86fce2ea0ec4b69b734ac1065508c21d44fd6d SHA512 73814267000a349bbad229d1b172ba61a07733473fd53f0b5a88b6488edf85e95ecad7fb5e145ed423c9c55fa0ed65abec16d99dd5d8cd140407aeb2874508b9
 DIST company-ebuild-0.1.0.tar.gz 10938 BLAKE2B e89e389b49b32057a6acd72cf7a0eb68b10d005824287c112528e3136e7d969e3b678450fc997800d83b3c8f226030b0e2724c63b3ae82d78ad16af49bc10984 SHA512 bc7fec05fbc3600ce6b5111b4e1817bfe04f7185a6a33bf5b83291feb795f47b91f827960b29f844f2627e885a05cc156b755a468e5eb0c314345c869678ea17
 DIST company-ebuild-0.1.1.tar.gz 11059 BLAKE2B 5eba661f1956a019a133d3e61f997dcf2d9340c4a5f6d05920cba07e06e493e4358fabab6e16a48d1c081fc2c71f548e06511adf46b55a2fb30cef4ba2df71f5 SHA512 09bed101dcef18b07c2b51aa916b358f6e2ea526bd80dc997b280516ee074a62e006f3a0d748d77848f5e43412d4971841771cf40abe5b80a95477a21ad9d847
+DIST company-ebuild-0.1.2.tar.gz 11697 BLAKE2B e376626d13aa32a4df09ecdae2245b9c961a6e2cd615febfaaa626ac48ccd420b462a6195d9f769d64c37629c34929ba87e3ea6543e2344b62b217a51695870a SHA512 2a67c6ea6e53f78a6c41b2251b928cf7e97bb3f71c7c03057c540c699bd275898bdf8840d723cf5d8846dbbe82cc531f1cc2707181825fe05c4433ea80039011
 EBUILD company-ebuild-0.1.0.ebuild 611 BLAKE2B fb1fddcb8d3f45bb23339104a23f11544aa461c85f369d36bd273fb2b1e2f16f85d8d214cf04a78d8549bb81add36970ec6f4d14200fad2c5515bb9a4a7db148 SHA512 7a44d9c2d0e1701958e61de247d0c832c5b949273656ebfa454d9e00d4266fa00c41095797a6d1720bc0335c55b3ce5cbdc9750f4f6018a2203675ddb38c515e
 EBUILD company-ebuild-0.1.1.ebuild 611 BLAKE2B fb1fddcb8d3f45bb23339104a23f11544aa461c85f369d36bd273fb2b1e2f16f85d8d214cf04a78d8549bb81add36970ec6f4d14200fad2c5515bb9a4a7db148 SHA512 7a44d9c2d0e1701958e61de247d0c832c5b949273656ebfa454d9e00d4266fa00c41095797a6d1720bc0335c55b3ce5cbdc9750f4f6018a2203675ddb38c515e
-EBUILD company-ebuild-9999.ebuild 611 BLAKE2B bcc24db7ac0a15496de67948e74d76a40e3a737784557f6677e728e4a4159485a84c75210a5954d5a2df8ccb7686f721c1006fd63e12f9bc97d0c0dd89a147b4 SHA512 1b8705245b7035d51fb5ec363221cda33cf63bd819a3b63ecd4ca5e0a065c03f9d1f86e4b45de7ad12a8adfe0e5550468158bbfa7b3dcb496176f6782d0a8944
+EBUILD company-ebuild-0.1.2.ebuild 622 BLAKE2B 57f0ca4543f5e68c41ac86413a0bc68a81afc251235faf727407129535a615b28133b213a40037ec30967192001b8367a658175aebe66f8cb9e2727697ff354a SHA512 95154f84abe16382fe014ae6146125de349f822b4081edcb6ec95350481501bafa58c7f36bbfc36c4664a21161bf59168861d4e42cc30323d72e5334efda347e
+EBUILD company-ebuild-9999.ebuild 622 BLAKE2B 57f0ca4543f5e68c41ac86413a0bc68a81afc251235faf727407129535a615b28133b213a40037ec30967192001b8367a658175aebe66f8cb9e2727697ff354a SHA512 95154f84abe16382fe014ae6146125de349f822b4081edcb6ec95350481501bafa58c7f36bbfc36c4664a21161bf59168861d4e42cc30323d72e5334efda347e
 MISC metadata.xml 451 BLAKE2B 85cf2b33444f33f2dee8a0ccdfff3f83de7ab15d3233e0264dbceddb68382cdd551a6dcc691d71f52fbf8a3e7d1a1d041bab9b3dae0c91e81f7d7c3de8f3e2bc SHA512 4886219382c419a94a07041a0e4d0ed6622c45a0371cd0c70a912d391ee29db1a6e730c1134b8493e5edb299646f35df8eb799cfa311f3927256dba2cb345b55
diff --git a/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild b/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
new file mode 100644
index 000000000000..678f43ec2830
--- /dev/null
+++ b/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.2
+
+inherit elisp
+
+DESCRIPTION="Company backend for editing Ebuild files"
+HOMEPAGE="https://gitweb.gentoo.org/proj/company-ebuild.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	app-emacs/company-mode
+	app-emacs/ebuild-mode
+"
+BDEPEND="${RDEPEND}"
diff --git a/app-emacs/company-ebuild/company-ebuild-9999.ebuild b/app-emacs/company-ebuild/company-ebuild-9999.ebuild
index 34dbec0f495e..678f43ec2830 100644
--- a/app-emacs/company-ebuild/company-ebuild-9999.ebuild
+++ b/app-emacs/company-ebuild/company-ebuild-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index 26ad83fed8e1..410d00253d39 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -5,5 +5,5 @@ DIST company-mode-0.9.13.tar.gz 88074 BLAKE2B 8704d45d0dec15d7fbe39edcdaa3e34826
 DIST company-mode-0.9.13_p20220720.tar.gz 2198598 BLAKE2B 0dad09689e11b613397149fd0f6c16aa0e01a8d79bd7fc79b66b2ad32a48544ba1a1a6488c316477c793218432383b6ba784c171ada15ac6fe90cce07920ba9d SHA512 fea6d572fee0ecbd91fb41427d7e1eec462fd92da426af1011d1f5c590c2b6c793064c5d25aad49728a9fbbd25a010ee2e17a495115e7bd3587092f3cb4b9f8a
 EBUILD company-mode-0.9.10.ebuild 509 BLAKE2B 989fda1916d89b73575df28f7faaf3e9fc6c01e9b599bfa6c40f4624f8baab949dea1bca2bc2a4968307fc444eb972b079449bd4e560fb29cc92877ed6e35476 SHA512 4f7ad07ac7dc54c5b58ab2bbcefddcecd36199ebbe80602ef1ec3f01f061bef874c244db115fe00d2b90bb2947966ce8d715f80f5ef17c63d12c657660ef5535
 EBUILD company-mode-0.9.13.ebuild 509 BLAKE2B 989fda1916d89b73575df28f7faaf3e9fc6c01e9b599bfa6c40f4624f8baab949dea1bca2bc2a4968307fc444eb972b079449bd4e560fb29cc92877ed6e35476 SHA512 4f7ad07ac7dc54c5b58ab2bbcefddcecd36199ebbe80602ef1ec3f01f061bef874c244db115fe00d2b90bb2947966ce8d715f80f5ef17c63d12c657660ef5535
-EBUILD company-mode-0.9.13_p20220720.ebuild 863 BLAKE2B 268738237cb9a911d1da874b4bdd82effadafca35dd7c25d148f33fce7f656350a492eddd23bc5286f9a6d97094d9298806300f5fbe8efa953f5496a2740e354 SHA512 cba4e55e3444abccf14654555663862f16aba88188585497099dedd7864abdfd5f84bd0df80e3c0263cf7085650feadbb92cf39731f835047ee374ece6871011
+EBUILD company-mode-0.9.13_p20220720.ebuild 874 BLAKE2B 34a087cb6b9bf927175e0037cf276632bf5a7324e6c5fdc68c018539b3e6db638f33dd65f952c9a2ecf8b01b4b9c056d15fb55c54d9e39d642874fa1b2eb83df SHA512 5f5e50351ac5d836ff5d314a762171a243b0c7858d350074694e35088ddf63970e65bd73b78eae7a90f5a697c907fbdbe5aaf28ade0377993b316c7c3531d9d4
 MISC metadata.xml 371 BLAKE2B 802336a86d961a5eaa5079ff9a556a7bb435d9e52e9a8a901bfb6e49739b5e27ebe73f00016fe20fdc023f2dd1af4b2b082926011ae8ce2a9fa220e36475a2aa SHA512 93d3bf18ee05d67814ce1965b23a1b5274d37322eca0f02144eab1af23c13d5e811f026c6378e9f9b53d2e67a15e8b75730efbca16d07cc9afa684c1cbb10e1c
diff --git a/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
index a4fa43142ed0..c98be895bfb4 100644
--- a/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
+++ b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${H}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 
 PATCHES=( "${FILESDIR}"/${PN}-company-icons-root.patch )
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7c9e7cfcd391..5d317680baff 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/jaq/Manifest b/app-misc/jaq/Manifest
new file mode 100644
index 000000000000..bad54689f443
--- /dev/null
+++ b/app-misc/jaq/Manifest
@@ -0,0 +1,62 @@
+DIST ahash-0.3.8.crate 28650 BLAKE2B 93dcd622dc4497d0ce436461349119e96266c25278a7252a8cd295ced922b430895041ec767b6cbfdef57ada69e9b7bc67cce5155a6bdac9fe3c87c25e3a9e74 SHA512 dfd49903b0950a4fd3bf7432108f687322fd3771bce59126e2aee2a6ed5c2d8b31199090e96f31d549092b957f2cf470f201f2d65b1b838f7a182aee8a750a25
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST ariadne-0.1.5.crate 15971 BLAKE2B 40d6991a8d55418b65618fb17644825887f27974c05839920704d4dc436b760f710e2a3a8f4c44bd8549816f9bae6a17742177459e2bd76ce2f8faa2162be927 SHA512 0e91a24dda3142ebbcd5ba84146a02701538425b86acebe264fa2113a31a32ff7af0dd909fd203c58f11189f4862455df610b8536048eac91d1af037759989d2
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chumsky-0.8.0.crate 65390 BLAKE2B ae1c4112361b89c40b595b3cff83cd6b7c8d2ffb9d223b17e133d7e785d13dc1f870400b1c7d0166216a73ff09358f6e3839215a4a663dca5175dc7a374fd3e2 SHA512 92fc3e8151edb4aa06f16a46c8a8df0222e60bc9b4392433306d0f7bb623cd36c3c56b7b3ca5637cc72f99df8365395232236ea048fb09c46a96a9f409a7543d
+DIST clap-3.2.17.crate 213699 BLAKE2B d18204da5583f67b29646ee40f2784eb51e216eb750e24dbb4cf52421668a42e655443cf3e02cb18030422718aca73c6c0d577ca05a2c8ff1693bf5dfe85affc SHA512 e1b19b1c5f862883e2e1cdab14d7ed74c2d0a6b91aafa5b227426a004ef91a8b6c4749e023554ef64c0636f02cff1530d321f934b708168ecf5e7dbad68d08c5
+DIST clap_derive-3.2.17.crate 28217 BLAKE2B dd98874a39aeda5bef134043547295e370478511539ada89830077f3457a853305f48c75a9eaec24e81f5bbc4e5f9f9881beb355508f961673cb1cfced7cfb4b SHA512 c51682d2b5837502211388efb3e45cad67400314d43e0492b4d52f72acae5ed0b86bce870aafef52e97c0c84c6174318d759cb21ab32caecdeac6c1dd0c2a356
+DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
+DIST colored_json-2.1.0.crate 12336 BLAKE2B 3e1530874bb1d9c2589c769797838932c034183842ef47cea9c5f342328c9578dce260ad06a26012dea94420ec448bbc406222324108dad5d298cc00048e87d7 SHA512 f2e4ce51c16aadc930930791a3bc5f7c042372927c3a05261b6f8bd5c83d72849f6d6832f3eb883352655c58262807272f8a43b528807adfd1e45520afdb3649
+DIST const-random-0.1.13.crate 6646 BLAKE2B 8c2a610ce013a4e3bc4afd8b2475b79f1856011734eaacb7c116493ff279b142204feedae7fb2e075f89da02ed18f1af05e5b2b6d72730bf1c7dcc5088783797 SHA512 23f285deac9a41d7b24b93e94b161017ed4e2f388b3d67120f884ff67676f83228de4d56dd160d6d115391e92857d3ee0b8824f358b07bc28ef5017f7e974508
+DIST const-random-macro-0.1.13.crate 6359 BLAKE2B bb3325b35bd8a33438f35f5eae7ed140d296954d6c2efd92079ad2c1b9b1c388c13de55e27917ce435361f476d8972964b064b238482696294ec044b40729a46 SHA512 9c89b9a6164b58ed83cd888ae996a769d1d705a966fa1551f5024924638b7ac193cc6192dda84a34eebd1a66a2e26af1085aeed2afcd0f167a910e868df868b1
+DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
+DIST dyn-clone-1.0.9.crate 11903 BLAKE2B 4c214c596de7d223ed011150a80bfe940a72ad516b917b0abb55365630cdafd9388e75807f56973d3c9dc94befda541234d9c7529c3264e1a1302eacd5f290ba SHA512 6f19245781284fc25d621754a6de4bd53201bdc4b226e8513801a46aa237148e21a8b28a8bd187d5c2c6e74350de5dd580ac561113700ef343aef574010908be
+DIST either-1.7.0.crate 15492 BLAKE2B 3ed1c5c27e7bd9453f83b82d3f57a4a73f965b1943a7a17d3de45ee35f62db53976ba9f2055ba28c555500cda528ff3a2d7ad6cd957540c91f512bd3adf9c5e6 SHA512 894bf3980def07848a2911734c02eb0c5c5d2ff3ab7656413d2acfd164d120a7c075e0a5f3fb95243b8bda0257a5f457117d5c6eafc146f3f6aaf6c6fbc4cf33
+DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
+DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
+DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
+DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
+DIST itoa-1.0.3.crate 10481 BLAKE2B aa516e8b2fdea4e4e1260a0783fb7aa2672c1bccdf519c45c608fe3f3fd4fe652d7f56f0cd6eeb6a56bc324c68ff241f601660a0dc3c5ffdf7fa239f470078ec SHA512 1290c027ec8a13d2d15ace2b58a1d1a3a18730cd5fb55bc995826b8f4d04ede650b8315a8905f6737c4c4988690ae03bf32c86ab3a31ae068a67d5be04cd618b
+DIST jaq-0.8.0.gh.tar.gz 48565 BLAKE2B 73dbb57981bd13f1ff05bee43a7488767d37ed55514517fd3caf191243141a6818b7526153f2b48605f0a733ab28be4b2d05197e041fe89c1e9ae4b145ddad05 SHA512 01e0c55df068b1b5a08a80ce554aebf2be5fbc791932a4256e4011ffdae606a239f9e8b335cb70871e4d4190ba1ab4a78da525f0c54ba6cf20522a0e19f20d53
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.131.crate 595288 BLAKE2B d6377d0c4248068825d9cb78858e8204fe16fdfc9de81600a0312edd7479c73f61fdadeed214c11a67c4eebf242056ec1394b0d9e5226f63324228843e913837 SHA512 8f73e01e3f6d2283917e5fc01bf7b3fd69035e533fd6320b55e46fa7961ba36cd8e0613d6cb652ee9fe6a535b8d7f3b065844eea376c060cbc192af237398aef
+DIST libmimalloc-sys-0.1.25.crate 1131254 BLAKE2B b00d0d36585f50a899247113859b51909e13fd2a2e76cfb5f584cfa556152e4975a143abef7922856c47826f88da52eeebc6ab2dbcfdd464c53cd8064b27fb05 SHA512 45fa2448491750ba291fd2238df5412a1f9639831030681394f7620425cc90832f39a19293db3f6df4b13f181fb92798e874864934e6487c246540ce88d73fb3
+DIST mimalloc-0.1.29.crate 4988 BLAKE2B 8e63c21496e730ce63003b6f9128c703b5b50f845a640a1cc3364a649d4d3a5f8fa9a09f25fff9c94a7714c87ed2d43ee71c194ab5b98a29803561611d8dc743 SHA512 a3713c049b9d3b044746665c8d50b56d5e5f39738b1d023f4e5f9fb9e41a9a8bb1bd4b8e3b8f93e64904d96c288323b33356aca7ebbf3db672652645549785b1
+DIST once_cell-1.13.0.crate 31726 BLAKE2B 76519b97e04fbfd555c2ae034bd8a95525bbfdecffb7a3fc0fa7081a721b8243faa1269bd409d01a16a62186bddcba341ba13c167e8165b7b011f57aa393c715 SHA512 20a72f8741e6edc2b7f54eee822fdbea1b1c0120d3621059f61eca2d5adbcf044a474b5142871d37a3c0f90495224ec8fbb3b90e62660b66fde3a4d3a5add303
+DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
+DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
+DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
+DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
+DIST serde-1.0.143.crate 76400 BLAKE2B 119b6150d650306fad5e6b18ddce2d5dc0f3c1c0b7f2c602827b22243573fb1d606dc6d465f334a94640bb3c7a1b763d28c5c050f70067297c4d5e9eb2ac6792 SHA512 934f74aad56f3bd4f39be2e15a0f7afa718647df640166752b7417399354ba3e2584cbaeb54ef4accc9214fa936e584de657aa056dae0fd7cfe7676f1dd37df1
+DIST serde_derive-1.0.143.crate 54877 BLAKE2B 50b51622da22f8c9dec26803ee12cc590b00e266344dd1610aa5ea5c3f5442f5256cc31efb15ef4f633a7d9d6996bcaa2a679c210b00b9379457d10c15fd2f8f SHA512 ddbd58ebaf94dd2f534195dbb738bd88da5d10bba7c3a88e73207ec2b6dd78765649edf0a2632cfd43b7237929d3a93fab7838fe73dedd0c74310d4330776959
+DIST serde_json-1.0.83.crate 144566 BLAKE2B bb6f33e663dcfabc6d2bcf3341b4fe01e32d3bdcd9aa53abb21735b16955c927e0b0f5efc75351c72a364dbdd0dd22a7f0dd62170be85713b32130b62ed0e047 SHA512 e2694df141fe840eeba839de404c8a8f6becaa819012754d89a83653e19650c11e92d396a647d8a704dce8580d206cd2697dc2c12ce91de68627a576d9e0352f
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
+DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
+DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
+DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
+DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
+DIST unicode-ident-1.0.3.crate 35031 BLAKE2B d8d20829b97e7f1b9710feb6773cc5c4d25de6509772491e6f508a489285e32ec3a14ae689a1f1cd01ff5e2d4301b98579155535e03e240c8605b5737c9c5de5 SHA512 7ebdcfd7131a0e7a834f7e973b9cf813495259e0a0606539623d3f9bb51f9c6414908e71281d6a77397021e48d41c400a704c65990aaa8ca8d0a6095d9b3ed47
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+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-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
+EBUILD jaq-0.8.0.ebuild 1989 BLAKE2B e6a9b941948a1cf770ae1734c7c5befea26e400f48d62716106ce121c3262c7057d75d4f93e3fef2793b3a923f058f602d38bc9e02c6b9c202d45440cd9d865d SHA512 980e6dabad4e52ec841d61faae6f1b3abbbb58757146e99a1dc6619a41672c58d5f6f1558edc0f317080019b6058ad95ad4d71f55b95b618a2e730d8b507372a
+MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/app-misc/jaq/jaq-0.8.0.ebuild b/app-misc/jaq/jaq-0.8.0.ebuild
new file mode 100644
index 000000000000..b28f66abece4
--- /dev/null
+++ b/app-misc/jaq/jaq-0.8.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.2
+
+EAPI=8
+
+CRATES="
+	ahash-0.3.8
+	ansi_term-0.12.1
+	ariadne-0.1.5
+	atty-0.2.14
+	autocfg-1.1.0
+	bincode-1.3.3
+	bitflags-1.3.2
+	cc-1.0.73
+	cfg-if-1.0.0
+	chumsky-0.8.0
+	clap-3.2.17
+	clap_derive-3.2.17
+	clap_lex-0.2.4
+	colored_json-2.1.0
+	const-random-0.1.13
+	const-random-macro-0.1.13
+	crunchy-0.2.2
+	dyn-clone-1.0.9
+	either-1.7.0
+	fastrand-1.8.0
+	getrandom-0.2.7
+	hashbrown-0.12.3
+	heck-0.4.0
+	hermit-abi-0.1.19
+	indexmap-1.9.1
+	instant-0.1.12
+	itertools-0.10.3
+	itoa-1.0.3
+	lazy_static-1.4.0
+	libc-0.2.131
+	libmimalloc-sys-0.1.25
+	mimalloc-0.1.29
+	once_cell-1.13.0
+	os_str_bytes-6.3.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.43
+	quote-1.0.21
+	redox_syscall-0.2.16
+	remove_dir_all-0.5.3
+	ryu-1.0.11
+	serde-1.0.143
+	serde_derive-1.0.143
+	serde_json-1.0.83
+	strsim-0.10.0
+	syn-1.0.99
+	tempfile-3.3.0
+	termcolor-1.1.3
+	textwrap-0.15.0
+	tiny-keccak-2.0.2
+	unicode-ident-1.0.3
+	version_check-0.9.4
+	wasi-0.11.0+wasi-snapshot-preview1
+	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
+	yansi-0.5.1
+"
+
+inherit cargo
+
+DESCRIPTION="Just another JSON query tool"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/01mf02/jaq"
+SRC_URI="
+	https://github.com/01mf02/jaq/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 EPL-2.0 MIT Unicode-DFS-2016 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/jaq"
+
+DOCS=(
+	README.md
+)
+
+src_install() {
+	pushd "${S}/jaq" >/dev/null || die
+	cargo_src_install
+	popd >/dev/null || die
+	default
+}
diff --git a/app-misc/jaq/metadata.xml b/app-misc/jaq/metadata.xml
new file mode 100644
index 000000000000..bd6443d4a375
--- /dev/null
+++ b/app-misc/jaq/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7fe81dbb9ef7..688051ab9500 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index d805c6944fcd..63ddd4f783b7 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -1,5 +1,5 @@
 DIST elt-patches-20211104.tar.xz 41608 BLAKE2B 971ec0f6753267d49a64ab65645ac547322fa4cfe64b3102bbaa4419c0ed0973c0ee44e40c15b2d34e94979cbe9c64b027f4bb7c5adf3d3acee07f3f98bd7704 SHA512 c583bfa45eb16835f83a881eb587c81f0fb2cfd3eff5239e794efb83c046f5cecceeee3f5387585b9d7f68efe5f439344d2cdfc83c9fad5b207e82dff3d8cc67
-DIST elt-patches-20220830.tar.xz 41676 BLAKE2B 6f43e27d711c1f1dc50448faaabf5cd3503d798385a1bb645530d15096213b4ce229b99e96427533a3ae013f4e054d805fd0f7872ee5a0792fb3c97be7056ebf SHA512 32db0888b5f4e7fd660de2e3b561f729209f79c5df2e5daa00b6d1cbd9055f8504fe3bfa9ed8be4e49a621c57c1f3ea49307311c429e33bc5c3d7676b2b486af
+DIST elt-patches-20220831.tar.xz 41696 BLAKE2B c328faac2bc837fff5b9ec7dd2a891d3ab08ee30fb38d838fa6aeebbb832eb30db1f3d3b05e64c14f9cef27a21516cb6d960d7afe2314f37e25a0f77ef5d2862 SHA512 3cced1f515533ce65cef42a3c697ad0686a6c41a1b734c4558690cbdee4ebe60214b3d7f8dbb81974fc100a6882d83599f2dc77c206d9beea2449b2614319d1c
 EBUILD elt-patches-20211104.ebuild 902 BLAKE2B 28456c3949d47fe6ff34d1e7bee519ef99116455b1c65ec07c2b8d08effc1fa6f76b1afdec5da52a00c8d19778da6ae01c2b241553c36c4f3aeb0ba973eca270 SHA512 2bf0e90c142ecaa196db4574c9797a6ed4bc56b7abf3fc09d33a734dac959e20f3b81aca3814276b4f9ccc907760a62b21f6148505e5c9a9693b692ec5ca9a14
-EBUILD elt-patches-20220830.ebuild 908 BLAKE2B 97ee412c2c918029b588f1a29bc9e50f7a81123fe9c9fa8375f715a5efaa812a6e3bf494467af0a746b3a5f23b0b383c0033261b186e3ca14a705fd0e1804cdd SHA512 83966a41d5c859051e8fc13d85697ae470aa243596bd22d1857e8b96a445ba4fb0ec8509be2ab5237f4e1e4805943e3bdcc082547db05d27d8357aa8b89ab932
+EBUILD elt-patches-20220831.ebuild 908 BLAKE2B 97ee412c2c918029b588f1a29bc9e50f7a81123fe9c9fa8375f715a5efaa812a6e3bf494467af0a746b3a5f23b0b383c0033261b186e3ca14a705fd0e1804cdd SHA512 83966a41d5c859051e8fc13d85697ae470aa243596bd22d1857e8b96a445ba4fb0ec8509be2ab5237f4e1e4805943e3bdcc082547db05d27d8357aa8b89ab932
 MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/app-portage/elt-patches/elt-patches-20220830.ebuild b/app-portage/elt-patches/elt-patches-20220831.ebuild
index e9ea9fdac84e..e9ea9fdac84e 100644
--- a/app-portage/elt-patches/elt-patches-20220830.ebuild
+++ b/app-portage/elt-patches/elt-patches-20220831.ebuild
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 350b2f18437b..9d01ee7c9ce0 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/aixlog/Manifest b/dev-cpp/aixlog/Manifest
index 8ebc46e90fae..8d07c5b2f9ba 100644
--- a/dev-cpp/aixlog/Manifest
+++ b/dev-cpp/aixlog/Manifest
@@ -1,4 +1,4 @@
 DIST aixlog-1.5.0.tar.gz 14080 BLAKE2B 20042e44853da950cae80787e8b9692635f0935ff0b559054faaf6ac41db4de7ddef1ab071b4244f1338b81fa559ee9445aa643050f9e250587cbbc0aae5db3e SHA512 28556feac1fa804b8a4dc047471e0a6d4c4fb7d81487810d55b09dd1be878246b8bf9f2097b76a980284318823c287bd0a93dd7a3124425a1ea9aced757152b6
-EBUILD aixlog-1.5.0.ebuild 591 BLAKE2B 48de8e34ee83a20d7f76e9a51466f8fe17812ecc36ef8115234805afec42aa86d74539aeb919bea844618899c87a384c869dbda9f33e5962d450f11ed7136da1 SHA512 4f97b2ca0826db6179883c9a1a63a6401e49fe6649db5006179a1ef5847959ce9c3283d780ac804c87b24724f212b4c238a991a17c8bad2e4657feb188231dfa
+EBUILD aixlog-1.5.0.ebuild 589 BLAKE2B 012d3a687cb3c453db9f8f73c41dc5afdd94a7daa400ede050aa187f4797b4cb94d4afb860f4b69e4fb9cf654f17d22007dfed2060d03495dda2837741a26c65 SHA512 9878ab53a183c0b45193309a191d25a8f34be0d0ff3bd0b59aca7de77a528803ee42517b4568f9f254acb9e1adcc7ea15fad261185798e604d34a9e18f367dce
 EBUILD aixlog-9999.ebuild 567 BLAKE2B a0d0e1552b3b35d1eaa8193df63a259a512871631a5e7c6968f73099684acf87aac57d09302af6ad33ebe833998633c4ed2bcd9dfb1317c5b8fa6e4f3f53a58f SHA512 a4eef4b0a89f2bfb97ba52585e6f6e262560466a49a872c86e6968f9920c4a3861c89aba7d1a706059ceb506f3bb6ae38aac9d1eca96c988b39083ddaada19d3
 MISC metadata.xml 499 BLAKE2B 7dea962d454843ca3cde921a8dd30fadcb75f163f8ccf16a51b0d3de5176e8f6cae4788271f9924d5edd79e3e7b4ebe118e55f7397b8b5a8a8d1ec03d2a44241 SHA512 20dbf828621fdc1a4379192ed16d3f1e37bb8c5fe9974638f0b8e7c330d007133a589f5e8d23560d19de3c7c5eaa52c2d1e98d61be9326a998376a45c8f866b2
diff --git a/dev-cpp/aixlog/aixlog-1.5.0.ebuild b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
index 72420dcc99fd..0fa1c949ccc1 100644
--- a/dev-cpp/aixlog/aixlog-1.5.0.ebuild
+++ b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/popl/Manifest b/dev-cpp/popl/Manifest
index ebf2fe148b2f..19110e815f80 100644
--- a/dev-cpp/popl/Manifest
+++ b/dev-cpp/popl/Manifest
@@ -1,4 +1,4 @@
 DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609
-EBUILD popl-1.2.0.ebuild 601 BLAKE2B 368dac3c7c97cf3a33bc627e2b73a272f03754a0724233d3c29dcfb938baf829750b28a411d91b265c9f1fbe8f68a0126f5cdaf75da7fe85b589ab43aa861430 SHA512 8257e6e7753a5c93ebbe11b4e22f9e214ea6f485bf5c1d3e1585ab8aad6fa455afdd470eaaaff2bdff55869dcedd90a196238437faafdec0478c4f710fb63f12
+EBUILD popl-1.2.0.ebuild 600 BLAKE2B 9c97de9948456114e95e7877f9e53967c52a67e394a8947dd6757240f21ded1706ace67ec34349e862e38a45592efe17d47550b987e27bd008c6373ed7fc9b69 SHA512 fc0a1fff9f28198cd887488e49daa833be9ee9004a62a0d33133c0593caf8c4fa48f7681b0fe58815a6ec56b3ce26e99d52e5f8284f06494469c8dfd66031df8
 EBUILD popl-9999.ebuild 578 BLAKE2B 96cc325d37debbda1f48bf2437457aa2fb1d799b06bf2b2be989fdd695e530f3180de746f9838539d30a3500b650129d1e916990f15c9dde6234ec7657bea7e5 SHA512 4328adba89286af181433e60cf1fea305174e180d34b247e3ba99ea540f6901e190befca09fa271bcf4a06776447f60778bd563fcaed77a85bd062ed1b1a745c
 MISC metadata.xml 495 BLAKE2B eed70a06f91e5f2f284f708828dc7bf9313c37916a7fd45c86365a5d0ab5d86f45ccd2ffed49a546564cc0611affe73418387fe35ec62d8c2a8cfdd02b1bd6c8 SHA512 dad065db7693040ff15613a3b33978ba8ce3fc5119e1bc0e7f9bde36a263bbbd6302af634a47c358331811a9d318aef119901825195ffcbc86d9b7d5293e7252
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
index 347449326a2a..dd1abf126d2e 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 388ce838809b..146b7c4e66b8 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index 46a470c5f4d9..9c11ef52d7b3 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -1,9 +1,5 @@
 AUX sqlmap.bash-completion 5757 BLAKE2B f602d99b6b0a30cf405b390eaef355f7a4b4fa4260f0a18fe09a0fa7530af131b75ffc25ca161898f2ed4a93ef9251c0c88cb1ad25d78d870fd2ff19225e0609 SHA512 5024cfb2274a2798fcc7d12e59693253732f66c1389aed36cc31fb8e40d03f7e9a713e93e24711185b5d2d82dd2ac91ec2b6cdc4929c5ca3245fcb4f502d327a
-DIST sqlmap-1.6.6.tar.gz 7204158 BLAKE2B 40e4a896855270b98c89fc0a5d6060af51ec7d24da101688dbf2ec470741129a6193330be45e3ddd8d450bdfbcf4ccdf29bac47ba9e1d27eddf76490fc0777dc SHA512 9d680754ad82db660770d29b96c74a20c271dec8feff19f57f20c726a1776c86f685e538bb33c026ec49d48fadf981eb41cf6dd970c6100dc7a0c9dcd39c43cf
-DIST sqlmap-1.6.7.gh.tar.gz 7205694 BLAKE2B 35498643389a8393b4941665d33349b0e0a6263e3ed10e40b12631bf9d8e495374fffa6354c69f032b6da94fa07b667f5393def9cacf9069c088b63de4b13a67 SHA512 35707755a93fe4d23ea67670d08014acb4eb8d49d6743b5031ad02ef72939181099523cc768be9d4f7a4fb5773ddaad5eac22758ecd1aadcb36e33679fff36d1
 DIST sqlmap-1.6.8.gh.tar.gz 7205751 BLAKE2B 49fddc4b7c62c9baa5d6732bb9150bd2b3e48a671f9a3601ffc0821d5784fa02fbba37bc057ecd43888c2678ae477cca46b279e59b8a672310836218700df241 SHA512 e8849bb727ca84540fa9e44e580470aa6d853f7fcd1bddc2a51a5e4366a7eceedde80b3bd334f16753d5390ee0ac15fbd81551e79ada817bb11b6964dd439c9b
-EBUILD sqlmap-1.6.6.ebuild 1329 BLAKE2B 758cf03ec727a1e179b4c0bd26247874aa4ac5aeb6f10ab12bebfc0f1a55694d723d8cf0377f48451352f2c369246070647094324f907aebbd80ba94a68aea92 SHA512 f3eedb27fb4fb691591cfa8d7fb4b3e8e21d8aed8bd9cdf1c0d0e1b84fd20cb6bc117d88a84b3c396a12498cf8c68894546152a0170fd347f584bc8591dffa26
-EBUILD sqlmap-1.6.7.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 EBUILD sqlmap-1.6.8.ebuild 1332 BLAKE2B de701fae22dc510d882186d9ccb2b38ffd9159e1ad52408b6bf08994f9a26a83fa335d0a24ca884c3e4f85f54a46f600c7dd39163d63fdba52b14e3a49422431 SHA512 1b6efa626e7c37cfedec7c33bdb48f6c66825c6bf4e41bb61053959753654c6811f424dae6d9750c951bfdbab0f83ae2d798bca731cc771334c781089360184d
 EBUILD sqlmap-9999.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 MISC metadata.xml 847 BLAKE2B 31fdd4fd94a4b6ad8c775bbbc9cb48b5627f2f5944a7bdaf6c30f3559044dda6cd92be3b50c8baf462b1e2e4ea4aa905bbac88c616cbfbc833a4895a1944b0d6 SHA512 bddfbc5ce988bc1770a2ad1d6952d8ef44010c9e4ef789500f0408c7c5754960804f270bb6e24e4739852cdef07b3f22111ad9da453648730f045d0b2c3deea9
diff --git a/dev-db/sqlmap/sqlmap-1.6.6.ebuild b/dev-db/sqlmap/sqlmap-1.6.6.ebuild
deleted file mode 100644
index a1ffe637309f..000000000000
--- a/dev-db/sqlmap/sqlmap-1.6.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit bash-completion-r1 python-single-r1 wrapper
-
-DESCRIPTION="An automatic SQL injection and database takeover tool"
-HOMEPAGE="https://sqlmap.org/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
-else
-	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-# sqlmap (GPL-2+)
-# ansitrm (BSD)
-# beautifulsoup (BSD)
-# bottle (MIT)
-# chardet (LGPL-2.1+)
-# clientform (BSD)
-# colorama (BSD)
-# fcrypt (BSD-2)
-# identitywaf (MIT)
-# keepalive (LGPL-2.1+)
-# magic (MIT)
-# multipartpost (LGPL-2.1+)
-# ordereddict (MIT)
-# prettyprint (BSD-2)
-# pydes (public-domain)
-# six (MIT)
-# socks (BSD)
-# termcolor (BSD)
-# wininetpton (public-domain)
-LICENSE="BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( doc/ README.md )
-
-src_install () {
-	einstalldocs
-
-	insinto /usr/share/${PN}/
-	doins -r *
-	python_optimize "${ED}"/usr/share/${PN}
-
-	make_wrapper ${PN} \
-		"${EPYTHON} ${EPREFIX}/usr/share/${PN}/sqlmap.py"
-
-	newbashcomp "${FILESDIR}"/sqlmap.bash-completion sqlmap
-}
diff --git a/dev-db/sqlmap/sqlmap-1.6.7.ebuild b/dev-db/sqlmap/sqlmap-1.6.7.ebuild
deleted file mode 100644
index 6b74d8864800..000000000000
--- a/dev-db/sqlmap/sqlmap-1.6.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit bash-completion-r1 python-single-r1 wrapper
-
-DESCRIPTION="An automatic SQL injection and database takeover tool"
-HOMEPAGE="https://sqlmap.org/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
-else
-	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# sqlmap (GPL-2+)
-# ansitrm (BSD)
-# beautifulsoup (BSD)
-# bottle (MIT)
-# chardet (LGPL-2.1+)
-# clientform (BSD)
-# colorama (BSD)
-# fcrypt (BSD-2)
-# identitywaf (MIT)
-# keepalive (LGPL-2.1+)
-# magic (MIT)
-# multipartpost (LGPL-2.1+)
-# ordereddict (MIT)
-# prettyprint (BSD-2)
-# pydes (public-domain)
-# six (MIT)
-# socks (BSD)
-# termcolor (BSD)
-# wininetpton (public-domain)
-LICENSE="BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( doc/ README.md )
-
-src_install () {
-	einstalldocs
-
-	insinto /usr/share/${PN}/
-	doins -r *
-	python_optimize "${ED}"/usr/share/${PN}
-
-	make_wrapper ${PN} \
-		"${EPYTHON} ${EPREFIX}/usr/share/${PN}/sqlmap.py"
-
-	newbashcomp "${FILESDIR}"/sqlmap.bash-completion sqlmap
-}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 9c7e0325080b..9c4c7d8f281a 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 76ae3fe64126..6c0f665315fd 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -4,6 +4,8 @@ AUX godot-4.0-musl.patch 345 BLAKE2B 05057241c1e29ff886a38b815f68fcfe2b8c5e23fce
 AUX godot-4.0_alpha14-scons.patch 972 BLAKE2B e67f2350fdd18f66e3416320dac4d7fa0b9b44dc7c033f4970e7bb66d195515cf8fabed250225a661f8743d180fd60bf6410bb56a542fe582af277acaeb7461a SHA512 1a34bc6d1bc01de8eac127b71e1796263774b9059532755e990ff4ef6ad9f7ae0785bfeb8c2788e226189362d67354852aeaa33172127367c0a7cb0b2302745c
 DIST godot-3.5-stable.tar.xz 24044340 BLAKE2B 9d77ecdfa6bd90065fff26c2334f13c32bbbc4b26aad111b5aab2563d1e4782457ea6cf2115f1a809e0d8aac3d3ee9a138ad224998068983ad36e54a577d89c3 SHA512 23785e39ccc7e1406c97ee33b5e90f7f397aa907d79d72ed08ea3f4b7e68788030a1bcdd07c9f782a21ee3a84636a2cea47a57dcfc94c24e327fa210ae0515b0
 DIST godot-4.0-alpha14.tar.xz 30970116 BLAKE2B 213616f3a80f97c09580324bf9296d12b6213a2941b3070353b45e160dc7d7bfd32fcae3fc2b64a91fa7d935c23d97fd02a015bc3501441d67261ee6e45e85e1 SHA512 511cb5d3f48c747232350bee25765c17032b99179fd70877f906bcd1a09449260a928c3df9f84c6f3afb47f564b8f4bf75d0a07d37f5a22dd5f5a96d1b1f4df5
+DIST godot-4.0-alpha15.tar.xz 30959600 BLAKE2B 0631519d81147d64a01b543111b8317c436d4070f27cf54801a68a66b8d380e5ce33b85a78f09547ffc1b2573f9ac0c7860712808380849c26a0336c89d1c7f4 SHA512 47c750062e4e8262ee95e5b0337744e86b0092789a62c3847d27ab929281c414e5ca1d666a1f03f0a180203ee0f78f53e311976b52d54ee9f8a7b266afa3beb0
 EBUILD godot-3.5.ebuild 6747 BLAKE2B b19789b1ea9890973b16c2c6e7bc015f033fc218587e529a715ff2813e21c3fa8c89476c8f16cca707b2b93d35e2bd53ac7e6521af5c0aa088edd4e4a93b4fad SHA512 f6858b117eadca56a3539bf19d6ce1e8e04ade2e3b82a7abd49a30f89184681982d889eb82a5f9832107d8d5ad62326729eb286aaef4602e257391c0924e0e68
-EBUILD godot-4.0_alpha14.ebuild 7894 BLAKE2B 8781f4439fc378c6ea97e2aac50c9bd46c33a45a7b74a6f3f5a18c7ee07c5309a9575edcba6c9e082053713f6eed5f03534d6f06773e609e5b9b8c135cd8882e SHA512 227b5a40c40eaa4e07748bbef47f57f7d46b4972eaffe81dce47a996f4b66b37adc38dd59aa6fb429864bf7bef9faf9d2dab57bfe23ef3b0a801ded31f7adeec
+EBUILD godot-4.0_alpha14.ebuild 8188 BLAKE2B af2ce88e06a2e13147bf8fd248bc3a860c7e9bd81c4166fa3f60e913325ac3b70f56781e9baefec60cbd1158d0c7932cefc71451fbc53129a5c81d20e9472230 SHA512 96cb03edea657f5a790106e662bf08a502cad4416d3106a546961ccc7c7ced10157a77756910de8d58b85e8edee6aec54a80b529d6ae29f9a01c23e41fe21487
+EBUILD godot-4.0_alpha15.ebuild 8204 BLAKE2B d421ca65921c423f14806472ae5e2a67888a6a41097ec9bbc82b5d43b0c050f06509af4f072f44a664356f0afd87331f6ce01799bcc13184775c0d4398a7746f SHA512 2b9fe01040179702134edd1e6a5544f2866219367aff3486871b527fd26f8ad86383b153494cd3c2644f588abfa71fba077c7bae841a85ef5d799df3cb9d3216
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/godot-4.0_alpha14.ebuild b/dev-games/godot/godot-4.0_alpha14.ebuild
index 9844ed38787e..2e22a6f9fe5a 100644
--- a/dev-games/godot/godot-4.0_alpha14.ebuild
+++ b/dev-games/godot/godot-4.0_alpha14.ebuild
@@ -244,3 +244,13 @@ src_install() {
 	newins misc/dist/shell/_godot.zsh-completion _${s}
 	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]] && has_version ${CATEGORY}/${PN}:3; then
+		elog
+		elog "Remember to make backups before opening any Godot <=3.x projects in Godot 4."
+		elog "Automated migration is only partial, and it would be difficult to revert."
+	fi
+}
diff --git a/dev-games/godot/godot-4.0_alpha15.ebuild b/dev-games/godot/godot-4.0_alpha15.ebuild
new file mode 100644
index 000000000000..02df805c8f56
--- /dev/null
+++ b/dev-games/godot/godot-4.0_alpha15.ebuild
@@ -0,0 +1,256 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
+SLOT="4"
+#KEYWORDS="~amd64" # leaving 4 unkeyworded until at least first _beta
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	+dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +webp"
+RESTRICT="!test? ( test ) !tools? ( test ) !webp? ( test )"
+
+# dlopen: alsa-lib,dbus,fontconfig,pulseaudio,speech-dispatcher,udev
+RDEPEND="
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		dev-util/glslang
+		media-libs/alsa-lib
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader[X]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		dbus? ( sys-apps/dbus )
+		pulseaudio? ( media-libs/libpulse )
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		udev? ( virtual/udev )
+	)
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )"
+DEPEND="
+	${RDEPEND}
+	gui? (
+		dev-util/vulkan-headers
+		x11-base/xorg-proto
+	)
+	tools? ( test? ( dev-cpp/doctest ) )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-musl.patch
+	"${FILESDIR}"/${PN}-4.0_alpha14-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		doctest embree freetype glslang graphite harfbuzz icu4c libogg libpng
+		libtheora libvorbis libwebp mbedtls miniupnpc pcre2 recastnavigation
+		volk vulkan/include wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	# do symlinks to avoid too much patching with hardcoded header paths
+	mkdir thirdparty/lib{vorbis,ogg} || die
+	ln -s "${ESYSROOT}"/usr/include thirdparty/zstd || die
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+	ln -s "${ESYSROOT}"/usr/include/ogg thirdparty/libogg/ || die
+	ln -s "${ESYSROOT}"/usr/include/vorbis thirdparty/libvorbis/ || die
+}
+
+src_compile() {
+	local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		deprecated=$(usex deprecated)
+		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
+		fontconfig=$(usex fontconfig)
+		minizip=yes # uses a modified bundled copy
+		opengl3=$(usex gui)
+		pulseaudio=$(usex gui $(usex pulseaudio))
+		speechd=$(usex speech)
+		udev=$(usex gui $(usex udev))
+		use_dbus=$(usex gui $(usex dbus))
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui) # hard-required and favored by upstream over gles3
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but ignores whether the dep is
+		# actually used, so "enable" deleted builtins on disabled deps
+		builtin_certs=no
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=$(usex !gui)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=$(usex !upnp)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_pcre2=no
+		builtin_recast=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# also bundled but lacking a builtin_* switch:
+		#	amd-fsr, basis_universal, cvtt, etcpak, fonts, glad,
+		#	jpeg-compressor, meshoptimizer, minimp3, minizip (patched to
+		#	seek in archives), noise, oidn, openxr, spirv-reflect, thorvg,
+		#	tinyexr, vhacd, vulkan (minus include/) and the misc directory.
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_glslang_enabled=$(usex gui)
+		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
+		module_mono_enabled=no # unhandled
+		# note raycast is disabled on many arches, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these, e.g. can pass -flto as-is
+		debug_symbols=no
+		optimize=none
+		use_lto=no
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=release tools=no "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		# debug: debug for godot itself
+		# release_debug: debug for game development
+		# release: no debugging paths, only available with tools=no
+		target=$(usex debug{,} $(usex tools release_debug release))
+		tools=$(usex tools)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]] && has_version ${CATEGORY}/${PN}:3; then
+		elog
+		elog "Remember to make backups before opening any Godot <=3.x projects in Godot 4."
+		elog "Automated migration is only partial, and it would be difficult to revert."
+	fi
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4f9e2fe04d6d..6c15ad1a443e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 3d1c67b1b101..9f530a057eaf 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1,4 +1,3 @@
-AUX 2.2.3-build.xml 5712 BLAKE2B 334710114da891baa655f4cf6811967af323fb957a97259f13326d3ce16b30d3b13c7cc9a05b26a275eb95d6e220a4b409d66332469699a1e2d063a50905f652 SHA512 575a086222b4cb9728b36c7a8d9eb64e73438023a0a83b94549962d88aea9591fb847c7d866a830e991bff296d66bf9ebd79c5a93922f040c9d5ce432fbc78cc
 DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e
 EBUILD plexus-classworlds-2.6.0.ebuild 1826 BLAKE2B 3d895c77d5f78322e5aa01c67de9510d9d954f8c6d2e218ed915217bcb0aa39eceb560e776e5e1b66c138bc04fd8c3abc6bbc69d6f2f0c51e8c42b2d12503c07 SHA512 8750a0a72ca0cf670a520414925e0e094963840f0e946d0da719ef8932cb9d84ff9807af22de7e843acc9af113f5dd42b48d54c73b961be3e2cd4bf44662e8c5
 MISC metadata.xml 336 BLAKE2B 8a6a080ce1eb0fb9a9adb254c3ae535954cff1dd74eac0c2ac469b75398425fa4b2dff2373c04df1cfb57f3234724fe520bbfb3b42e6a941dfd6d60ec9846caa SHA512 3dd3629ddf804686af7d70c202009b5a594ceb0d12efd5e96e2bf6732891c8000c41fea3e2aefaab3037cd81b3129d1fe81deaa3e01005a446a94b221f193e3b
diff --git a/dev-java/plexus-classworlds/files/2.2.3-build.xml b/dev-java/plexus-classworlds/files/2.2.3-build.xml
deleted file mode 100644
index ed1e6fe4fb8f..000000000000
--- a/dev-java/plexus-classworlds/files/2.2.3-build.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="plexus-classworlds-from-maven" default="package" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="plexus-classworlds-2.2.3" />
-	<property name="maven.build.dir" value="target" />
-	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
-	<property name="maven.build.srcDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.0" value="src/main/resources" />
-	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
-	<property name="maven.build.testDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.0" value="src/test/resources" />
-	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
-	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
-	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath" />
-	<path id="build.test.classpath" />
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" excludes="org/codehaus/plexus/classworlds/event/*" encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.4" verbose="false" fork="false" source="1.4">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-	</target>
-
-	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
-		<mkdir dir="${maven.build.testOutputDir}" />
-		<javac destdir="${maven.build.testOutputDir}" excludes="org/codehaus/plexus/classworlds/event/*" encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.4" verbose="false" fork="false" source="1.4">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases">
-		<mkdir dir="${maven.test.reports}" />
-		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-			<sysproperty key="basedir" value="." />
-			<formatter type="xml" />
-			<formatter type="plain" usefile="false" />
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-				<pathelement location="${maven.build.testOutputDir}" />
-			</classpath>
-			<batchtest todir="${maven.test.reports}" unless="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/Test*.java" />
-					<include name="**/*Test.java" />
-					<include name="**/*TestCase.java" />
-					<exclude name="**/*Abstract*Test.java" />
-					<exclude name="**/*Abstract*TestCase.java" />
-					<exclude name="**/*TestUtil.java" />
-					<exclude name="**/*ConfiguratorTest.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/*Abstract*Test.java" />
-					<exclude name="**/*Abstract*TestCase.java" />
-					<exclude name="**/*TestUtil.java" />
-					<exclude name="**/*ConfiguratorTest.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-
-	<target name="test-junit-present">
-		<available classname="junit.framework.Test" property="junit.present" />
-	</target>
-
-	<target name="test-junit-status" depends="test-junit-present">
-		<condition property="junit.missing">
-			<and>
-				<isfalse value="${junit.present}" />
-				<isfalse value="${maven.test.skip}" />
-			</and>
-		</condition>
-		<condition property="junit.skipped">
-			<or>
-				<isfalse value="${junit.present}" />
-				<istrue value="${maven.test.skip}" />
-			</or>
-		</condition>
-	</target>
-
-	<target name="junit-missing" depends="test-junit-status" if="junit.missing">
-		<echo>=================================== WARNING ===================================</echo>
-		<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-		<echo>===============================================================================</echo>
-	</target>
-
-	<target name="javadoc" description="Generates the Javadoc of the application">
-		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" linksource="false" breakiterator="false" />
-	</target>
-
-	<target name="package" depends="compile,test" description="Package the application">
-		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
-	</target>
-
-	<target name="jar" depends="package" description="Builds the jar for the application" />
-
-	<target name="test-offline">
-		<condition property="maven.mode.offline">
-			<equals arg1="${maven.settings.offline}" arg2="true" />
-		</condition>
-	</target>
-</project>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 1aa5809a6ad5..3022204c9546 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 40df033a5a97..249c29f51ca1 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,7 +1,6 @@
 AUX ghc-7.0.4-CHOST-prefix.patch 276 BLAKE2B 77c706d291928a229edad6bcde37786b2c11cf52f42b22f44d3bbb7cfe12f83b8725cae020f95994e0f12022989b125d1f1e6f43ad0cc6698452264b8634651c SHA512 9d5d30b95c0467bb77f320c82458be5eaace5bbd77684725b9f3fd70d9640accdd771e36aa957c66f9bfb01e45088d32a5f811444b472058574ccbf89e10efbb
 AUX ghc-7.8.3-prim-lm.patch 444 BLAKE2B a930bb9657441a48941debf79711e06223c5680df0f60d7d972e0150950109bf8f8a99c35c7dbcda21172dddcb15d8a379085813e44647583e3888f27f597568 SHA512 6979e002589a54c870c70eee8357dad4feb55b4e5102350cc09a466145677dacaa1bab5ebe4818cf0d3cd8ab50ee0ec2ab642ab0fb3fd34f4a266e5e90f9f389
 AUX ghc-8.10.1-allow-cross-bootstrap.patch 541 BLAKE2B b77b3c9ebb7a33af6f82ec1b9927664e9bfce04450560a8e436ffa87feca50d606824192b7333e3b98d5552622592b6d39d0b184037ce646d6f7ebd205deb348 SHA512 d87a99ac96846e161d8c939079f8314d380be8e1dc62f956e3afcce1339a76447a14002b30bac1c86c807fd8eba23a0648912a3d074248f3513f9aadacd27489
-AUX ghc-8.10.3-C99-typo-ac270.patch 348 BLAKE2B 8d23baffa0ae781db4610ee78fea812ebc25450c94e942d8008c591cca78c6072c24b042e7a9dab08ae5213ed4ba931ff932ad4685fc029fc004039494a70c7f SHA512 9e224c6863b5f0f0deb032d4554dd41f2396a8cbc373b860294ba76feaf1abe7594711ac02e9a06356c024df8d6fc6a7a064ca428eaa1e4e6209b3a29d4317fb
 AUX ghc-8.10.5-modorigin-verbose-conflict.patch 956 BLAKE2B 8ce1e156c92d0d931930a4ad366f62be184be46beb1f25b92ad97be03d47c9702313be758c33a17c40002816a26e70f4017e4e02325f1513864086e50ac6136b SHA512 27f884e8b4e6250cbd2620a190531ae72693518da8cb56e736fe58bc436fca67ba9eb8d3fa89fcd0234858a8533ca3e15d5b0c20ed1953fba56736000fc8a732
 AUX ghc-8.2.1-darwin.patch 910 BLAKE2B 2f1a44dd7ead59301b5dd59c8cab932710655416640f2c8d5273cf07da4a45bf702d840768e2d32822e89f1b07cc9ed3a6110e1847e11468fca5c515e9e26f70 SHA512 0177fda8717d9158a99d96853feb1bf40ff13df8f5c5669c7c48f33accf69d6ddb05876776cda66705e85ee56c5ecff8f81722d8e748b6c2ed6b9bf611e42a2c
 AUX ghc-8.2.1_rc1-hp2ps-cross.patch 3865 BLAKE2B d68b1e15c091047d086be780dc0bb5ce2a1b713244ee240ae045052ccac947baf6a5bdea8cad50d0fac2984700069af7dcd320b96ca09af8c7b81021329da41c SHA512 d2ed48701216f5c03567e61c207e32d6218009380941275c690edd8eb0197728e7e3c0edb00d512792dc2041a958de82ceef393e96d3324b690157162e28d29a
@@ -12,8 +11,6 @@ AUX ghc-9.0.2-darwin.patch 916 BLAKE2B ece65347ee4d40ce729642766273792c5f619c5f2
 AUX ghc-9.0.2-disable-unboxed-arrays.patch 1298 BLAKE2B d3d8cf5b8f7f012cb93f6481822348c68e7ff79896664f51de5e4b248f8de68ea04144791bf8959b83ea265f384c055100fc27caf0da17f9a5a173c333928c4b SHA512 cc979c2fdb877716dee3fb75d9ee0734737f2f9a5611a0a1d20e2d603b48ebeaa339d09a130a79fce45eebe659a3741cf862b17eafecf814f408399139250806
 AUX ghc-9.0.2-fix-tests-python310.patch 1116 BLAKE2B fc7a7390cbbc737c66ea8401c9211318d078499bfd103f07ec2df0db9824041dfee279e364601a21d4d37a694a9442f3570c0333b2baab6173d6daa366c931da SHA512 0620ebffc49a06a65bd45bf324de4674b98e874291e6bebae1a95d585bbdf38cc201a734f7f20133880b46e9abf0839b59278688b00c892b94091d1c0257352b
 AUX ghc-9.0.2-modorigin-semigroup.patch 1210 BLAKE2B e29917dd740bded98257366ca37d3ac8fdc8ffd0e988e6286b8cf21fb9f0232ce1584a1a22665f4afad36e5585c29091040cac16b1204022f5a5f3328420c4ff SHA512 dc54fb02dfed55f5a9309c61ec23859ad4f80fd271fe0ccb41b786fc7d44bc0d9722069e2f56731c6af5ad1703c5081ba9e4b4e683911af4ad9b498f53b67a5e
-AUX ghc-9.0.2-modorigin.patch 1169 BLAKE2B 33a02689b5404bf28cd2a04dc601412db54ae1bb64611c3d7831a8478aadf38848f76042206b441983f07d505ad81fc3593625ee91c96e9bdacfb1621c4408a6 SHA512 f319ce4e4af1bdacefc0cc34e508bc9cb37307e5dd4e3b573af8c40232ec5669e094e9231b8fe9a6d21a2bce32fda2e443953ac5f14a7104232c03231cd337df
-AUX ghc-9.0.2-verbose-modunusable.patch 572 BLAKE2B 425b5cea58690a8856ee8f7054263dc65c40badedc88c819e7de0b466cac4e87246e03555b39823e5886a5ca28ac26f64d56cec1bf0b0654294ff61c9679bb2d SHA512 b84e459b12815d7fd42b87ecca95514e0f2f8132c53299f6e289efc4c47d618e49f19795249e1a9a328baa270a92b018184e6e9eb05062c01355ce06fd76b9e9
 AUX ghc-bash-completion 6496 BLAKE2B dc94a1979e886026a2fbe04bf7b45718ffa3e025a0e8945262e21a1243bfce6517fa1794f2ba6cd54cc853e93ad5d80472b9019b95762f10b5be83634a479955 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5
 DIST ghc-8.10.6-src.tar.xz 19932832 BLAKE2B f5d0c43aa5df87648e32beeb5ed6866b231cbce4f344fb03110db826b36bbac435f5e89d9ffeef3f87c15e830fdee6b95150b7bdcd06906575bfcd9c83797dff SHA512 6314eb9744d47d803b30b621bd12bf6179dad5cc578ec267b3a65b89e9c9b431bdb4913936f040c7ca4fcc71a676a43e78b5f6173d123a844e7f29004405b8b6
 DIST ghc-8.10.6-testsuite.tar.xz 2265044 BLAKE2B 72a1e955acecc92a720ee2747d96cacf56f2968c9deabb254c882a969c154baa0fdb639a857844ec91a4e47ee553dd13b58c3b790202e7e73500095c1ec85ee9 SHA512 f74d743bd8f889c2941be8fd5348e92abcaf75bce48140f7f9cc0c6ce33ba24a8479bef48631ffe2a10397c0ecf166b3bddb6ca8ee905859c029175de5d43f2a
diff --git a/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch b/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch
deleted file mode 100644
index 762622a07e00..000000000000
--- a/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-autoconf-2.70 does not allow macros with underscores.
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -673,7 +673,7 @@ AC_DEFUN([FP_SET_CFLAGS_C99],
-     CPPFLAGS="$$3"
-     unset ac_cv_prog_cc_c99
-     dnl perform detection
--    _AC_PROG_CC_C99
-+    AC_PROG_CC_C99
-     fp_cc_c99="$ac_cv_prog_cc_c99"
-     case "x$ac_cv_prog_cc_c99" in
-       x)   ;; # noop
diff --git a/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch b/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch
deleted file mode 100644
index 3c7053778e98..000000000000
--- a/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/compiler/GHC/Unit/State.hs b/compiler/GHC/Unit/State.hs
-index cefa5e5058bf68e68aaafadad0c7874189bf8225..92b38443c8378eb69db19a40d23abca47d6acee8 100644
---- a/compiler/GHC/Unit/State.hs
-+++ b/compiler/GHC/Unit/State.hs
-@@ -224,14 +224,16 @@ fromFlag :: ModuleOrigin
- fromFlag = ModOrigin Nothing [] [] True
- 
- instance Semigroup ModuleOrigin where
--    ModOrigin e res rhs f <> ModOrigin e' res' rhs' f' =
-+    x@(ModOrigin e res rhs f) <> y@(ModOrigin e' res' rhs' f') =
-         ModOrigin (g e e') (res ++ res') (rhs ++ rhs') (f || f')
-       where g (Just b) (Just b')
-                 | b == b'   = Just b
--                | otherwise = panic "ModOrigin: package both exposed/hidden"
-+                | otherwise = pprPanic "ModOrigin: package both exposed/hidden" $
-+                    text "x: " <> ppr x $$ text "y: " <> ppr y
-             g Nothing x = x
-             g x Nothing = x
--    _x <> _y = panic "ModOrigin: hidden module redefined"
-+    x <> y = pprPanic "ModOrigin: hidden module redefined" $
-+                 text "x: " <> ppr x $$ text "y: " <> ppr y
- 
- instance Monoid ModuleOrigin where
-     mempty = ModOrigin Nothing [] [] False
diff --git a/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch b/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch
deleted file mode 100644
index 13d12efdc0ec..000000000000
--- a/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ghc-9.0.2/compiler/GHC/Unit/State.hs ghc-9.0.2-r1/compiler/GHC/Unit/State.hs
---- ghc-9.0.2/compiler/GHC/Unit/State.hs	2021-10-19 05:20:00.000000000 -0600
-+++ ghc-9.0.2-r1/compiler/GHC/Unit/State.hs	2022-02-17 01:04:05.117930250 -0700
-@@ -194,7 +194,7 @@
- 
- instance Outputable ModuleOrigin where
-     ppr ModHidden = text "hidden module"
--    ppr (ModUnusable _) = text "unusable module"
-+    ppr (ModUnusable reason) = text "unusable module" $$ ppr reason
-     ppr (ModOrigin e res rhs f) = sep (punctuate comma (
-         (case e of
-             Nothing -> []
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1d28d39a0e25..2baa40871ded 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 0790a228ffb4..51150fa3a3c0 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,4 @@
 DIST keystone-0.9.2.tar.gz 4433222 BLAKE2B 5654ae6a66ccf6832fbdbb8c1083a2318e413bb833a0fadc4e1374f0de601e3dad9f354b1dec92d9a944621923458e432510299c1b55579ac9bb6b6e90a818de SHA512 5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b
-EBUILD keystone-0.9.2-r1.ebuild 2005 BLAKE2B 644a7d76b2672e68b31591790fe89112f5559a3382b11ea82a9e236b387ad45ef8ba9b6267b035a57dee1521f0be2dfad5a12bbeb1fac124e765facf599fca08 SHA512 f794e8192b71d589bc9f6bdc8910e7e637d4f6d020234ce59e84ba7a3baf372c79bf2261f884335d91e057baf62764b7cbe90d85273d8029f8c2a0ba1c74c25f
-EBUILD keystone-9999.ebuild 2005 BLAKE2B 644a7d76b2672e68b31591790fe89112f5559a3382b11ea82a9e236b387ad45ef8ba9b6267b035a57dee1521f0be2dfad5a12bbeb1fac124e765facf599fca08 SHA512 f794e8192b71d589bc9f6bdc8910e7e637d4f6d020234ce59e84ba7a3baf372c79bf2261f884335d91e057baf62764b7cbe90d85273d8029f8c2a0ba1c74c25f
+EBUILD keystone-0.9.2-r1.ebuild 2030 BLAKE2B bb014d629ca37df08d6d8915410be37381156a2653b0b2dcf493b6076cddd0476a0278aaf109abd5ea1ab04fe5ef753d7c05398eedb32bf8b5c4497b8a47099a SHA512 32eea0582795692a727e4c748c03147219e1a2555d1aea8a5ceb332ab18c516c8eb554e2f39435ca6d2932594d354e34e1b7b08aa0425b4eecfc25a117ddb815
+EBUILD keystone-9999.ebuild 2030 BLAKE2B bb014d629ca37df08d6d8915410be37381156a2653b0b2dcf493b6076cddd0476a0278aaf109abd5ea1ab04fe5ef753d7c05398eedb32bf8b5c4497b8a47099a SHA512 32eea0582795692a727e4c748c03147219e1a2555d1aea8a5ceb332ab18c516c8eb554e2f39435ca6d2932594d354e34e1b7b08aa0425b4eecfc25a117ddb815
 MISC metadata.xml 500 BLAKE2B 4b4e43ac4694c90c31773bede3c829801ab8ac33709a750bf574b3b4808fdb2ab10c655f16a6b19afbd9981eda154cf2fe40f62c0ade3457bad30fe013b37e38 SHA512 8380f6fbc99e23fbdcc5e820207b63082c903d5b41ff91a899acb1d6a6262eba63a17e4f930b8b56a6be1cb301b0605cc1a4413d62764208416017d520206785
diff --git a/dev-libs/keystone/keystone-0.9.2-r1.ebuild b/dev-libs/keystone/keystone-0.9.2-r1.ebuild
index f54ae624af81..68f71673a12f 100644
--- a/dev-libs/keystone/keystone-0.9.2-r1.ebuild
+++ b/dev-libs/keystone/keystone-0.9.2-r1.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 RESTRICT=test # only regression tests
 
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index f54ae624af81..68f71673a12f 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 RESTRICT=test # only regression tests
 
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 6c7b024bf48a..454ff24e038f 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -3,6 +3,9 @@ DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006
 DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea458513b0fdf99e8f6c015132b618fd0fefbe6a18ed514c20fbe1e56719dd6dd3762bc4bb6348a439146fdaa951090c0 SHA512 ba69d372263e63126d6ce24f67fe85d83f74e558db81391ddcd7eacb6787dcdd5209a149eebca897e9806f295e78f5a8ababa0ab884b85d9a8dd1a54507a8b0c
 DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a04719d708c217bc6f0b344f08d566bde85c4f758862c0ad61924346eac508542c2d9c6313cb1e3e421743e424f396dd1972e8195 SHA512 d7cd64101fed11ce33c4865dec253f1058acab376c3a6097422508087f4449b2f7fd1b38835915843106f620bf86694d846695e0c8a35f921e4f190dea3164bc
 DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be
+DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e03c31768a2183bae80a535234b23ac5bc9a2c3632d6c891ce72cbc1d6dc633a15b539111e322c2d210f993f99d6e5bd32f8a8b63 SHA512 14d1c6109de2ac02ba6cb5541746275f6deb25302b60cb3f65a7922b34d2c3bd5f17a4d730acf77a53d5837be00228c68fa06c6a2e9095ea97f6d8c4b782ab6b
+DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160
 EBUILD libsodium-1.0.18.ebuild 1563 BLAKE2B 436396cc79b476ac4ae42efcb9f5d41edde6544a57062b7ae11bc0a3796194a92ba0e463ae51219641cb3e599b38c300c1837c3215a79fbcb856fff8100e7e93 SHA512 0f0474831c5f0a315562e992942dc7c62e5527fbcdd760a60c1c8419e1a083cdde0faf6082fb9a519411de7c372e75eb5233830d61d99a5986be3c20ddb594cb
 EBUILD libsodium-1.0.18_p20210617.ebuild 2525 BLAKE2B 5a7ec4a44f5bb82dbbac1ad5b0c1ac2525922a41997a510d72f56434854dfe7b0246f64a5504181d78c1079d58d619f691644f249fb8ac4b9566b56f53051c3e SHA512 59e898b12d7b0eff6499fa21e830112a80713db65abeec3f985af6d9bce969ec4c12e8d7a214d7f95201fc88f4f180c6a556582a69896c056179d57e9c9f45de
+EBUILD libsodium-1.0.18_p20220618.ebuild 2523 BLAKE2B f9068d8d43d91576a54f8ed11cb5c13223ad4a7734fbd72cb268a2018c7d715be37beefaf316ded951bd784fe15482703a3794f1e64c049c23cdbe4310b24df4 SHA512 8c80cce37bd205dd6bb55cb489e9c9d544db3ef242c170636bcdada5a19d61c56edef0f840c5e9508595941f9764185e7e1afb9722a80c6339df9cd6ebfc52f3
 MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
new file mode 100644
index 000000000000..cc921b7865b0
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://libsodium.org"
+
+if [[ ${PV} == *_p* ]] ; then
+	MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
+	MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"
+
+	# We use _pN to represent 'stable releases'
+	# These are backports from upstream to the last release branch
+	# See https://download.libsodium.org/libsodium/releases/README.html
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+	# TODO: Could verify-sig.eclass support minisig? bug #783066
+	SRC_URI+=" verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )"
+
+	S="${WORKDIR}"/${PN}-stable
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jedisct1.asc
+	inherit verify-sig
+
+	SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.sig )"
+fi
+
+LICENSE="ISC"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+asm minimal static-libs +urandom"
+
+CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
+IUSE+=" ${CPU_USE[@]}"
+
+if [[ ${PV} == *_p* ]] ; then
+	IUSE+=" verify-sig"
+	BDEPEND+=" verify-sig? ( app-crypt/minisign )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == *_p* ]] ; then
+		if use verify-sig ; then
+			ebegin "Verifying signature using app-crypt/minisign"
+			minisign -V \
+				-P ${MINISIGN_KEY} \
+				-x "${DISTDIR}"/${P}.tar.gz.minisig \
+				-m "${DISTDIR}"/${P}.tar.gz
+			eend $? || die "Failed to verify distfile using minisign!"
+		fi
+
+		default
+	else
+		verify-sig_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable asm)
+		$(use_enable cpu_flags_x86_aes aesni)
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+		$(use_enable minimal)
+		$(use_enable static-libs static)
+		$(use_enable !urandom blocking-random)
+	)
+
+	# --disable-pie is needed on x86, see bug #512734
+	# TODO: Check if still needed?
+	if [[ ${ABI} == x86 ]] ; then
+		myeconfargs+=( --disable-pie )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libxlsxwriter/Manifest b/dev-libs/libxlsxwriter/Manifest
index ed606011aa30..3f6e715c0d7a 100644
--- a/dev-libs/libxlsxwriter/Manifest
+++ b/dev-libs/libxlsxwriter/Manifest
@@ -1,3 +1,4 @@
+AUX libxlsxwriter-1.1.4-fix-pkgconfig-version.patch 675 BLAKE2B 19771b0b921a613191695ab0dfc65dabf3941678df01e7241cc37b5dcb9544c59f917d9d0090781e525708b4e1fa314cd49b6887c9915e809f4111b3fe0d2831 SHA512 dd43e9b8738298dbf568f9fe7cc518ff44ecd352a01554af776506be6c815e51c954195f4bcd046dfeb35ced4d590824f4dc26881f03a70639486f8fee768797
 DIST libxlsxwriter-1.1.4.tar.gz 20442200 BLAKE2B 38308dd8e954820b6debf15bc884effd583c0e0fa1667ed4451085ff8cf1bf4101807110873a501617785763886c107c19ab30c16390b5fb608f52b2736465be SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5
-EBUILD libxlsxwriter-1.1.4.ebuild 1043 BLAKE2B ab85b1f43163662c721c2092190cfa6aebaf7cb8cbe46f46325410acf13b5aaaf18615204e36a09f6c9add6bcb2077c0b8a60b02bd0fa629eb3beb53961a4b83 SHA512 f6ce8cabce1adc0e6a98efa679e229aaa67d7aa47ee40777d290c1742f797e5b2185cb5c89bc145c0890d512c2105fec6405b107e27cdcd0dd63eef69ee0fb9a
+EBUILD libxlsxwriter-1.1.4-r1.ebuild 1104 BLAKE2B 8d8af2a9e607ed73d0252872c63d488bdfa4fae17d14264f50551fbc5911a751d634d028d384d6b6a0af714eb0c0a3112d1b30032a5462f85f14cc6bed523b38 SHA512 bea6d68ae84c21b7c829f8476a0093265a160c18bcf959ed296dccd8db85997b42066f37b10f2130290cdd84b9ac574391ab86e1e7729f586fc8d9e6f525b4bb
 MISC metadata.xml 579 BLAKE2B 0c3294a1f69d9cc7e3e95a37f2708ce4672cc931f28cdded82aadc9cdffb323ac4bd7518c61fee57ad30022617acb572625f3b6b0972fd903a1ae3afcf98aee1 SHA512 83d288575e27337692c3cd94bad56d8e2882240343b739eeed72742bd82e9177c45a81ef94ebab9e035b99431ecc2cf21723e408a90fa6b5f551e8a7f1f17a0d
diff --git a/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch b/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch
new file mode 100644
index 000000000000..a66ea82e944e
--- /dev/null
+++ b/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch
@@ -0,0 +1,18 @@
+Patch greedy dot star to fix mismatched pkg-config file version.
+Fixed upstream with: https://github.com/jmcnamara/libxlsxwriter/commit/12afb351db634ed9452eb2f38d68883a9538b8ef
+https://bugs.gentoo.org/859745
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -202,9 +202,9 @@
+ # Configure pkg-config
+ file(READ "include/xlsxwriter.h" ver)
+ 
+-string(REGEX MATCH "LXW_VERSION .*\"\(.*\)\".*" _ ${ver})
++string(REGEX MATCH "LXW_VERSION \"([^\"]+)\"" _ ${ver})
+ set(VERSION ${CMAKE_MATCH_1})
+-string(REGEX MATCH "LXW_SOVERSION .*\"\(.*\)\".*" _ ${ver})
++string(REGEX MATCH "LXW_SOVERSION \"([^\"]+)\"" _ ${ver})
+ set(SOVERSION ${CMAKE_MATCH_1})
+ set(PREFIX ${CMAKE_INSTALL_PREFIX})
+ 
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
index c31861ee337b..3006dcf4e7cd 100644
--- a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
@@ -21,6 +21,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-pkgconfig-version.patch
+)
+
 src_configure() {
 	DOUBLEFUNCTION=OFF
 	for x in $(plocale_get_locales); do
diff --git a/dev-libs/tlsh/Manifest b/dev-libs/tlsh/Manifest
index cbadc9711431..b89a06e253bf 100644
--- a/dev-libs/tlsh/Manifest
+++ b/dev-libs/tlsh/Manifest
@@ -1,5 +1,5 @@
 AUX tlsh-4.8.2-gnuinstalldirs.patch 1244 BLAKE2B 1369902e03db4837e02c01d63262545725b241a02f02462fd4fb41e7204dee9bae668bf16daf0990b083ced13d4234348ba3df220eab6d69fd77a1e3979b71f3 SHA512 68cf688a8587a301299efb5779ab47473a508e0f0cf6dc90e3ada21bda3cae25142da7d83b67098adef0f03cfbbea40952acffffcaf75c18842efeacb5bcfda8
 AUX tlsh-4.8.2-respect-flags.patch 820 BLAKE2B 9159f50d554168497ad9f416e4e002fd757a88543529fe6e2a180f6250399956bb6d967b06bc458e71b9dcf7f01cbb5d98d762ee65d9fd61392fd59b81dd25c4 SHA512 4b90021f2a01992d68d52f11b20a2ce9c4900216c8a6cd7c6fb95cfad20b44fbe37ab118ceee2811e65da7380e12960b5ddbf883198573491c2cf40f25b0fed1
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 699 BLAKE2B ed1a34f96de5342b1bb84a0f57cff06eabce5809090758c5d5573da32baca8381a534d1b85a9d9a67eeff4fbfffc01b5fbe55e3d5146e5b472263bcc2101002f SHA512 be6926b86788b163dd8362cd35ee30edd2b66eb92f50f4b6ede1b38cd6ea688e9f2b6da404bab85c31c7801545e2a8fcd3d129c8490ed570a7e7ea8afca3c3e2
+EBUILD tlsh-4.8.2.ebuild 706 BLAKE2B 416abbac42e1cf953b51dbdb3645e24e2b13c4ed4a093c009fdb63c572265d23733ee9842511d125fb556f03ac95312a46af6424a000c6e8c8dc8e7500667ec9 SHA512 fff9be4b937b8fad1dd8737b3811b8d1fdeee625490b5ebeb5704c7aed6e0300551c97a4d20fc3f18dfff68da57c1b56046cde64ac5cb4ba4bf498dda5e43f98
 MISC metadata.xml 471 BLAKE2B 2e17c59829f15d1439933fef59fd14a8525723aae1de1c640c8a83a9df612776ff33d24904a30ffcf27eddcd9c778af09d6d65c3b4e66542288810f416ca0ec4 SHA512 e8a8759d526e1d0b9607f84df503440a650f5835c864c0c5c89c5f978b58839620e2ed7e0bc39af51e38e1da1fe86fac1a398394069f4b3820219db40254a284
diff --git a/dev-libs/tlsh/tlsh-4.8.2.ebuild b/dev-libs/tlsh/tlsh-4.8.2.ebuild
index 4959d64e815f..6b964ea89a55 100644
--- a/dev-libs/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-libs/tlsh/tlsh-4.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gnuinstalldirs.patch
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 8601418d05c6..48162ef27917 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index 58c0e41723dd..16594c69ddb9 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,5 @@
 DIST luasec-1.1.0.tar.gz 53060 BLAKE2B c89e8feea3cb66108ed72c81e1525397bd3c58a25372661b49cbc7bb0fa1f4ab81e39b6065d99fc3e376333f36f9290b136c31e654a30248a6a1d30beaa5d5b2 SHA512 ce08be2c62e97ebfab30e867790874030d404d195ce336b149d9501d652e9b8efe201cc2d0bcbb3be16214d7e4763b5871e45cbc22db758724baab9f7cd78568
 DIST luasec-1.2.0.tar.gz 53379 BLAKE2B dad93b341565b602fa02a5551a127bce42e76cee5abb0314f9cc4a98f162d23b0f8b4b9c0f16423095e4b54ec5ab260ee06bef5993ad46f559ad1295dcc28856 SHA512 5564f73495bef7c5683285ff7648c7b82a3a3dfdce96e88c77cc8835427b6595a694e5a2bf0a4f6332fe52b8aed3d94531607df81260d7597458a6fb0465d3fe
 EBUILD luasec-1.1.0.ebuild 1737 BLAKE2B 633fd25ccf721edb600c479956f37504d46bca254e6df6f512325fbfa6c1964d07fe16256df50cb950358321993686de87bfa1d732a4550dc8c7718de1cc2202 SHA512 41d17718b574d404deb383f45b98de42271ab443b3e7f9069363008c1188ab17e720a6d52d7428a4ea69288f524880110f768ccfb0e1f37c03977be1241b9159
-EBUILD luasec-1.2.0.ebuild 1743 BLAKE2B f6cc6e3266f17d834a7df928d87672ab6b35496e839ebfa162b4b58691073eb875a5eb6dc6d600a358f2eed0ee96173ec591e00eeea8e5c3c1a030692d1ff95f SHA512 feab6792b3c828f637271e70a16298793c32a1a6b726e2aa6553211aefa7f8373190a503a777b0c0c0504de2d7fc05aa689b9dc6687bce71b296f53929e8120c
+EBUILD luasec-1.2.0.ebuild 1740 BLAKE2B c25989cebcddfe5006ce29d25e0c2110d13e639e911cd19619d1f09e404d2e6561bc6839e396c205babd7b451f703bfe0c56c01e23b43fb9778772482c03bf32 SHA512 234b90b3c70504fa68dbe450657b1b110ee2129360d1810f0febf2dba9c7bafb172286b0b177d7fd10ec4e7f832b7b9d7e6148c1d6709528aba84b9cbe058909
 MISC metadata.xml 597 BLAKE2B 6398ca37e0d10458a7b1a111d2d0e8d44aa64136ada116a8bb73bf200be4c10f673c8f574733043eb7b2216c28b003c30a993736145344ae72ef25f001a5783e SHA512 399501a7a9c0b08d8747b30478a3810dde63efb48d2d42eeff1ba7355c882e35fd3528424930f618d51182f80641c1c6fb4662b31ec21cf38abd0f0fde0d17dd
diff --git a/dev-lua/luasec/luasec-1.2.0.ebuild b/dev-lua/luasec/luasec-1.2.0.ebuild
index 3e6906534f17..6d87e11bbfb3 100644
--- a/dev-lua/luasec/luasec-1.2.0.ebuild
+++ b/dev-lua/luasec/luasec-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}]
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0103606bdfc3..3f3f36c55761 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index 9d294e0529eb..62b64d323b89 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,7 +1,10 @@
 AUX pytest-salt-factories-0.121.1-tests.patch 12284 BLAKE2B 4374c59c530d5e0171763b376ecf883354ada4255943017ac60361309dc5799ef563233474a5fa1756e7193285e46d7186973c8413b558dfcb3408cd42aecb6f SHA512 08ef49871ca4882dcd57a51c99e40fb87267ff07c666c54ba475061fb113f5e985c0c23f586366c33cb00b07bc190b98e6d7bb080004ee8b7c171bdb016f9ef8
 AUX pytest-salt-factories-1.0.0_rc13-tests.patch 16967 BLAKE2B 804b5e2ce678e732f8e01b3f652bb9f6a82caed3886e552dd359e27da40e5bb7fbff336828f944b2e0455399d78b7bc2defce37b641b1737e155beff5a4e72bd SHA512 bc6abcd079afc560815c00c900e350b468b572d67417f18d3a4f559bc5fb02b7e703a17afda7011c9682f55c09eb19b09250ac06c5135478235e03233c588fe1
+AUX pytest-salt-factories-1.0.0_rc20-tests.patch 17428 BLAKE2B e52c44dc43f08f7933fbcea60e4ba39351cdaae79dc4037a490ae222cd41286feb308c66abe90116417f72ac0aa3c968dc30afd914545f3c08ce5f4c75d43a85 SHA512 6ac3af11d518834125fd41e9e3b49a383079cdd48888044b3009eea4f0a066fe2b8b8d20a8fc7cf6331cd8269c98140d5203dcf0f5a64504c952d8a5bd652ef2
 DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
 DIST pytest-salt-factories-1.0.0_rc13.tar.gz 148418 BLAKE2B 3688f05d137df23266ebc7e999bc3b3a8ec198173b38dc98bd4a1e2655b982a37485278691e970da0be700cee6f609c57933b041a6d8403e75fb197f5d23d5d4 SHA512 f3713410704540ee48b7263973d3a9bf3159fb63e53e5ef5002201aea3fdcf0b4eaf00e1dd1e67d869b42242985d8117a117568d63abf5ad366e247fb3e1d83f
+DIST pytest-salt-factories-1.0.0_rc20.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b
 EBUILD pytest-salt-factories-0.121.1-r1.ebuild 1724 BLAKE2B 83786447369717e7f414a154abf586dd1c87581f5809ba313ed954767f65ffb176b31c2e7d50523524619a703b601f8643c0134e0b564a2bbfa97d99a51ecc82 SHA512 889d5bfba0d62b48a9fef8327f11f31f7683d6d9107e9b9b537fa51eea66b7aa37f598da10f1836f68c95ad86eedda0ed5c0649aefde063cfa38b8402776fd23
 EBUILD pytest-salt-factories-1.0.0_rc13.ebuild 2004 BLAKE2B be652e742fdaa0885645a3f95f0c7789a5fbb7e5eec986fc26abecdcd191e9e0c7cef4e78a22c61d5e3703f3cb51153d1dfbebebacd9f8b1d76438a1766ddbb1 SHA512 354e0fb4e3a8aacd1ca2b4e3f13f7f24a882cb7b52e9fe4dde4a76172bb834db9232e17c296339cb67dafc7932fbd6ff04e66ebcaa5c468c5926c50f94e68a7e
+EBUILD pytest-salt-factories-1.0.0_rc20.ebuild 2012 BLAKE2B 77293f8c4e6a8839990b8510f0da1c2d60b4857c0ecf7ce24398519127c8ed4d8afa9193673d407f5876c42bcdf761ce83c1ddcfb539a6afb4620d813df87ea4 SHA512 52cf0336a5e83b27ddbcc2afab26735ce9643d38ccc21643e7e8aa7da6cf2735d88971d8e256ff4fbf5f2701e0dfd3b2b4ace959a7ad376583a308959589c29c
 MISC metadata.xml 358 BLAKE2B 0ca310e1a7269e532dfe3610bf5c9a1d93ff8dcc46ee3f26322cfb0ba1fb572b521359547f49b0deb3f463efd0321e3b3bee0403878df676e3c54dbcac14753a SHA512 8eaf37e98efe76ff401c536368d1537255d09db93b4f84254b7eb291b603f6ee83d80a65e9529c7bcea8324baaff708dc12f97662dd87c57fece36a1d5d8e1c9
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc20-tests.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc20-tests.patch
new file mode 100644
index 000000000000..cd201af5b9f3
--- /dev/null
+++ b/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc20-tests.patch
@@ -0,0 +1,423 @@
+diff --git a/src/saltfactories/plugins/__init__.py b/src/saltfactories/plugins/__init__.py
+index efb8911..14af8fe 100644
+--- a/src/saltfactories/plugins/__init__.py
++++ b/src/saltfactories/plugins/__init__.py
+@@ -28,7 +28,7 @@ def pytest_tempdir_temproot():
+         tempdir = "/tmp"
+     else:
+         tempdir = os.environ.get("TMPDIR") or tempfile.gettempdir()
+-    return os.path.abspath(os.path.realpath(tempdir))
++    return tempdir
+ 
+ 
+ def pytest_tempdir_basename():
+diff --git a/tests/functional/factories/base/test_salt_daemon_factory.py b/tests/functional/factories/base/test_salt_daemon_factory.py
+index 70d8d62..260e40c 100644
+--- a/tests/functional/factories/base/test_salt_daemon_factory.py
++++ b/tests/functional/factories/base/test_salt_daemon_factory.py
+@@ -36,7 +36,7 @@ def test_extra_cli_arguments_after_first_failure(
+     This test asserts that after the first start failure, the extra_cli_arguments_after_first_start_failure
+     arguments are added
+     """
+-    output_file = tmp_path.joinpath("output.txt").resolve()
++    output_file = tmp_path.joinpath("output.txt")
+     config = {"conf_file": config_file, "id": master_id}
+     script = tempfiles.makepyfile(
+         r"""
+diff --git a/tests/functional/factories/daemons/test_container_factory.py b/tests/functional/factories/daemons/test_container_factory.py
+index d060214..3837074 100644
+--- a/tests/functional/factories/daemons/test_container_factory.py
++++ b/tests/functional/factories/daemons/test_container_factory.py
+@@ -18,6 +18,7 @@ def _connectable_docker_client():
+         pytest.skip("Failed to instantiate a docker client: {}".format(exc))
+ 
+ 
++@pytest.mark.skip("Needs network access")
+ @pytest.mark.parametrize("skip_on_pull_failure", [True, False])
+ def test_skip_on_pull_failure(pytester, skip_on_pull_failure):
+     pytester.makepyfile(
+diff --git a/tests/functional/markers/test_requires_salt_modules.py b/tests/functional/markers/test_requires_salt_modules.py
+index 97ed1ec..53ff0dd 100644
+--- a/tests/functional/markers/test_requires_salt_modules.py
++++ b/tests/functional/markers/test_requires_salt_modules.py
+@@ -1,9 +1,11 @@
+ """
+ Test the ``@pytest.mark.requires_salt_modules`` marker.
+ """
++import sys
+ import pytest
+ 
+ 
++@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
+ @pytest.mark.parametrize(
+     "modules",
+     [
+@@ -29,6 +31,7 @@ def test_has_required_salt_module(pytester, modules):
+     res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
+ 
+ 
++@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
+ @pytest.mark.parametrize(
+     "modules",
+     [
+@@ -54,6 +57,7 @@ def test_missing_required_salt_module(pytester, modules):
+     res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
+ 
+ 
++@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
+ def test_has_required_custom_salt_module(pytester):
+     pytester.makepyfile(
+         r"""
+diff --git a/tests/functional/markers/test_requires_salt_states.py b/tests/functional/markers/test_requires_salt_states.py
+index f6d63a9..ec4b431 100644
+--- a/tests/functional/markers/test_requires_salt_states.py
++++ b/tests/functional/markers/test_requires_salt_states.py
+@@ -1,9 +1,11 @@
+ """
+ Test the ``@pytest.mark.requires_salt_states`` marker.
+ """
++import sys
+ import pytest
+ 
+ 
++@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
+ @pytest.mark.parametrize(
+     "modules",
+     [
+@@ -29,6 +31,7 @@ def test_has_required_salt_state(pytester, modules):
+     res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
+ 
+ 
++@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
+ @pytest.mark.parametrize(
+     "modules",
+     [
+@@ -54,6 +57,7 @@ def test_missing_required_salt_state(pytester, modules):
+     res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
+ 
+ 
++@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
+ def test_has_required_custom_salt_state(pytester):
+     pytester.makepyfile(
+         r"""
+diff --git a/tests/functional/test_sys_info.py b/tests/functional/test_sys_info.py
+index c8fbf6e..f18c85d 100644
+--- a/tests/functional/test_sys_info.py
++++ b/tests/functional/test_sys_info.py
+@@ -1,9 +1,11 @@
+ """
+ Tests related to system information reports enabled by the `--sys-info` flag..
+ """
++import sys
+ import pytest
+ 
+ 
++@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
+ @pytest.mark.parametrize("flag", ["--sysinfo", "--sys-info"])
+ def test_sysinfo(pytester, flag):
+     pytester.makepyfile(
+@@ -27,6 +29,7 @@ def test_sysinfo(pytester, flag):
+     )
+ 
+ 
++@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
+ def test_no_sysinfo(pytester):
+     pytester.makepyfile(
+         """
+diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py
+index 9c4fdb0..0766fe7 100644
+--- a/tests/integration/factories/cli/test_salt.py
++++ b/tests/integration/factories/cli/test_salt.py
+@@ -14,6 +14,7 @@ def salt_minion_2(salt_master, salt_minion):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     ret = salt_cli.run("test.ping", minion_tgt="*")
+     assert ret.returncode == 0, ret
+@@ -24,6 +25,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     assert ret.data[salt_minion_2.id] is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2):
+     ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False)
+     assert ret.returncode == 0, ret
+diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py
+index d6fd060..aade16e 100644
+--- a/tests/integration/factories/daemons/api/test_api.py
++++ b/tests/integration/factories/daemons/api/test_api.py
+@@ -19,5 +19,6 @@ def salt_api(master):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_api(salt_api):
+     assert salt_api.is_running()
+diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py
+index bfab01f..0494ebb 100644
+--- a/tests/integration/factories/daemons/api/test_restarts.py
++++ b/tests/integration/factories/daemons/api/test_restarts.py
+@@ -12,6 +12,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.salt_api_daemon()
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py
+index 648781d..cb051c4 100644
+--- a/tests/integration/factories/daemons/master/test_master.py
++++ b/tests/integration/factories/daemons/master/test_master.py
+@@ -1,3 +1,4 @@
++import sys
+ import pytest
+ import salt.defaults.exitcodes
+ from pytestshellutils.exceptions import FactoryNotStarted
+@@ -48,10 +49,12 @@ def salt_call(minion, salt_cli_timeout):
+     return minion.salt_call_cli(timeout=salt_cli_timeout)
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_master(master):
+     assert master.is_running()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_run(master, salt_run):
+     max_open_files_config_value = master.config["max_open_files"]
+     ret = salt_run.run("config.get", "max_open_files")
+@@ -59,6 +62,7 @@ def test_salt_run(master, salt_run):
+     assert ret.data == max_open_files_config_value
+ 
+ 
++@pytest.mark.skip("Needs network access")
+ def test_salt_cp_minion_id_as_first_argument(master, minion, salt_cp, tempfiles, tmp_path):
+     """
+     Test copying a file from the master any minions connected
+@@ -75,6 +79,7 @@ def test_salt_cp_minion_id_as_first_argument(master, minion, salt_cp, tempfiles,
+     assert dest.read_text() == contents
+ 
+ 
++@pytest.mark.skip("Needs network access")
+ def test_salt_cp_explicit_minion_tgt(master, minion, salt_cp, tempfiles, tmp_path):
+     """
+     Test copying a file from the master to the minion
+@@ -91,6 +96,7 @@ def test_salt_cp_explicit_minion_tgt(master, minion, salt_cp, tempfiles, tmp_pat
+     assert dest.read_text() == contents
+ 
+ 
++@pytest.mark.skip("Needs network access")
+ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles, tmp_path):
+     assert master.is_running()
+     assert minion.is_running()
+diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py
+index 683970a..443dcfb 100644
+--- a/tests/integration/factories/daemons/master/test_restarts.py
++++ b/tests/integration/factories/daemons/master/test_restarts.py
+@@ -11,6 +11,7 @@ def master(salt_factories):
+     return factory
+ 
+ 
++@pytest.mark.skip("not compatible with network")
+ def test_multiple_start_stops(master):
+     assert master.is_running() is False
+     pid = None
+diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
+index a6c6420..10626cd 100644
+--- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
++++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
+@@ -28,6 +28,7 @@ def salt_call_cli(minion):
+     return minion.salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_event_listener_engine(minion, salt_call_cli, event_listener):
+     """
+     There are some events which the minion fires internally that never reach the master.
+diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py
+index f2799ce..5e2b06a 100644
+--- a/tests/integration/factories/daemons/minion/test_minion.py
++++ b/tests/integration/factories/daemons/minion/test_minion.py
+@@ -27,6 +27,7 @@ def salt_call_cli(minion, salt_cli_timeout):
+     return minion.salt_call_cli(timeout=salt_cli_timeout)
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_minion(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt=minion.id)
+@@ -34,6 +35,7 @@ def test_minion(minion, salt_cli):
+     assert ret.data is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_no_match(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt="minion-2")
+@@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli):
+     assert not ret.data
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_show_jid(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id)
+@@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli):
+     assert ret.data is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_minion_salt_call(minion, salt_call_cli):
+     assert minion.is_running()
+     ret = salt_call_cli.run("test.ping")
+@@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli):
+     assert ret.data is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
+     ret = salt_call_cli.run(
+         "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt"
+@@ -66,6 +71,7 @@ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
+     assert ret.returncode == 1, ret
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ def test_state_tree(minion, salt_call_cli):
+     sls_contents = """
+     test:
+diff --git a/tests/integration/factories/daemons/minion/test_restarts.py b/tests/integration/factories/daemons/minion/test_restarts.py
+index ab1f044..4ac417d 100644
+--- a/tests/integration/factories/daemons/minion/test_restarts.py
++++ b/tests/integration/factories/daemons/minion/test_restarts.py
+@@ -10,6 +10,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.salt_minion_daemon(random_string("minion-"))
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
+index 579e6f5..e7464ed 100644
+--- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py
++++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
+@@ -36,6 +36,7 @@ def salt_call_cli(proxy_minion, salt_cli_timeout):
+     return proxy_minion.salt_call_cli(timeout=salt_cli_timeout)
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_proxy_minion(proxy_minion, salt_cli):
+     assert proxy_minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id)
+@@ -43,6 +44,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
+     assert ret.data is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_no_match(proxy_minion, salt_cli):
+     assert proxy_minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2")
+@@ -50,6 +52,7 @@ def test_no_match(proxy_minion, salt_cli):
+     assert not ret.data
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_show_jid(proxy_minion, salt_cli):
+     if platform.is_darwin() and sys.version_info[:2] == (3, 7):
+         pytest.skip(
+@@ -62,6 +65,7 @@ def test_show_jid(proxy_minion, salt_cli):
+     assert ret.data is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
+     assert proxy_minion.is_running()
+     ret = salt_call_cli.run("test.ping")
+@@ -73,6 +77,7 @@ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
+     assert ret.data is True
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ def test_state_tree(proxy_minion, salt_call_cli):
+     sls_contents = """
+     test:
+diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py
+index a243c6d..7758c96 100644
+--- a/tests/integration/factories/daemons/proxy/test_restarts.py
++++ b/tests/integration/factories/daemons/proxy/test_restarts.py
+@@ -16,6 +16,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.salt_proxy_minion_daemon(random_string("proxy-minion-"))
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
+index 832a2d3..a586c4f 100644
+--- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py
++++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
+@@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master):
+ 
+ 
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_ssh(salt_ssh_cli):
+     ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost")
+     assert ret.returncode == 0
+diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py
+index 3b425fc..3e03636 100644
+--- a/tests/integration/factories/daemons/sshd/test_sshd.py
++++ b/tests/integration/factories/daemons/sshd/test_sshd.py
+@@ -5,6 +5,7 @@ import pytest
+ 
+ @pytest.fixture(scope="module")
+ @pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen")
++@pytest.mark.skip("not compatible with network-sandbox")
+ def sshd(salt_factories):
+     # Set StrictModes to no because our config directory lives in /tmp and those permissions
+     # are not acceptable by sshd strict paranoia.
+@@ -15,12 +16,14 @@ def sshd(salt_factories):
+ 
+ 
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_sshd(sshd):
+     assert sshd.is_running()
+ 
+ 
+ @pytest.mark.skip_on_windows
+ @pytest.mark.skip_if_binaries_missing("ssh")
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_connect(sshd):
+     cmd = subprocess.run(
+         [
+diff --git a/tests/integration/utils/saltext/test_log_handlers.py b/tests/integration/utils/saltext/test_log_handlers.py
+index 6d5b9c0..edc5b5a 100644
+--- a/tests/integration/utils/saltext/test_log_handlers.py
++++ b/tests/integration/utils/saltext/test_log_handlers.py
+@@ -24,6 +24,7 @@ def salt_cli(master):
+     return master.salt_cli()
+ 
+ 
++@pytest.mark.skip("Not compatible with sandbox")
+ def test_logs_forwarded_from_sub_processes(salt_cli, minion, caplog):
+     assert minion.is_running()
+ 
+diff --git a/tests/scenarios/examples/test_echoext.py b/tests/scenarios/examples/test_echoext.py
+index 238a442..d827467 100644
+--- a/tests/scenarios/examples/test_echoext.py
++++ b/tests/scenarios/examples/test_echoext.py
+@@ -1,6 +1,8 @@
+ from saltfactories import CODE_ROOT_DIR
+ 
++import pytest
+ 
++@pytest.mark.skip("Incompatible with sandbox")
+ def test_echoext(extension_venv):
+     extension_path = CODE_ROOT_DIR.parent.parent / "examples" / "echo-extension"
+     with extension_venv(extension_path) as venv:
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20.ebuild
new file mode 100644
index 000000000000..58d703cddc93
--- /dev/null
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The new generation of the pytest-salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${PV//_/}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+	>=dev-python/pytest-shell-utilities-1.4.0[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=app-admin/salt-3001.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pytest-salt-factories-1.0.0_rc20-tests.patch"
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
+	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
+
+	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
+	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local tempdir
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	addwrite "${tempdir}"
+
+	distutils_install_for_testing --via-root
+
+	(
+		cleanup() { rm -rf "${tempdir}" || die; }
+
+		trap cleanup EXIT
+		env SHELL="/bin/bash" TMPDIR="${tempdir}" \
+			pytest -vv -x || die "Tests failed with ${EPYTHON}"
+	)
+}
diff --git a/dev-python/tlsh/Manifest b/dev-python/tlsh/Manifest
index 8f96b12219ac..7e344d9652e5 100644
--- a/dev-python/tlsh/Manifest
+++ b/dev-python/tlsh/Manifest
@@ -1,4 +1,4 @@
 AUX tlsh-4.8.2-setup-sources.patch 1029 BLAKE2B 6b1a252693940df0856361aa38553a6a684566c4ab80ac4e01b7151a611b5d27bd9065c5560e958931108399b9b860405ab4119615f8f6ab6f8d05e8ce2f4c89 SHA512 04fce865f3a7e73a9a6814596255f86eb1d24086372479ed993b7faa362973808d2d45f4d81506c1bf87bfc534caa410a0c8758250ccb3fa4337c0952610be5e
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 789 BLAKE2B 0812bc10de50251c3b5cf849c48a9e72441930bb09500fd9863ccd785480ed3acb51bcb97cd12b2dd8784217eb9e5cf9578ac3fa1367970ed245d901ac0a533e SHA512 5433f214eb3d7933e92cb73c0ddb4c33c98e9232d52860dfd8c2bdb37babdc338d1f0fe46fcc598193f805b34b86e0baef3eda5f381336706b6a6fcdbebb87ce
+EBUILD tlsh-4.8.2.ebuild 796 BLAKE2B c9fe0fb7d46d7aa35ff24e3e0bb267d1ea5ed7cbe6d604bd901d0a9e7929769a2ad813234fde29e4fa49a6dfeca1ed3d18e2afdc454d1e708922f3417e0c2bb0 SHA512 b401ab462988b65a30d8f96d4073889b749eaa3223f486b0f208ca063682959c5102feaa40654b66be8de8d0a25fcf614eb42535dbe25ffde23bd51c3a168822
 MISC metadata.xml 520 BLAKE2B 97d64e94859345f4537e1a95dac94190cf54cf608cc851a8cdf24f5f4b71c0821c778d24f99fb076ed08247a085270d4c36aaa66583916c0a420733b7b8543be SHA512 95dc94ca2c08d71246453ccee139901e675ec84b2c4af224b90057270f4bf5494ffb761e2d3b4dff25cfcac47185d4f7d2f4b3080182f8c9526b746e99519211
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
index 7471c4cbb5d7..0c04d759bb83 100644
--- a/dev-python/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-python/tlsh/tlsh-4.8.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P}/py_ext
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND="dev-libs/tlsh"
 RDEPEND="${DEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4e6103d4e165..48fa0ebeb6be 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index ec4e7b54beba..fecd009a2242 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,10 +1,8 @@
 AUX auto_gem.rb 159 BLAKE2B f5091d3df1318606e623a3bde402bb51b693875ba9504e0a48a911de14d904116d62a99eaed64d0cd5cee28c58f3d003e56c78df5c40025594fd7ad22a1eeb1d SHA512 e42e790013d20335ca5319803518102593408d077f22c95dcb08969c69d3a81e49e47cd002715bf760bfcd9a29304002354d8add42fd2415fb10a0a2a323d64c
 AUX auto_gem.rb.ruby19 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b3142669098d119369c4294c5d4758d1369fb2479ae3766d8e1421daa0076e2da4f66d00f9e0ed6584c1 SHA512 2b8f4ae00fae383357dd1eb1159ecf1689cb5b79e996688ae091a157b9f27e980761ed8a771d9d3b954d325f817972c4d02f4b5d3c8f4307d2cebce7651af666
 AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7fa613faa1c7a51f6c0015f92c16a95c0c368ad701c125307c0535ca1029891345476636fe45289fb8 SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd
-AUX gentoo-defaults-3.rb 1899 BLAKE2B 5a0d83e40bae62ce76e1caf609cc931aaa6cd40ff41ccdc68f0bdfd9559b8691dbc7293d72715b0555122c8c87e695660e8ebff326a2b2805fbfde8711318e48 SHA512 5da2b92f6ca56ed3fa9e51258f9e5c13883c8da34236b609c0d43ef8b788b97a6d5fb2ede235340d8ed99c0c09b32ff76bb6a3f190d55b5b2e1832f66af0d3cd
 AUX gentoo-defaults-4.rb 1907 BLAKE2B 6e41d5534d47ef7bad5ae798fff81dd8ab928ef97f771150d7d6198e7d10fd5ec8625c044a77a8549d7ebf0947a4578e8cd860b5362f3a8c7352495a14928857 SHA512 86b25f61689044496dbf41424664e0109714abc212a536a75e20146617c55176b9a77edcc2c633de30ecacaf0f48c8f7820007bed1dd2d4c31e004f545fdfb2b
 AUX gentoo-defaults-5.rb 1400 BLAKE2B a5dfe38bcb4b366a24e1e03e0bd50a684e29a36fcffb307e478c694056afae9a02a78d9c98b7b48787e0b9a5a214b8a7c7562c6ad86fd4d0dd45acc3bd4c4eab SHA512 1fb092262d3dbfe8f7a05980e6b2a313db0d0283f0842638ad261fe99e168369e49c19a5fff34f49f30b2933d6d5b7147c5c86bad559a1e1d4ec1e7e38d7329b
-AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-3.1.6.tgz 996339 BLAKE2B 8dc242a64c6f934b876de841cb6ea86455d7754cbe3902620a10ac40bb97264c03c1002b45a5734d1882617d95e8b390873ed390d00fe7e54b6d8f11a301c2b3 SHA512 730381cf683cd57f7ea7889f63cf21abb699bf28d2a25fa63f510756ece285cb63e4208130c20fa7c0232d6093d869e5d99d5b5fdad9bc68be5e8ead21863d97
 DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383
diff --git a/dev-ruby/rubygems/files/gentoo-defaults-3.rb b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
deleted file mode 100644
index 9d499b73f89d..000000000000
--- a/dev-ruby/rubygems/files/gentoo-defaults-3.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-# Gentoo defaults for rubygems 3.x
-#
-# Gentoo policy is to install all manually installed code into
-# /usr/local and to keep /usr managed by Gentoo. This policy file
-# ensures that all manually installed gems using "gem install" are
-# installed in /usr/local. Gentoo gems are installed in /usr.
-
-# TODO: We used to manipulate the default_dir, but this no longer
-# works since this is now the base for the new "default" gems that
-# ruby 2.6 uses with irb. So default_dir should refer to the system
-# default now. rubygems also provides various hooks so we may be able
-# to use those to install gems in /usr/local by default in a less
-# intrusive way.
-module Gem
-
-  class << self
-    def portage_gems_dir
-      ConfigMap[:sitelibdir].gsub('site_ruby', 'gems')
-    end
-
-    def local_dir
-      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
-                            '@GENTOO_PORTAGE_EPREFIX@/usr/local')
-    end
-
-    def install_dir
-      Process.euid.zero? ? local_dir : user_dir
-    end
-
-    undef :default_path
-    def default_path
-      path = []
-      path << user_dir if user_home && File.exist?(user_home)
-      path << default_dir
-      path << vendor_dir if vendor_dir && File.directory?(vendor_dir)
-      path << local_dir
-      path << portage_gems_dir
-    end
-
-    def system_config_path
-      '@GENTOO_PORTAGE_EPREFIX@/etc'
-    end
-
-    # Set Gentoo defaults for gem commands
-    begin
-      undef :operating_system_defaults
-    rescue NameError
-      # Avoid either runtime errors or redefinition warnings since
-      # this method is not present in all rubygem versions distributed
-      # with dev-lang/ruby.
-    end
-    def operating_system_defaults
-      {
-        'install' => "--install-dir #{install_dir}",
-        'uninstall' => "--install-dir #{install_dir}",
-        'update' => "--install-dir #{install_dir}"
-      }
-    end
-
-  end
-end
diff --git a/dev-ruby/rubygems/files/gentoo-defaults.rb b/dev-ruby/rubygems/files/gentoo-defaults.rb
deleted file mode 100644
index a645f4868281..000000000000
--- a/dev-ruby/rubygems/files/gentoo-defaults.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-module Gem
-
-  class << self
-    def portage_gems_dir
-      ConfigMap[:sitelibdir].gsub('site_ruby', 'gems')
-    end
-
-    def local_dir
-      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', '@GENTOO_PORTAGE_EPREFIX@/usr/local')
-    end
- 
-    undef :default_dir
-    def default_dir
-      Process.euid == 0 ? local_dir : user_dir
-    end
-
-    undef :default_path
-    def default_path
-      [user_dir, local_dir, portage_gems_dir]
-    end
-
-    undef :default_bindir
-    def default_bindir
-      Process.euid == 0 ? "@GENTOO_PORTAGE_EPREFIX@/usr/local/bin" : File.join(user_dir, 'bin')
-    end
-
-    undef :ruby_engine
-    def ruby_engine
-      if defined? RUBY_DESCRIPTION and RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
-        "rubyee"
-      else
-        # Ruby 1.8 and Ruby 1.9.2_rc2 and later install here, and JRuby
-        # rewrites that anyway.
-        "ruby"
-      end
-    end
-
-    def system_config_path
-      "@GENTOO_PORTAGE_EPREFIX@/etc"
-    end
-  end
-end
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9dbf5cb7d36c..45ee20dcb69f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index a1bf3070b155..2ba974b294b9 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,7 +1,6 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1637 BLAKE2B d29fa6d6596f789af88319300537ef8ba9d51eff452d54afbf27dcc0da358482b73b0c721d537c217ffe01502acb0eb08c31c138042bc39e4d1457091f84a284 SHA512 63ca598dc7d3102cf74166ddc92045cc06f798f17676bcb7166b95bb5b1562bb1ea172afe39ea275783ec7ca7db1c469c7f54dd588a007026e93b3877ba2ada5
-AUX buildbot_worker.service 296 BLAKE2B 2f557007489fa0d7c355dfcd12388c405fca269ca10573489fd9d303f9edfb2900e5505cdf851c464aec7a7e908aecf3d16c2773bea26158c08caae0ab1a9e4b SHA512 936035e92d8bd481b8af93450445a82ccf8eb21d3f6bf99c2a02f52ba71d911940b8a6316b7f8b888443f577d73184bf7e7d99329ffbaa995e32ea3d9cf715bc
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
 DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
 DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3 SHA512 6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.service b/dev-util/buildbot-worker/files/buildbot_worker.service
deleted file mode 100644
index e75a2d51e4f3..000000000000
--- a/dev-util/buildbot-worker/files/buildbot_worker.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=buildbot worker (slave) instances
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-User=buildbot
-ExecStart=/usr/bin/buildbot_worker start /var/lib/buildbot_worker
-ExecStop=/usr/bin/buildbot_worker stop /var/lib/buildbot_worker
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-util/cargo-tarpaulin/Manifest b/dev-util/cargo-tarpaulin/Manifest
index c1af1261c740..7c4426282fe7 100644
--- a/dev-util/cargo-tarpaulin/Manifest
+++ b/dev-util/cargo-tarpaulin/Manifest
@@ -3,59 +3,81 @@ AUX cargo-tarpaulin-0.20.1-tests.patch 290 BLAKE2B 69893d9ff5e97aeaff3fda07cb32b
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
+DIST android_system_properties-0.1.4.crate 4637 BLAKE2B a8d1768a924fc04ea27f4606b21cc3ee657b2ced18a267974b2eacfa73c895719ed56fc508beaa20997fe1848c23d40b5438400d6390a15950fafe57fb96d3f3 SHA512 6580064f046352d2ecc205f78fbac64f36e85a10d15c2c046cd7037ab2505d0d95ad785a4b1e276708116088a0d0ff5e7f89a0d26f498f0dfa038c8cf8d0dd2a
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 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.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bumpalo-3.10.0.crate 78915 BLAKE2B 94515190837765b47feaf94946c7e4da5b84e6faf7975bd5452bd9388d34e51c84315b80bc15b37c7f4ea8b4aaa0112707cdfc82d0651eeb8b63d2e7bd247660 SHA512 60c686534588524250ea7cb43510dba69d24999769b719127ee07f6015530ac2c5778d9b93477ab075bfc15c13e3ef9adc29ac24059067ac32e109347cd509f8
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST camino-1.0.5.crate 29642 BLAKE2B c345be490622b50f3a744f9c42392d12e02e286d75e09f4eaa8a1c6f86cc849c5a752aa7cb5fb1f697ed8beb741c7d9cea951f4f5ce7049dcaf6de5ec69a60d7 SHA512 1131997ca090426a25daf3be2fcd6e559d980078dd71fbf3f16b4d593531a24c0f030aa6c9652080fdc02b5420da98991b9c93115ce1c0cad8c0fad4437b1d59
+DIST camino-1.0.9.crate 29357 BLAKE2B 7d855e08bed677242235197765a9f1f82e2743a0c439fa7ce4febc3b4595a5f9f66b23469d6cd610f4caf4a7bd1dbb1db4a7b6211ce43f08b4fb85a131e69d6d SHA512 5aca5f7a0639c97f5d5898fbbff9fa7ace9603047596941c62c611abb125525cbe5a4672057f4bbaecd7e34d907191ec5800415fba6aa0e6de9f52faee6f5363
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo-tarpaulin-0.20.1.gh.tar.gz 193533 BLAKE2B 2146a5241609b309c12c20568e0e4d44ca73b65cf2200a8100292626963c0c2ce52a33e0e0b62ea823aca4ab16f806c47ec1292db2714ccd58432a9a4f3d9bc6 SHA512 5eeb1365f0df7c2c1a03432ac070f92c61c9dd56d8e393a3697ecda25488feed3c04a9e151f7d6670a3e940f8c904e3839e4dd36c87eb285cb3fd2d09a98c3a0
+DIST cargo-tarpaulin-0.21.0.gh.tar.gz 194092 BLAKE2B bb182ddad9899f5410329231c72d261f15b2ef7971093e168747ef7d2c169cf853ded677c65f4847a0bc4c8f27f73a0488b5c074003921f67bc38af677ff9286 SHA512 ec49c07d07c36e46552be372366a5c0e3a917838f4016fad308810952d2d26ec4a07e7c1acaa485aeec7c2023fe132fba864bbfcd867eef76170f490ab60b598
 DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
+DIST cargo_metadata-0.15.0.crate 17634 BLAKE2B cb6dceaaaf4f4a4bd339b429c4e45730ee018f947a560a468682bd4e9a09949a625b96f713d5b2270a6609622c1992def8145850a7d82619cc5120c3be304f5d SHA512 cbeddbccc8f7578b34976ead3076c8db66d20d5681affa81ed583ad8c84ebb5d6a3b8a40e3c42fd1667aacc9d0829f928e210f3f451e636a2b5732cae17cae1b
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST chrono-0.4.22.crate 185570 BLAKE2B 10dfae2fe871a9910bf885b78aaf3e9ed1bcb87a40962d781c8ea407a945b837c665c2bb4e3d0562ac63d9e7bd5012804434642ee6f5c80e22bc816d4331f1b0 SHA512 de856679ec16afe035176b22125a00ced532d49c8babac0a88fa5f6e4a3d9e526a34ee8bf51639653fc313a5703a202b1be013aa16fdd72a505151d7aafa7c44
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
+DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST coveralls-api-0.5.0.crate 11234 BLAKE2B 32b28705d9bda06f7f9684017fa48c63a8753327cddc6c7c6233cae5308db72f6505feb2dffdd72f2fc4df3d1981c0e2da903eb05e79abf0a650429339068b2b SHA512 2bc66c6565cfbc83cd1de6e66d7b93cf7d87b632149dac8507f7f91b29e7df25ba871f5ea5af201e21632fbe757a248c98ef76e908300dad9f1c7d08c1d88aee
 DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
 DIST curl-0.4.41.crate 88435 BLAKE2B 191903ed3bf09a253ff3e48d30310c27a22adc1ddb1a63226f2614634aab2094839ee02b6cdd6295f073583b492d1935869f62a04b96c2f651dcd90639957c70 SHA512 b26834b32bc9c280f97e9867535e3362921b64557c6ac022435dc666a919b4275fc43b7e201b91934efdd8bc02edd73fde9abfe2a131966ceeb5e302f232bd9e
 DIST curl-sys-0.4.51+curl-7.80.0.crate 2966807 BLAKE2B 8552ba08f01aceede0f35e76e8fa75e7199e892ca10312750b8d1552ac86f759532d38155da54102a8637dcd8da60fc08a69a6ebfc703a53ffcfe4474a2385f9 SHA512 3b4649eac943a6135dc12750817318f50b0cb1bf7f89113a550081b66329cabe0a8e0a88fddfad3a1742c5f32eef43eb4e48163ffae2cb1cf4136186ebf6b387
 DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
+DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
+DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
 DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
+DIST gimli-0.26.2.crate 717340 BLAKE2B 6460346625fad7ed202f387d45900867e785026e08efbf6542bb5c7b6ec2bc8ddfdaf825e872d2c339c3b72f8ddaba546efa94243a602bd8c9470c6e808a8f30 SHA512 10baa5fb5fe13eeab2ed9ac8e02ae7607b42df80b9f39b14027d052ac7f6f11e4dec451bd73c3640ff8ef174e280c1640110720b2bc4220229d27bbb31079029
 DIST git2-0.14.4.crate 196849 BLAKE2B 020e8c87fedb49fcf38727a8c0abc975dce2b70dfcb1db996e526967bd71455be8f81ed7d7e58d56e584f34adcfa2aaad7765d262b2d4899370ed9e0a7e2175d SHA512 05a5894eb90e5371525222f69321c2376f6b8e0306a04ff05a9917005ca77a86b6100ec19338e47265599f3a61603511991ea8664e7c64702a580841ef98963a
+DIST git2-0.15.0.crate 198983 BLAKE2B 0e340dedef36339cc6ce4cf9ac79014e7bcbdf9ebf688986d1836c3e2f480998a60a2722017381124682edc5dc511368497f03c9bd9a8c4d0e7690682789bf88 SHA512 8ea32850e592cb9bc8caa0d7a04042e284c11b9d46959807d8e6d496d93946342dc37fcdf1ed354010434798a404f415e8e980fee2ce4f5cb998e0f8736b5bc5
 DIST gzip-header-0.3.0.crate 12503 BLAKE2B 6ce8d4676d761ff20d8a5f96b794743ed36122b16d0fb93e0cd0546e86e9373f4a63e62901ac21e25415f898bdeea21111a0cb93f357aca83bfed90bce97d755 SHA512 29ac184a5a3ea31235c597e29f40efdaf4c1aec5954019b05b2ab7fc3fcc680212860b4fe3cfbbb9ef3c6dec533f5ab599e46619d263268fc064a945381a78ec
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST hashbrown-0.12.1.crate 90855 BLAKE2B 0d38ca94f1a7b750b31bc5469ffc1fbdb79a789d0410dc51583f0319569c94ed03b7a8b5f02972cd370a48ad8252eaa6ecc6eca4cb92911ae7366992b9b43cba SHA512 a037554dda19d8c1d79e74fe59f0297855173a1bd0b119c8fbe724b18a07ec7c2475162213d2502483279712a46ff1247f1681aceb97f67c2e7a53b60779b418
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
+DIST iana-time-zone-0.1.46.crate 16769 BLAKE2B 550799c0e562a83cb6074c254ba55e7c24b580a27a17996b9e99371cb8dfcc585cf5d19011bc2f37b4a794de723f2cc34565b01f0f8339a8b2fb99b72209ae27 SHA512 13d7cfba5c0bdc4781979366f459382b823b40e7895b8e1abc810058e2f850396491423e0402f26be20f18a9cccd406a2530805e4194293f299b0e618129b873
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
+DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
+DIST io-lifetimes-0.7.2.crate 40632 BLAKE2B a8a48c9783bb1fc12de785008ea0843b48e6ca6e1cd014e66df54af4e03de1151a929f320381107a75b375aad59c3b476872a4db47e3402afa672e87836f5db0 SHA512 56b4776909ef9986e4aa343391bb839861e0486f8bcb6307dd68cfd39d186ce70c3da669ebf324f5a0d07e720f8cc87f7c4f7e15a0e7440db712b3029c80fb01
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
+DIST js-sys-0.3.58.crate 78794 BLAKE2B d664fda1e19a7ebb621596cd4773e7ebe86b3749ec8e0e45477d170aa472a80a75bd0ca7f6ca47c9aace5e3962451039b1bf44615ac77ee4db21f46d673943e5 SHA512 74656493c36d9110aae99f58cf1f72a1c89bd971c574ceef8194f68387bcefaa5e93aee736b41a1de1c192113257bd544948dd79a227b5451d13ba2319b58a15
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.124.crate 577742 BLAKE2B d39356e89647df6a0468c2fe7ec351955afcddd38064fb64215833c716bc16636001b6d377d21cf31b773c3f392d19ec5c665d450e81ce09a55bfd6a080c82ca SHA512 19fed1eeac7ffbbe36ecb5beb3816b5244d3017b72376e84e532f253e07ee7bc310f6f636aed46174653232fcdb532c2506bc070bef31699db20572df0c45de3
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libgit2-sys-0.13.4+1.4.2.crate 1506315 BLAKE2B 87199812e8dd5475c3c659e11bde4a294951685880e9fc8771b3a075d351d02a1eecb5d4ea039466af6b9d90b5374d3d1369195a442ba60c596669aa2e25af59 SHA512 71e3f4ed8a123109ae1f0cfaad90092bbea25658356e6eaee3135d4576ffcfadd83ada28367459dd70903ddce716bed6278388e294e13712dcbcf8202e884548
+DIST libgit2-sys-0.14.0+1.5.0.crate 1740370 BLAKE2B 0bdcec13f78292ad7849f88bbf21a8168371e9d4b15dcd09863b2ef703caa8e94a33da01164214620e11ff6f75038cf9ee6257c44aed5e07c52af044abca9952 SHA512 b2e1e54b172e6b0c71fdd02da0800e9120a3fe1b9c33b5fee4e667e9aa627979012865397b406fe91437425bf52e52a26245cfb7fa84f3ba64269dbe204582d6
 DIST libssh2-sys-0.2.23.crate 493516 BLAKE2B 00c0c1396f3d6723ad750112e7af8c8ac098af7b3d11e3fafbb4dc3b90c0defeb8184e007de3c740bf1111e12a53b71c355d697c4567deb3a30ebe3fee2e0caa SHA512 9617fb1d5826dacce23658b42e3eb3f8427b33db1b5a4424081e148bd90a3f776aa50ef66183c93ae19086d64321fc10b19b1a496c3feb12a669c7313cdf39cf
 DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
+DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f8bb21109962273689b284cb4d6756e6399010983da813f6f58664d6191b392b70ecd161518e8ca0fb46992bc3d23adf SHA512 b821ab53d9a885b9dfef6eb3d36a422525cf35d797fe32fee3abf9bb5463712af57febf684c9ab41b5de40c9b0e73d9e369599497f7a7f1314ff455795d32b39
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST md5-0.7.0.crate 6671 BLAKE2B a1c8132cb4d7497ab3f4550e6fffdea6b118ad99a31128c068ea3243b5f76c4b059042da376a0be32fb74e866571348a581c2ca727d6acf855d823ce15f593b5 SHA512 569c992eafe25986a1328666a428b2335ecc5cb7a5ba142c34d7abb1247f6768c0bb3dce790121686d4ebf1b4a1832d65315136552163dfba5f799f99551544a
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
+DIST nix-0.24.2.crate 264176 BLAKE2B 2da44a51beba8549a558730567f6ea36ab0da81053dac10db637beb3901ce7c32b6efebba519af37068fa32270186d733ef55661b58621eb7e946fb16690cd6c SHA512 9502f899868466165d898b1dee676188e9761cbf7ad7be21e231d6d5c993f109b48edf06b659f547712ccec2d648dcdb689626845ecce22965aad2dfd7ed75ff
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST object-0.28.4.crate 237248 BLAKE2B eaea0931cec7c2c71f859b56a70719c71ee06cf78eedd0141467eb4afadff514eb8a996976032b7625a08dc9105e28bc6929890f2e721f7156fe21e3dfcac56c SHA512 32a20452ed62b789c859c442009faf905ba4bc28f11bddfad3da3509861afd8dbe54e5bc0523c0eea5d5ce19cb94dee2e74f218f79df52d95ad22657d571839f
+DIST object-0.29.0.crate 237723 BLAKE2B fd579be961df0d3185682348f1d9cc0fb4dde3daf9a3c5d89b16a5f03f3084f1755d1b077f8a7bd14b2bb296b3bb95e9fd85f58380bd52fe9aa885e19c1b176f SHA512 fb69ed164b9d766b2eb268b3492134ba9ca6b4358eb61712773c44c5c0676ce04e3e0c749f947658ee1423dce5e11237f6b6c0320f2d32bd6979cae141273dc2
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
 DIST openssl-src-111.22.0+1.1.1q.crate 5103224 BLAKE2B 3d437377cc0a320e852721af6baf119b8e9bb3f461b7fca45e510e2b8e76086a52809c359e2bb2ceeab789c44d8d8ee7a8eef9b521202fb96704e90c5a291e03 SHA512 edecb0d0115b8db74447bab4c347761c2ce88436fa2d17ffce938258f7d4d6533995f2029f5466ea730d833dd3ac86e637ed846736184584846411b36f7f242b
@@ -64,31 +86,43 @@ DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb
 DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
 DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
+DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
 DIST procfs-0.12.0.crate 103531 BLAKE2B e31fc6cb5f8866345fad9adbea6e0cec90938ea653ff0093abb3e76e023c22d6a0cbaebb0295460539794eb3c276a73f204c078ef1d0c9b1e6182179dc3eb234 SHA512 48bdd24c0514dd9a4a16be492085d9b6be41b81333b5dfc99cf0f04e337a532dee5d50b4317ae450f396924364f00b01fcd3b63e655ad50e53eb222f29a90499
+DIST procfs-0.14.1.crate 113661 BLAKE2B 1327f4f8b618d04bc964a2e9b4609cf60f1a61f0735ff62f48f5f72131434a06742247e9a94f15883c27570f0eac05458234c6e795f9079eb8d3dac1a370daa9 SHA512 736fb1da5d90205e97077180ac589a7557527d5ccdcf699d8e6efeaded31946ab6578f69de1284102cb41e60919aa03c65cec25671d943d57eb47c4cd2b99e04
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quick-xml-0.22.0.crate 132066 BLAKE2B 1c1d71fdaa022e430e6265530f3e40924c13457fe422e4355eedfcb5ebe8c75d0205f73ffea0968d8196d74804d7d0fbf61954852c98831d510af6c45dcf6923 SHA512 15e56fafc84e62b219977c5ab0f07a021bb71216d7cbb673a7ffec4ec6bda36f97d7b7034751b0b7d745df7c17c1a591a281cf2c97aa4fada7327979711ae3dd
+DIST quick-xml-0.23.0.crate 160655 BLAKE2B 0968988e58f0d6d37fdf73c9684ced8abf6a3aaf2f0941eacc96876237575358567c51b4ccb8a0d4864c6af02d59ea87c2e70b4ed201a537d3d634783c6b1f18 SHA512 9f2cea83e81e7f5de8a5ccd883c9d83cebf9169ffeba5a7355aca9925c7d2bb2216f0803203b91709dea292f89111bfe1e9ae6d34e84741473df5b00a3b21340
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
+DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
+DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
+DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
+DIST rustix-0.35.6.crate 296990 BLAKE2B 48c3bdd44e4f51a294e8df7c91d1c7d1033324758415d9091ecaa521d50299a2405780a6720dde60e47e2bd9c85672c8d676c36c57890638ecb3865d9c547d9e SHA512 c820ba73a275b2b4bcd193c297834ee96a6579c552b2260bc356fe5bf84d2c656ca9a93f4cb466fe156ba5e8ade1488f8d81df88db519b114e4f2d71b9b388e5
 DIST rusty-fork-0.3.0.crate 19881 BLAKE2B 01bae755c66d7e4f72789b7140de35573d82961adadcc9febb841e332fc2730b405d4f1dc8aff1db6eba3ca03ee24d5dcd9a9c9a914fd2a94428c796dc9bfcd0 SHA512 8e41e12971c36ae1d4439943e55204e32fb4e62717355a2bf79152825eef7dac305c2fe22468957cb3b7af0b27004ceb18eee2d2fa0a6f8822b28b711f64ccd7
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST semver-1.0.10.crate 30912 BLAKE2B e0addb727cfec75ac00d0941bec66433f549c5e731a86cf19954c1c402cb5a6721f20af11f1da87370791fd71f95b1febc1b9c90acba8d5416987fe97502cd5f SHA512 92f01a95f6d20bca1e9101f17cd7a7be7e002d55a0ad792c0a1b6b47c510c8e902a8dc33f683ac35800e39020453b0300b79a41fc32f29c8eda9a9d57d456fbc
 DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
+DIST serde-1.0.144.crate 76387 BLAKE2B 7e66355c24e1116eec4a3ba4f9164570b6d4ab57196d39d19a0bca912c9d2acfb33d8e17e09bc07903984dad154034187d0ffcc8f9073b36336ac2b38ea012cf SHA512 d7388a40e4a5e0a65ec7b49193f2d53d758adcf26b98ca3bc6270351c7553add2f38a8434223a95826994c6d039dd91fc4f4020ce191410fe57bebd29e4938de
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
+DIST serde_derive-1.0.144.crate 54867 BLAKE2B d1eabf53f4efdf95c3c12a907090617e0aa02661fa0e3cc51bf0ef8dcdbf45f0382a57588565ce26ef7baca330c19ad216a8a0975247bc02af37c4440bdd6859 SHA512 d41208452b36b8d3f0644e58164c9c4e75f8cab2d8be09cfd1b38bdfc690e880a062e0eafe46dd4400d01f541b34c9acd3574504c4aa856afb00cfc2e9617a0a
 DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
+DIST serde_json-1.0.85.crate 144635 BLAKE2B 03d2de5563c8b8e9150b656b62329a87a5dc42c1fe389e40291a3b2a7232e2342b6e52f6625ecfaa8cde4420017a0db82b2ef332f82f2fc1caa50b98e544031b SHA512 b9ba5c8f5e5c977d31c720995317c99486897a064993784e8abd4e35e0c9ccf20d421552b4436cd88420b5e6fe1d7ebc411bbc2e803cf1732e133c29365834bc
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
 DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
+DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
@@ -111,9 +145,21 @@ DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
+DIST wasm-bindgen-0.2.81.crate 165467 BLAKE2B 4b02ad703362d89c280bff92552a632b6cc50a586db4a476fa4f476118b94a89707712c1f6ff65c49a4d6001e9c9e16922a35e36b315b8f544e261ceb43dd5a4 SHA512 dd9a9902789dc8c7c3a8107c52018783b505efcc534c94c95ce55ad735c51489c928f767c319d97f78868a58d4aff7a71b2d1513350c30adb9122401b493906b
+DIST wasm-bindgen-backend-0.2.81.crate 25737 BLAKE2B dbfbd09a4d5a1c585fbd8cf8a29dd375c887e77fb5759c74bfbf0dbf012a0340df06f063e1a4908a80a2ff8298689cfb92ef67707e5d2e163abe155523c2029c SHA512 0d3b14b530adb2a32ad3ea169f0555973a25232613ff4269600dc1e86a6d75e4717be2388f132b6bab9a12625f645f644f59dc30a0b4ff3f20c20106083bcfa3
+DIST wasm-bindgen-macro-0.2.81.crate 11796 BLAKE2B 3fb6a60ca59279d3921dd65f7e7d4d91a457e31524671d465c5ce8fb31db7f28f49d80fc0161c2faa9f5a7dbad4c44584f0fed6177e8908de2a421951c62479d SHA512 f1164f7a4413685ec34e22c462b4a4cbaa79eba47079d90b7e15304db222afcc8e966f3bc994a231f21e29ba68a844b3e6622f840e0c335d09201c1dfa046ea3
+DIST wasm-bindgen-macro-support-0.2.81.crate 17855 BLAKE2B 2afb7807913ba01d99ea93030461842b7eeb405f4be0f0d671e1d430b6cc0aa111518c9549b71c8a94dda418c149050fc9d0613e10cdc7fd0dce354d87b8c4c0 SHA512 1fac5ac8b546e4fe55484649d7e2a39537b49797e20a2859a17ac98cc8c25cb3d91dca09e94c33651b9963efed6045ddd79bf646489bbd11065c62e66a59cda4
+DIST wasm-bindgen-shared-0.2.81.crate 7194 BLAKE2B bc31b0e75cafc2dcd207ffcf44b9ae84de4e5bebebe471404736352e9aaa1c2da45e22892a548c05cda24750be028dcaf66e6529d1ff2f833986ab2085b74fb9 SHA512 5ca631a720623e42caf737d3f8faa4961a051eb71b6b0854e4f697f753889cd58df980962d39650acce7712449ae50cf86effa542bd85e451cdb86767aa7ab34
 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-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 EBUILD cargo-tarpaulin-0.20.1.ebuild 3176 BLAKE2B 39cdbe64007b55b0897450e76dbb63f061616c88eac9b2dfdda6a9477818c5ba3204cb15146cccd99eeddf9da825b7b0d23118c9e2b59f6df7725a2258058d1f SHA512 5655dab8b2dbe883a0b7fdbfd0e80a1fa5f68f8e9b406eeeb06bab11a7b07d8364c5c3ffdc85102aae445cb37b392d6ee79ac9fa7a7e94b6279140c2a6d4c281
+EBUILD cargo-tarpaulin-0.21.0.ebuild 3630 BLAKE2B 94a3247ab54886b0d665a7bc6995527a11a791fedf526b250b9927a716d44b04f69a30971c1723bb63628eba841b74998d5c5f065973cc285e549be5f09947aa SHA512 97777255f189c33050ed784e317ea33490c7798d49d5b62949c5eebd5a0f1dc7814bf5262a9f1b0ed85371dc3923abda5fcd162bf63b6ca8bbe741875ad9b695
 MISC metadata.xml 333 BLAKE2B 83d55cefaf0e286bf723cf7605ea68ef256ea2bbecd9de0917c22b3bd34a5f9cf3760bb68709c69df24ecc0f0360e4050bf5177403d2f6b68c278c67e00a5cb9 SHA512 d594d30752deec197e6eb3855a4f530b2a5de9b6f8c2b40246a05ef09a162b4527c21d1fd7c6b302acaa6a1aecb34ee6b588a10f1a14b8a553293e1736cb15da
diff --git a/dev-util/cargo-tarpaulin/cargo-tarpaulin-0.21.0.ebuild b/dev-util/cargo-tarpaulin/cargo-tarpaulin-0.21.0.ebuild
new file mode 100644
index 000000000000..c9aca0f8cda4
--- /dev/null
+++ b/dev-util/cargo-tarpaulin/cargo-tarpaulin-0.21.0.ebuild
@@ -0,0 +1,181 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	adler32-1.2.0
+	aho-corasick-0.7.18
+	android_system_properties-0.1.4
+	ansi_term-0.12.1
+	atty-0.2.14
+	autocfg-1.0.1
+	bitflags-1.3.2
+	bumpalo-3.10.0
+	byteorder-1.4.3
+	camino-1.0.9
+	cargo-platform-0.1.2
+	cargo_metadata-0.15.0
+	cc-1.0.72
+	cfg-if-1.0.0
+	chrono-0.4.22
+	clap-2.34.0
+	core-foundation-sys-0.8.3
+	coveralls-api-0.5.0
+	crc32fast-1.3.0
+	curl-0.4.41
+	curl-sys-0.4.51+curl-7.80.0
+	deflate-0.8.6
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fallible-iterator-0.2.0
+	fastrand-1.7.0
+	flate2-1.0.22
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	gimli-0.26.2
+	git2-0.15.0
+	gzip-header-0.3.0
+	hashbrown-0.12.1
+	hermit-abi-0.1.19
+	hex-0.4.3
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	iana-time-zone-0.1.46
+	idna-0.2.3
+	indexmap-1.9.1
+	instant-0.1.12
+	io-lifetimes-0.7.2
+	itoa-1.0.1
+	jobserver-0.1.24
+	js-sys-0.3.58
+	lazy_static-1.4.0
+	libc-0.2.126
+	libgit2-sys-0.14.0+1.5.0
+	libssh2-sys-0.2.23
+	libz-sys-1.1.3
+	linux-raw-sys-0.0.46
+	log-0.4.14
+	matchers-0.0.1
+	matches-0.1.9
+	md5-0.7.0
+	memchr-2.5.0
+	memmap-0.7.0
+	miniz_oxide-0.4.4
+	nix-0.24.2
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.1
+	object-0.29.0
+	once_cell-1.9.0
+	openssl-probe-0.1.4
+	openssl-src-111.22.0+1.1.1q
+	openssl-sys-0.9.72
+	percent-encoding-2.1.0
+	pin-project-lite-0.2.7
+	pkg-config-0.3.24
+	proc-macro2-1.0.43
+	procfs-0.14.1
+	quick-error-1.2.3
+	quick-xml-0.23.0
+	quote-1.0.21
+	redox_syscall-0.2.10
+	regex-1.6.0
+	regex-automata-0.1.10
+	regex-syntax-0.6.27
+	remove_dir_all-0.5.3
+	rustc-demangle-0.1.21
+	rustc_version-0.4.0
+	rustix-0.35.6
+	rusty-fork-0.3.0
+	ryu-1.0.9
+	same-file-1.0.6
+	schannel-0.1.19
+	semver-1.0.10
+	serde-1.0.144
+	serde_derive-1.0.144
+	serde_json-1.0.85
+	sharded-slab-0.1.4
+	smallvec-1.7.0
+	socket2-0.4.2
+	stable_deref_trait-1.2.0
+	strsim-0.8.0
+	syn-1.0.99
+	tempfile-3.3.0
+	textwrap-0.11.0
+	thread_local-1.1.4
+	time-0.1.44
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	toml-0.5.9
+	tracing-0.1.34
+	tracing-core-0.1.22
+	tracing-log-0.1.2
+	tracing-subscriber-0.2.25
+	unicode-bidi-0.3.7
+	unicode-ident-1.0.0
+	unicode-normalization-0.1.19
+	unicode-width-0.1.9
+	url-2.2.2
+	valuable-0.1.0
+	vcpkg-0.2.15
+	vec_map-0.8.2
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.81
+	wasm-bindgen-backend-0.2.81
+	wasm-bindgen-macro-0.2.81
+	wasm-bindgen-macro-support-0.2.81
+	wasm-bindgen-shared-0.2.81
+	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
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+"
+
+inherit cargo
+
+DESCRIPTION="Cargo-Tarpaulin is a tool to determine code coverage achieved via tests"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/xd009642/tarpaulin"
+SRC_URI="
+	https://github.com/xd009642/tarpaulin/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+S="${WORKDIR}/${P#cargo-}"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="/usr/bin/cargo-tarpaulin"
+
+PATCHES=(
+	# integration tests require internet access
+	"${FILESDIR}/cargo-tarpaulin-0.20.1-tests.patch"
+)
+
+DOCS=(
+	CHANGELOG.md
+	CONTRIBUTING.md
+	README.md
+)
+
+src_install() {
+	cargo_src_install
+
+	dodoc "${DOCS[@]}"
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 8e8dc22dbdfe..7bf7fe2547b6 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,9 +1,5 @@
-DIST diffoscope-214.tar.gz 2710707 BLAKE2B 6acd7fa9c69ad831c6d362b805c2094b2f55d57fa87f69e9e153a99a71c90a67884796696df0d24d6b3c94c0b9a41736292d44208f4d8de4262eaa5f2eec6c90 SHA512 67a9b68ce5f7934747e30e41506d7e30f018673314b777ab86af89e3dd56212c442abe6e246741f7b842b5c58f14006442167cf9089823ba4ef1ba07e78eaaa7
 DIST diffoscope-219.tar.gz 2711533 BLAKE2B 1b244a36ca2622244fb1f11f8fc895680bd1d77b544421e5e2c3662294fdf8e7efe3b67e370a83089c180f3c8563562847cc8b09bec85426e1b05f340575b724 SHA512 615b82cbd2b1a8bcdfae4274c051e4be52fb8ea90c5e56b041dd1d8c520c759d09cd4c080b31154257828316f7b4c0ac79cf0b1e09d762271ce01ffde353ee7a
-DIST diffoscope-220.tar.gz 3145338 BLAKE2B ecc679184e7138180c354b6ad9b4ec33cc27f818228da7587f4be3f5704ed788426175692f56e52fc5889690b1b8ee75690ddbf14113ad7c5336b0ceee6f9ac2 SHA512 fd7a30f30b7f67ae92650afb42684f71de3bc9e34c93534830445a608f772290865e0d494492563641dc4721433705be3f642c0085846dfaced3fe4dce9c534b
 DIST diffoscope-221.tar.gz 3145331 BLAKE2B 76369a7719f9a256ca61cc097bc439c5ef267370b78b5e25c466f351fc262b6a9a18f2f82d88ae86fd382a11900c4350ff79c6217c53df42ad56706ee58fa42b SHA512 145390374378f699f7689af0e35897bc9d75cd805722f0db66e689135186eb43def17ec5aac4adf8f7e0045cbddec8a31dc5c8b68eb4e7b0d3bd1f0661f26416
-EBUILD diffoscope-214.ebuild 3296 BLAKE2B 0d6f5c5ffa8be6470d622af2cf72181d283ece6bad089459d6ca12847df804b1174e104d74d39c447e632c6be4c182b56de8fb484c41e6afad9cbd0991ea98b9 SHA512 b8d9e8d6fdc0ab77d79d5f78a3718a6cf90c23afda16a37cad7fb70209f936eca1236f7b3058c89d14e36c1ffe645a81cc08963b2c25ec4c78b39320af30db37
 EBUILD diffoscope-219.ebuild 3324 BLAKE2B c9c95194b8d7d758834d27a1883bc1a884f6e3670ac81757bc251448e27afa437a4434966eb1cc5f79c026559241978eb913be3ec70b42f86dcba701a968db92 SHA512 5f53cf29280155a033b5aaf64512bd006fb1be72c6f8af2a1e0fc8669d1ac6f05441152fa66c41fbefa6ec74a31c2b1dbc11f08f27ca39f30e43cbc8c991b45e
-EBUILD diffoscope-220.ebuild 3326 BLAKE2B ef5314ab8e78b5e93dbdd56dae8bb48df59eeefc8d42d918c29ff87189ee5fe2df07879b2abe04893557265417050c39e68b265fd9c21ecc7e546ab4b15fe21b SHA512 3a73dec69cdef67b5cf7439f5263158c37e5a868376c185da25a447305a25da3b992ad2c0f81469ca5e4a182f85c709a5fd899a84162dd55e7154e948d15ee84
-EBUILD diffoscope-221.ebuild 3326 BLAKE2B ef5314ab8e78b5e93dbdd56dae8bb48df59eeefc8d42d918c29ff87189ee5fe2df07879b2abe04893557265417050c39e68b265fd9c21ecc7e546ab4b15fe21b SHA512 3a73dec69cdef67b5cf7439f5263158c37e5a868376c185da25a447305a25da3b992ad2c0f81469ca5e4a182f85c709a5fd899a84162dd55e7154e948d15ee84
+EBUILD diffoscope-221.ebuild 3333 BLAKE2B dbbd07f3ba1ed69c7a71444b046c190182a522415def1dfae5f8e4cf22a25bb93d19fc6e61b43e1da9cf95270de7e85ecc66c258635a7d03a81ee7709cf9b657 SHA512 857ddab39cf606bce9f2339986d1b55dfcccee9d774deb469a9c2a169f3799851457611e0250a5d0c3a4d58d7e477a86744568e9d8f15bc8f223810837b38f17
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-214.ebuild b/dev-util/diffoscope/diffoscope-214.ebuild
deleted file mode 100644
index 924c2702c182..000000000000
--- a/dev-util/diffoscope/diffoscope-214.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-220.ebuild b/dev-util/diffoscope/diffoscope-220.ebuild
deleted file mode 100644
index 177ba73b1c19..000000000000
--- a/dev-util/diffoscope/diffoscope-220.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-221.ebuild b/dev-util/diffoscope/diffoscope-221.ebuild
index 177ba73b1c19..bd5c0dd544f8 100644
--- a/dev-util/diffoscope/diffoscope-221.ebuild
+++ b/dev-util/diffoscope/diffoscope-221.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~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
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 6d0a9e25016d..55d67d30a8f7 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,5 +1,7 @@
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
 DIST ninja-1.11.0.tar.gz 229475 BLAKE2B 71c8b6cf9524bdc11cf73f7e761f0d7deef2498a970c1439c10cc7d361e31fed1e3b54bcb185f3c7ed041f15704851a96e42560058af61b8a5df6e918d52ebf3 SHA512 9b9c8dae2251f9ddba50680911271b8504c292994fd90a0da94902f64c69a9edc72212217df5c651ddfc2f79c2ae03e84c99b805497dcd7497c53a1617de83e7
+DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 EBUILD ninja-1.11.0.ebuild 2664 BLAKE2B 597dbb7ecc13989c1c0b064d58bc6a8ad9e4ee2bd95385755874be1b6cda966ce798006b4a6dd71a00321734918c5a3d4a2ffa8c1840c800af6fe02c50314ff0 SHA512 ab6fd121f8b0f4c07d538d26a49996b3eb65b52abfbaec51852010543441973bf51785c3bdab8cae933692e68b3b6539a812fdd6f50a753210e799b63706fd2c
-EBUILD ninja-9999.ebuild 2672 BLAKE2B 62774b99edc98754f307c8a5576e148534cc21eed8fc0b0e42ac2653b27943f8b86b3368b856743011884a034601e221bcac1da81c45bede2c249b7e42b6783c SHA512 014bc565791220ba3794563973162e38237a5f5cb7247c79fbbd6ef811944d2decf9f67c8f29df2f0a39920f9077f1550625bbb4bbdbac3d2f0f4f642ec2577f
+EBUILD ninja-1.11.1.ebuild 2561 BLAKE2B 272031b0e8898d4a0970276869c20dcbfd7a4a90adbc75ea68f28bb7f075b432447cc2fcaadb4715c0b84832f5942d61e77243ff180221ddf07131d7bb844f02 SHA512 4c9ca432475d6d056d10d306f96c5189d9692ef83f8f3ce36901fbf0428d442424134936b7709cb05d22ebe9b4a25b1122e820c6c21207b30e7a5a6a1b13f660
+EBUILD ninja-9999.ebuild 2561 BLAKE2B 272031b0e8898d4a0970276869c20dcbfd7a4a90adbc75ea68f28bb7f075b432447cc2fcaadb4715c0b84832f5942d61e77243ff180221ddf07131d7bb844f02 SHA512 4c9ca432475d6d056d10d306f96c5189d9692ef83f8f3ce36901fbf0428d442424134936b7709cb05d22ebe9b4a25b1122e820c6c21207b30e7a5a6a1b13f660
 MISC metadata.xml 345 BLAKE2B 62344dee3d109b90fe9cdc68f581d3dddd9ffee182af72e82509180d9382b6765ecac373680f0c3fc3e1b5c4e9641a689bb036ee877a2117d335ae4e1608718b SHA512 20d5ee6f6448835b6cdcb3ac1f6760d5bc452aa44a1c72de2241cd47432967498c30099c79a5b59a53796cbe1c373291bb62a5d48914996fa20c9e22569d68eb
diff --git a/dev-util/ninja/ninja-1.11.1.ebuild b/dev-util/ninja/ninja-1.11.1.ebuild
new file mode 100644
index 000000000000..bedb66f577c5
--- /dev/null
+++ b/dev-util/ninja/ninja-1.11.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
+
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		edo ./ninja -v ninja_test
+		edo ./ninja_test
+	fi
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+
+	dobin ninja
+
+	newbashcomp misc/bash-completion ${PN}
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins misc/ninja.vim
+
+	echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${T}"/ninja.vim
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ninja ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 81d813fea607..bedb66f577c5 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 2012-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+inherit edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+	inherit git-r3
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax"
+IUSE="doc emacs test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -35,15 +35,7 @@ BDEPEND="
 	)
 	test? ( dev-cpp/gtest )
 "
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 
 PATCHES=(
 	"${FILESDIR}"/ninja-cflags.patch
@@ -90,30 +82,30 @@ src_test() {
 	if ! tc-is-cross-compiler; then
 		# Bug 485772
 		ulimit -n 2048
-		./ninja -v ninja_test || die
-		./ninja_test || die
+		edo ./ninja -v ninja_test
+		edo ./ninja_test
 	fi
 }
 
 src_install() {
 	dodoc README.md CONTRIBUTING.md
+
 	if use doc; then
 		docinto html
 		dodoc -r doc/doxygen/html/.
 		dodoc doc/manual.html
 	fi
+
 	dobin ninja
 
-	newbashcomp misc/bash-completion "${PN}"
+	newbashcomp misc/bash-completion ${PN}
 
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/ninja.vim
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins misc/ninja.vim
 
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/ninja.vim"
-	fi
+	echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${T}"/ninja.vim
 
 	insinto /usr/share/zsh/site-functions
 	newins misc/zsh-completion _ninja
diff --git a/dev-util/pwndbg/Manifest b/dev-util/pwndbg/Manifest
index 1a7a6aff605c..4a3c099321f0 100644
--- a/dev-util/pwndbg/Manifest
+++ b/dev-util/pwndbg/Manifest
@@ -1,4 +1,7 @@
+DIST gdb-pt-dump-f25898adc61d60e5f30c6452b15700bbf1bd630c.tar.gz 385826 BLAKE2B 0cfca93c620f0292d5e0b99f57f6a4090af512d0c12e4cafd3db09960f70cba7efbd7b664235b4c6147d74d368e12fc8ab5d8884db0fc514a135cd6b2ea5db47 SHA512 ef8956a191ba0627ac9070b590e32da9fff452dcd1cef1bebcf2a45266a1f218229b694e617de25da412109a3c4115049519b7f9855ffd7b2e8d7d61bad3f4ed
 DIST pwndbg-20220105.tar.gz 8272634 BLAKE2B a221fa3af2145a819bc780f3395a168a91371ce1218dc4acfee2ac3420a78c8550c98921dbb03f4bc928cdac07fdc6bed8be7c642a5be42064492192b3443ea6 SHA512 ebb61b402bb6cbaa516c2b1d885f231f6f591c2226d02d69cdd163f674ed41aba5505e3390b47e431f93a6e5de3867feb93c2be6da03a32c5f4c7a0ff074fa08
+DIST pwndbg-20220830.tar.gz 8302318 BLAKE2B fd6821d0846646927a3a7f0f352067360984f90156702bb8d2001b40651e20b11c8a33b07fa522f568f39ce6337f2503d930f745ab424d5ce6948a270e331c1f SHA512 be59544eb959ba05e6a662dbc629eb33a014c39d5ad5fceb44e9c6a9ccfa3ac6c133c082adfda1602002aff9eab3326d5b97aff7b6ce1357116a2d1fe6aa28fb
 EBUILD pwndbg-20220105.ebuild 2084 BLAKE2B d8cd8328788431c6ce918ab969f4cf8da33582dd8ff206adbec84eca40897a9e849d95933a5081d25e03ed3b34bf1e36fc8806b4aeccc86840f508da884e3958 SHA512 ddb0e7cb79774cf4625f718ff4cb23433546e16126d76ee9d8239ed59e33d4250e199e05d6570db8595c41df8f23a4c0e69523b25e5be48f6da098f4c2b35190
-EBUILD pwndbg-99999999.ebuild 2085 BLAKE2B 86f2a0bd6e28fdf273db5991b1e999764cb62c0f83ba7463a958683526727d61288c4a81604ee7b45f0d78e4d90c4b9a9daf33f17da1d9557f03890424909923 SHA512 f572f7bb5209f0e4b918622079925a6a1d6101b8904a95dddf54d6d673764d3072caf58ecd2cb3288590d19e04398bb59d87a7485166465dbdfdac35f315153d
+EBUILD pwndbg-20220830.ebuild 2439 BLAKE2B c479c8b1156861eb8cc0800d574f6e1baf1a6d568d0154385d286e4069f8d3a5aaf0783ce9e49c05e9ac09bf5883782d096e97e58a85c8d482e7269c52f87e70 SHA512 28b371189db96f745fc1cb58c2b2f972473f2c41b7b5f96b9fc335b8a61289e88d4e3924247d0b23ef6fe71a5bb29e3bd55889dab91a33f95a5cbc3cd8661da4
+EBUILD pwndbg-99999999.ebuild 2439 BLAKE2B c479c8b1156861eb8cc0800d574f6e1baf1a6d568d0154385d286e4069f8d3a5aaf0783ce9e49c05e9ac09bf5883782d096e97e58a85c8d482e7269c52f87e70 SHA512 28b371189db96f745fc1cb58c2b2f972473f2c41b7b5f96b9fc335b8a61289e88d4e3924247d0b23ef6fe71a5bb29e3bd55889dab91a33f95a5cbc3cd8661da4
 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d
diff --git a/dev-util/pwndbg/pwndbg-20220830.ebuild b/dev-util/pwndbg/pwndbg-20220830.ebuild
new file mode 100644
index 000000000000..daec33f529c5
--- /dev/null
+++ b/dev-util/pwndbg/pwndbg-20220830.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit python-single-r1 wrapper
+
+DESCRIPTION="A GDB plug-in that makes debugging with GDB suck less"
+HOMEPAGE="https://github.com/pwndbg/pwndbg"
+
+if [[ ${PV} == "99999999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwndbg/pwndbg"
+else
+	MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
+	GDB_PT_DUMP_COMMIT="f25898adc61d60e5f30c6452b15700bbf1bd630c"
+	SRC_URI="
+		https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/capstone[python,${PYTHON_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/isort[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pycparser[${PYTHON_USEDEP}]
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+		dev-python/python-ptrace[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-util/ROPgadget[${PYTHON_USEDEP}]
+		dev-util/unicorn[python,${PYTHON_USEDEP}]
+	')"
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]]; then
+		rm -r gdb-pt-dump/.git || die
+	else
+		sed -e "s/__version__ = '\(.*\)'/__version__ = '${PV}'/" \
+			-i pwndbg/version.py || die
+
+		rm -r gdb-pt-dump || die
+		mv "${WORKDIR}/gdb-pt-dump-${GDB_PT_DUMP_COMMIT}" gdb-pt-dump || die
+	fi
+
+	python_fix_shebang "${S}"
+	default
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r pwndbg/ gdbinit.py # ida_script.py
+	doins -r gdb-pt-dump/
+
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper "pwndbg" \
+		"gdb -x \"${EPREFIX}/usr/share/${PN}/gdbinit.py\"" || die
+
+	dodoc {README,DEVELOPING,FEATURES}.md
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		einfo "\nUsage:"
+		einfo "    ~$ pwndbg <program>"
+		ewarn "\nWARNING!!!"
+		ewarn "Some pwndbg commands only works with libc debug symbols.\n"
+		ewarn "See also:"
+		ewarn " * https://github.com/pentoo/pentoo-overlay/issues/521#issuecomment-548975884"
+		ewarn " * https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html"
+		ewarn " * https://wiki.gentoo.org/wiki/Debugging"
+	fi
+}
diff --git a/dev-util/pwndbg/pwndbg-99999999.ebuild b/dev-util/pwndbg/pwndbg-99999999.ebuild
index e2218320b275..daec33f529c5 100644
--- a/dev-util/pwndbg/pwndbg-99999999.ebuild
+++ b/dev-util/pwndbg/pwndbg-99999999.ebuild
@@ -15,7 +15,11 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="https://github.com/pwndbg/pwndbg"
 else
 	MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-	SRC_URI="https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	GDB_PT_DUMP_COMMIT="f25898adc61d60e5f30c6452b15700bbf1bd630c"
+	SRC_URI="
+		https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
+	"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
@@ -42,9 +46,14 @@ RDEPEND="
 	')"
 
 src_prepare() {
-	if [[ ${PV} != *9999 ]]; then
+	if [[ ${PV} == *9999 ]]; then
+		rm -r gdb-pt-dump/.git || die
+	else
 		sed -e "s/__version__ = '\(.*\)'/__version__ = '${PV}'/" \
 			-i pwndbg/version.py || die
+
+		rm -r gdb-pt-dump || die
+		mv "${WORKDIR}/gdb-pt-dump-${GDB_PT_DUMP_COMMIT}" gdb-pt-dump || die
 	fi
 
 	python_fix_shebang "${S}"
@@ -54,6 +63,7 @@ src_prepare() {
 src_install() {
 	insinto /usr/share/${PN}
 	doins -r pwndbg/ gdbinit.py # ida_script.py
+	doins -r gdb-pt-dump/
 
 	python_optimize "${ED}"/usr/share/${PN}
 
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
new file mode 100644
index 000000000000..e1edb79644b6
--- /dev/null
+++ b/dev-util/seer/Manifest
@@ -0,0 +1,4 @@
+DIST seer-1.9.tar.gz 337520 BLAKE2B 2c5a68cbc9a0530596501d2c92dfaccfe69f9b7fadc033efcb64b66a60a8f67e6e7bc06173bd5fd844ba104364328d30c017187143b2e1ea957b5a59fb3a7723 SHA512 e23a389d624488db445477687ea2129f8ef7364ea22229be6a79653878a73d328a3a7cde0233c951129dbc7478b0b5e3cfe37b694fe3eece030e37ad6a7ce87d
+EBUILD seer-1.9-r2.ebuild 827 BLAKE2B 223afed689bd5796acd44f12cafd687126d1522250ab67ffcde24ffd34169923dba05d09c90111aced86473263ca59b05c10766d8f6f3face7d06ecd05d72766 SHA512 73501710567735d0bf26f6882f7742025b3f8cb1cf58cae64696c238a5af1d34075ca16f664ae727eb771e6a917fdec725abb9606b15cff80f956f9489287834
+EBUILD seer-9999.ebuild 827 BLAKE2B 223afed689bd5796acd44f12cafd687126d1522250ab67ffcde24ffd34169923dba05d09c90111aced86473263ca59b05c10766d8f6f3face7d06ecd05d72766 SHA512 73501710567735d0bf26f6882f7742025b3f8cb1cf58cae64696c238a5af1d34075ca16f664ae727eb771e6a917fdec725abb9606b15cff80f956f9489287834
+MISC metadata.xml 318 BLAKE2B a34dc163a2b5e0fc9db7808eaa083a7b978a5578db14c5f33e870a2b73ec21f056c3b287997e8db4c1951e8d56852df746fccc30cf47ad24fdbae13896329014 SHA512 4c3706be2572cfb702b357753b35deb33199ed701d95b37f005919e374712ee5412a8b9214ea4c3c82e8371457b5571ed9a055b1df963196650a64e8c0d67fbd
diff --git a/dev-util/seer/metadata.xml b/dev-util/seer/metadata.xml
new file mode 100644
index 000000000000..250860a1fc53
--- /dev/null
+++ b/dev-util/seer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">epasveer/seer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/seer/seer-1.9-r2.ebuild b/dev-util/seer/seer-1.9-r2.ebuild
new file mode 100644
index 000000000000..b5ad9e01cc7a
--- /dev/null
+++ b/dev-util/seer/seer-1.9-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="A GUI frontend to gdb"
+HOMEPAGE="https://github.com/epasveer/seer"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/epasveer/seer"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+S="${WORKDIR}"/${P}/src
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-qt/qtcharts:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb
+"
+
+src_install() {
+	cmake_src_install
+
+	domenu resources/seergdb.desktop
+
+	local size
+	for size in 32 64 128 256 512 ; do
+		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
+	done
+}
diff --git a/dev-util/seer/seer-9999.ebuild b/dev-util/seer/seer-9999.ebuild
new file mode 100644
index 000000000000..b5ad9e01cc7a
--- /dev/null
+++ b/dev-util/seer/seer-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="A GUI frontend to gdb"
+HOMEPAGE="https://github.com/epasveer/seer"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/epasveer/seer"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+S="${WORKDIR}"/${P}/src
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-qt/qtcharts:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb
+"
+
+src_install() {
+	cmake_src_install
+
+	domenu resources/seergdb.desktop
+
+	local size
+	for size in 32 64 128 256 512 ; do
+		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
+	done
+}
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 064346d706ce..65acffc8fb33 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/Unicode-DFS-2016 b/licenses/Unicode-DFS-2016
new file mode 100644
index 000000000000..eca277f05e0e
--- /dev/null
+++ b/licenses/Unicode-DFS-2016
@@ -0,0 +1,56 @@
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+See Terms of Use for definitions of Unicode Inc.'s Data Files and Software.
+
+Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
+http://www.unicode.org/ivd/data/, and
+http://www.unicode.org/utility/trac/browser/.
+
+Unicode Data Files do not include PDF online code charts under the directory
+http://www.unicode.org/Public/.
+
+Software includes any source code published in the Unicode Standard or under
+the directories http://www.unicode.org/Public/,
+http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/,
+http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/utility/trac/browser/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
+INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA
+FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO
+BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT
+AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR
+SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under the
+Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the Unicode data files and any associated documentation (the "Data Files")
+or Unicode software and any associated documentation (the "Software") to deal
+in the Data Files or Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute, and/or
+sell copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either
+
+  * (a) this copyright and permission notice appear with all copies of the Data Files or Software, or 
+  * (b) this copyright and permission notice appear in associated Documentation. 
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
+PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE
+DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in these Data Files or Software without prior written authorization of the
+copyright holder.
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 606a6d53226f..297f29d2684b 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index 7d522996f7c1..e1470ac69858 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -1,4 +1,3 @@
-AUX 61-stix.conf 1929 BLAKE2B c44515faed76fcb503fa0a51f0b9c7a1a805fad718afcf547212ce73a7c42d6e55cba7fd401756dda1b11cf9f9cc182244d58503ca3f8638e74e81e0cfa30008 SHA512 578b29a2703f393d002e343a4184952f32a20272af6cc925d21310ca5163a88c8a50cf04c5289ad55df29845b62efa6a9773c8310022e82901ec896d92688de1
 DIST stix-fonts-2.11-FONTLOG.txt 27987 BLAKE2B b29daccfd54daaa59e694bf105d566fb14e4b4c8bf732dd9eccbdd610983e0fc3798a8f8c3bbca80e86190f9e44cdf27e527a721c0ef548addcf39c3f240c6f6 SHA512 3cd3c87b5b8c7ba4e4f76ed95349a375c5a365303f0e9a8bb26922c8b4382e47f4903531dacffd9f2d6df8bb0be8f50fb965695fc5c5ed69c443345140952067
 DIST stix-fonts-2.11-STIXTwoMath-Regular.pdf 988219 BLAKE2B 614fce509b4890aff9732fec997e1665bce256a381457a00b4508ebf052a2aeaa264bd13917c0df34610332a15fbf9a0951f00477d9e17bfb156bc62aff584c6 SHA512 be03b5539bff41b904a4971e07d717d2b8b5bc4805f05c18bb56ec79ee07d38dd7bd1274c0887fc3019594aa09945e59cee30a22a0406c7985dba72245987861
 DIST stix-fonts-2.11-STIXTwoText-Regular.pdf 371400 BLAKE2B 874d78aac0cf335f5d7a616ca54b8efd707d15a7e4a9d6c18541f277554688fc321f51d3c13d7ae9c55a916b8e4a17730c63c7886bbd81c509b6883c97096e5c SHA512 2cdfe0f3906480e8449c969ee52ece50322b27bf1d9f3da664086d0846fd5fdf007d5e1daf181a0cabc8b9a5c63645722f7ce3d3cd69d3930c6b3d3474e7f032
diff --git a/media-fonts/stix-fonts/files/61-stix.conf b/media-fonts/stix-fonts/files/61-stix.conf
deleted file mode 100644
index 2962606b92fb..000000000000
--- a/media-fonts/stix-fonts/files/61-stix.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>STIXGeneral</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>STIXGeneral</family>
-    </prefer>
-  </alias>
-  <alias binding="same">
-    <family>STIXIntegralsD</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXIntegralsSm</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXIntegralsUp</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXIntegralsUpD</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXIntegralsUpSm</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXNonUnicode</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSizeOneSym</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSizeTwoSym</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSizeThreeSym</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSizeFourSym</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXSizeFiveSym</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>STIXVariants</family>
-    <accept>
-      <family>STIXGeneral</family>
-    </accept>
-  </alias>
-</fontconfig>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d4ea2ac60a96..5221a2c8a156 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 5aefd7f5d272..eb87eb406aa1 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 AUX graphicsmagick-1.3.38-configure-bashism.patch 1203 BLAKE2B 0aa4a6cccd1f7e392446db33446b706df0e5a82b77abba3901ea7e8190ed592a4ce17b0544f08b59900cd48b3e57e029862ef94120ceca75536959fba15b9f7f SHA512 e45bc482381e4c58cd854d9d28b8a3a7bf83bc707f5d3a6290f28b1b333c84778c5e185f0a637348a2fbaac56790d6b9ddee1f2ee660ba67912300039d872330
 DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a
 DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09
-EBUILD graphicsmagick-1.3.38-r2.ebuild 3907 BLAKE2B c7b3391ca4bb71d891de01108ad5431f95599475711cf72583347e3507d30c57ecc7264617f5a9d8d26553d385cc6410777a51f4f73f1ec04a4290e46f41b601 SHA512 25847bc68b3bfc6f7cc5454f1f362cb62ebe6b0b1872a34291f80de68c2210760a78f6cdb8152cc5050a0ee9ad97b9080958eef173840cc629a2fcc0ef4ac41c
+EBUILD graphicsmagick-1.3.38-r2.ebuild 3904 BLAKE2B 4e310be38bb67c4d8ca27ff8075e88b5a410d1b290e7e7bfc40cdf2e596751298e36f9dfdd66f1832900e13fb2fb93c1cca1e7e7f1a4e9e502ba6a11f7cfbea8 SHA512 ceaa03f05154208e1a83e10b756144ced6db2a55578a11403cb86489765ed4dc86de011c98f452b40df0bc4c3b65f688db8b26ca94b407351c50fd1385d5243d
 EBUILD graphicsmagick-1.3.38.ebuild 3638 BLAKE2B 7e1d36212824ba42e77ec729b79002f566c667ee4a8e17e6c8d205485d976eee5b07308116f06aecb2cfa9763d47380acacd1796d3082f1e424bdcaef38cc562 SHA512 eeeda1a6e9cf3f8e038355249147f63444e009a7ca8b2432e6f6d76f12bb39ec4916ce4e2d98a68a2e0e9d2af68dc9471d23514dc30c86a724fb588bcb7b0882
 EBUILD graphicsmagick-9999.ebuild 3863 BLAKE2B de21652d2106509ffd3ba88039f2a8eb71d33a5dab2a8b7a715bed7c9c15fc1c8577a8eb2749c15a39421cd0f7a61635e9c0a601084f00a427300b3756c4a046 SHA512 7ed019f0b6991cd17bd64ac9df5af809b2a0f1381a5fbf965ef3982b17d87974829dce568ac633b1cf9337ee87082b11a0e9c458c9bc1ac7b70734625cdb8693
 MISC metadata.xml 1354 BLAKE2B 06f26407c7bbdbea6bb6ed510c3f497960a3ce8bf2ec296d3ff69eea8377774b7f7a1b37cb43eb63f7e7a31c4f74d978bb1ef863db9f87dba8d769aeca5e80c5 SHA512 9caa2359b6b15b397ce6108ebe941fd029e6b3d371c779a7bb3df5e0276b681067502aa10d12f5ab3eb427679818fdaa525dfdfba09c1fccf2511e23156aef7c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild
index b206d3380cfd..b5c50bed9b04 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index d38d8aa64216..4884aafa13c2 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,17 +1,9 @@
 AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5516260e8a8f243ab8bc61f95f6833185c3a997f5b046dc24690aeebfad925e0e180d98791aae1ad910e9aa069f0108dbd89 SHA512 647c367470deaaaa1ee14a02f80c8ed63de294ea7211a9010fad029bc9b254e27bc41c461561c28c2e24166fc17d0023238755160f8f22af641b0858e4bdceea
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25f05e2d9766031807500a6bb39cba2a800c39a93a16864ca9af3a0b33d0c1c95cb2f33264c7e00149204ca742673c3d07ff SHA512 ec96fca6b385379873ead007b011d87fb3939ed4e3631d2a9401f1467db59d1d1ced072fd4fefe1577d04302a1060dbc324631b420f41a99bf32465b540ec979
-DIST ImageMagick-6.9.12-58.tar.xz 9164316 BLAKE2B 0ef0b4fa289f945a2b787b6a3c04d9b96093c2e9ed07d5828d53b6e1518d5197473998081b22daf41e65d21bc65927b12dc66802430a68e0001116c4a446d03e SHA512 c73cd363bb7ac05b488d2960f61a9f0d87ab859da049038b21e0ed396b3a681361b0bcd4ad128c0397be26fac06e83b3f36868fba40a72645c42b3398ad6c930
 DIST ImageMagick-6.9.12-59.tar.xz 9178096 BLAKE2B 3ee13cf1bc0af33b720cce1d310bbdc1d6c08e17510b4d1d166228f6d84d15be0d1388b19153b1e21dee971d65f3a061ef19bc577c02218a49d2814538ec60c8 SHA512 c9ba09852543c6a00c041c7f7e27a24eae0f34bf8f9db1077fd34ccd9eb6d5a94787301d38b1e34636474cbc50830cdc812dbcd01b613f36063107346ec60213
-DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044
-DIST ImageMagick-7.1.0-43.tar.xz 10355700 BLAKE2B 2fe6472b864b0ca25ce5e0d7b045a6b3457fbdfa67e232b125183927b20e56ea2cc0a6225d51f0a2e09b36cc2500e7ee3c3ff99f3924aa3ca56e3e08f776ea3f SHA512 4f9c9625165eabcabc2edd745ad1755309d412591e5a8d383445d05b2bfe2d41df3e711c38be3ae5c8f504c0510452b1aff51e50edc24aa279bb742fb8ddd305
 DIST ImageMagick-7.1.0-44.tar.xz 10363636 BLAKE2B 547ec39391588bf609ab11e7353ec6b55773e40162ada486619c769b97989f728e7fa235fe23e6e8b0d0f8db500bcd273d6851fcb7f99a68a7177f1b67fc68a9 SHA512 e8467963b7243560901fcdd8a28b6dcca8052565f87848390852cf6deafad918d612d59e349a46ab90b159c0af8578b16cc982fae195dc8ef8ed95568e0cf05e
-EBUILD imagemagick-6.9.12.28.ebuild 7271 BLAKE2B 10af3bac2a382aefdb2d731fe40c2e59d9a61ea7801bae918eeff8f41f39123714ee75006aae03b18d413de740599dcf9ac12dbbf061c5e774947f90edacfb5d SHA512 f7eb66bad1739b447c462d23e2f391a268a62291b3b3642cd3404379fcce9e229e8a2386b90985bbdb98f884021b4202bfa78e2ea26903404aaa03f8824c861f
-EBUILD imagemagick-6.9.12.58.ebuild 7291 BLAKE2B d319e1ef709ebe2192253f91e707e4f43e603b326755bb83297c1f3c1252e369feeb3eeea74291c761a6de75e01c60899df8b3904177b6809903db8f87c389d2 SHA512 4ffebee83456ea0cfc8b7e037a00104d8e22fe5e049511f8be498d386db489ba1a8748780a1b416011a92b98d7b408a799de86df678d4bc9171f8359f90bf0b7
 EBUILD imagemagick-6.9.12.59.ebuild 7283 BLAKE2B afc301a0cd2176f5fac1ee9a789c25b36136c2ec7241d7c476cd957cae0afe5579d9e288418bc5786db61bca0afa1b728a1f43f46ee981227ba599218ae790c3 SHA512 92443162a9555a313b0d201ff7c301904cfe94a4e37a43e60bc978d2699efe79d87ce8d2b8ac440ecdfab12fea73783ca35ca17802c78e4f342562be2e8c8d58
-EBUILD imagemagick-7.1.0.13.ebuild 7485 BLAKE2B 896feef5fe189b78077bf00f94a6c97dcdadc41173ccbc1496892b2f226ad8e1acea5098cb4db713fb16580fe1283b0abb87d2d391a7924a8e8b46cccaea1bbf SHA512 faf93e670caf340354f5ecf2fc4e7321b6759aff9913b4a7c341c8664ac800ea113e66faadf16c080053bc0f706977298de923708b3e7ede2e136c955d6efb7c
-EBUILD imagemagick-7.1.0.43.ebuild 7583 BLAKE2B 0699e694a47615e142f4a9cead718f97b546642a28e03385f28a997104a5fc28831ede22c16db6e37af00d9ab51c2e809ba40a8445f94d679a27a80156d95b12 SHA512 85235f8ccf7cbc95ad65993a86dadbcb692bc3d60a55d2ae6a1b53dd8906a3d8800ef44cf101910a05c0e24999a43e7a0b2b47e1f7beb07923c3378b22650b59
 EBUILD imagemagick-7.1.0.44.ebuild 7575 BLAKE2B cd71ea357b65aaa7d460f4fc924935a96a91ea60a598f79071b2807d4b50cf2d53a15fdfa0e32b884414e290dac498b1d6f6cb4d1cdee3ebd26e13646195c641 SHA512 0abf2dfbb5802fdfa09bb9533e72b12d778e66f5df3761cd8ac385fe1f121138fcc95109dfe4d3bb6b0976eb6508d266cf0aa56e2bfeb1b31e35efd8bc813576
 EBUILD imagemagick-9999.ebuild 7583 BLAKE2B 0699e694a47615e142f4a9cead718f97b546642a28e03385f28a997104a5fc28831ede22c16db6e37af00d9ab51c2e809ba40a8445f94d679a27a80156d95b12 SHA512 85235f8ccf7cbc95ad65993a86dadbcb692bc3d60a55d2ae6a1b53dd8906a3d8800ef44cf101910a05c0e24999a43e7a0b2b47e1f7beb07923c3378b22650b59
 MISC metadata.xml 1318 BLAKE2B 8095c278f2dcaaf79ea8ccec1ebeebaf613331b00b49699c80b1d4c6f9c24cb6ef91e9d50f4de191ab19b3794838efdd95e76ce5b6d4bdc1c8a690891d449a2e SHA512 98d867c68ef82d426272f8c1be954289afd5351f426800dc7d70c4efe1f343b18fae85288c3b0cdb7d5063f522e0e2fe7d3af54d8e70db735f15c9ecf58207ce
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild
deleted file mode 100644
index 170a23afd362..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:=[x265] )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		$(use_enable openmp)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.58.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.58.ebuild
deleted file mode 100644
index 20654ea8d565..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.58.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.12-58"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!media-gfx/graphicsmagick[imagemagick]
-	dev-libs/libltdl
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:=[x265] )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:= )
-	png? ( media-libs/libpng:= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-	)
-	tiff? ( media-libs/tiff:= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-	)
-	webp? ( media-libs/libwebp:= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	xml? ( dev-libs/libxml2 )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	# Apply hardening, bug #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	# for Darwin modules
-	elibtoolize
-
-	# For testsuite, see bug #500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		$(use_enable openmp)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--with-gcc-arch=no-automagic
-	)
-
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in ${HOME} for test suite, bug #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		# bug #472766
-		doins "${T}"/99${PN}
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild
deleted file mode 100644
index ac18f6d0a928..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.1.0-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:=[x265] )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		$(use_enable openmp)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zip)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild
deleted file mode 100644
index 45768f836f09..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
-inherit autotools flag-o-matic perl-functions toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.1.0-43"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!media-gfx/graphicsmagick[imagemagick]
-	dev-libs/libltdl
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:=[x265] )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:= )
-	png? ( media-libs/libpng:= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-	)
-	tiff? ( media-libs/tiff:= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-	)
-	webp? ( media-libs/libwebp:= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	xml? ( dev-libs/libxml2 )
-	lzma? ( app-arch/xz-utils )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9999-nocputuning.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	#elibtoolize # for Darwin modules
-	eautoreconf
-
-	# Apply hardening, bug #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		$(use_enable openmp)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zip)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-	)
-
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite, bug #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == 9999 ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6de8abcf2eb8..a29ebbd5ecd4 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index b76d98595384..f73428e3a1ac 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,4 +1,3 @@
-AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124
 DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
 DIST libjpeg-turbo-2.1.4.tar.gz 2261822 BLAKE2B 80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972 SHA512 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch
deleted file mode 100644
index 7784ae513d16..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/libjpeg-turbo/libjpeg-turbo/commit/129f0cb76346ceede8f4d8d87dea8acb0809056c
-
-From: DRC <information@libjpeg-turbo.org>
-Date: Wed, 25 Aug 2021 12:07:58 -0500
-Subject: [PATCH] Neon/AArch64: Don't put GAS functions in .rodata
-
-Regression introduced by 240ba417aa4b3174850d05ea0d22dbe5f80553c1
-
-Closes #546
---- a/simd/arm/aarch64/jsimd_neon.S
-+++ b/simd/arm/aarch64/jsimd_neon.S
-@@ -182,6 +182,8 @@ Ljsimd_huff_encode_one_block_neon_consts:
-     .byte    4,   5,   6,   7, 255, 255, 255, 255, \
-            255, 255, 255, 255, 255, 255, 255, 255  /* L7 : 1 line OK */
- 
-+.text
-+
- 
- /*****************************************************************************/
- 
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index fa2f786f7c77..96f0d438448d 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,8 +1,10 @@
 AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839ce266dafe8cd79167911bceac5341e58c5ff13ff9604b741ee8726bd4990238345327038cf2cd61df5c28d7a15eeae67b62 SHA512 da34e0da810b119d230e40b17b8f3bb3b3f7c9414960bc41c528a366c9b5f5b2afb321bdfa5871d898ba2bcb98610c2848619ef0f0bc54a0675f75a40a6ce8d4
+AUX libsdl2-2.24.0-cmake-target-fixes.patch 6489 BLAKE2B 3703cae1f4220d6ca7899a2a1b61c083f560db30996f032eb6570f80e7b0bb3969b2c929ec104d461297502d5e46a8ae0a34d38f04d76b274894d124aa486905 SHA512 43710fa7d5321b688b2bd65460fff77d16943ff25280b7ba25c2676112db8e1ce9daeb2c144d41ed5473dcb4b38ad0a91686859949ff4a10ed4bea8769188b15
 DIST SDL2-2.0.20.tar.gz 7207221 BLAKE2B 03c6d462674aeb90559003e9f4c74f66833e193d2de3f3975f1e1684c5bdccb5c1b3c64c22c822777a63ee218d87fd04ff047b012d8db30a1565dafa34161623 SHA512 4889949eaa674948bdb0a01bb2a842a0943b15b08ff27ec0079b0fd4f79d071ffb32488a5a51c12ad7c74ed5fe73b608cdf6336a44c95dae8a0fb3f47d0f01de
 DIST SDL2-2.0.22.tar.gz 7250633 BLAKE2B 7f8b3efa709a0514f6a76df4ffc8b756d287d1e372ed107d0525a22cb5e6a168709136d375b6708b2073a76dd30d1bf06203d2c5c3eb2990e80519c7d1558df5 SHA512 ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a
 DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212
 EBUILD libsdl2-2.0.20-r1.ebuild 6517 BLAKE2B 89efe9162d5573532ef96dc696b62761430ea8e15e45dd40a2091775d192427c467b57869eeebdba6eb2f7bfaa4e0a51fb894d67a81f55cf45d1b6f2fac0c2c6 SHA512 de9198b77019e8afe0599084d88cc1cf1bf564079d5bb79e7f914e150b2b4640e0b38d835d329b6902f0cffcb0da26103e3213a1a211b82140af3ffffd95c2d2
 EBUILD libsdl2-2.0.22.ebuild 6496 BLAKE2B efc239ff9990aa047ca2364d169d70ef0c7c862c8ff3f9fd6b51a80af9799a638890b9a59eadfc5497e5f15441f00b7f8e193f6b3675d2ec91a6ffde542ee5ad SHA512 948022ba842ae928f73b5213aa042b163f7bbfe8096e5c1629865e9a0c0d3c9b89238f13d3713a8b65e7de1b012336f7ed97674c0bc1ec9b7cdb624ee2007be7
+EBUILD libsdl2-2.24.0-r1.ebuild 6418 BLAKE2B 54e9a9d42d25e56793b9516f36f7bac92eba16f5151bbd750c090dbb9cf448fbb3df0b99d9a5c6b2e73a0ddc902db012868f2cc9a0afbb671feca61acf3ed11c SHA512 3472a2c282c9505fb55539b8552943c479d5a6766f1f37faaecc22a7d34a3d903dc43af597f424dc421c962bbf6a16f0f6d2bc58bd0da07a4ca39cdb796d4161
 EBUILD libsdl2-2.24.0.ebuild 6373 BLAKE2B 174e817baa1a7203465903ee1b94edff04c5dd931e1c945a30afe5f19375b98632d327fdeff1ef2b5561452ef8643bc1623daa170b33bffd460aac6bee2ab3f5 SHA512 3c3512a3a2d9bd9f708f021c872e6b703efd9554dddaa65974fae10674256eff5ab634faeb967195882cefa4961213167b13589bb2e681c7503fb5e2d4fa38a9
 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1
diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch
new file mode 100644
index 000000000000..59353b98e06d
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.24.0-cmake-target-fixes.patch
@@ -0,0 +1,145 @@
+https://github.com/libsdl-org/SDL/commit/329794daf3f58088b56a64bdfa36b2021903be20
+https://github.com/libsdl-org/SDL/commit/62302d08f13ca5303135505c6b355afbbf069745
+
+From: Anonymous Maarten <anonymous.maarten@gmail.com>
+Date: Sun, 21 Aug 2022 04:03:32 +0200
+Subject: [PATCH] cmake: add library directories & pthread to imported targets
+ of sdl2-config.cmake
+
+This fixes linking to SDL2::SDL2-static on systems where external libraries such as X11 are not in a standard location.
+Pthread also needs special care.
+--- a/sdl2-config.cmake.in
++++ b/sdl2-config.cmake.in
+@@ -39,18 +39,25 @@ unset(bindir)
+ unset(libdir)
+ unset(includedir)
+ 
+-set(_sdl2_libraries "@SDL_LIBS@")
+-set(_sdl2_static_private_libs "@SDL_STATIC_LIBS@")
++set(_sdl2_libraries_in "@SDL_LIBS@")
++set(_sdl2_static_private_libs_in "@SDL_STATIC_LIBS@")
+ 
+-# Convert _sdl2_libraries to list and keep only libraries
+-string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries}")
++# Convert _sdl2_libraries to list and keep only libraries + library directories
++string(REGEX MATCHALL "-[lm]([-a-zA-Z0-9._]+)" _sdl2_libraries "${_sdl2_libraries_in}")
+ string(REGEX REPLACE "^-l" "" _sdl2_libraries "${_sdl2_libraries}")
+ string(REGEX REPLACE ";-l" ";" _sdl2_libraries "${_sdl2_libraries}")
++string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_libdirs "${_sdl2_libraries_in}")
++string(REGEX REPLACE "^-L" "" _sdl2_libdirs "${_sdl2_libdirs}")
++string(REGEX REPLACE ";-L" ";" _sdl2_libdirs "${_sdl2_libdirs}")
++list(APPEND _sdl2_libdirs "${SDL2_LIBDIR}")
+ 
+-# Convert _sdl2_static_private_libs to list and keep only libraries
+-string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)" _sdl2_static_private_libs "${_sdl2_static_private_libs}")
++# Convert _sdl2_static_private_libs to list and keep only libraries + library directories
++string(REGEX MATCHALL "(-[lm]([-a-zA-Z0-9._]+))|(-Wl,[^ ]*framework[^ ]*)|(-pthread)" _sdl2_static_private_libs "${_sdl2_static_private_libs_in}")
+ string(REGEX REPLACE "^-l" "" _sdl2_static_private_libs "${_sdl2_static_private_libs}")
+ string(REGEX REPLACE ";-l" ";" _sdl2_static_private_libs "${_sdl2_static_private_libs}")
++string(REGEX MATCHALL "-L([-a-zA-Z0-9._/]+)" _sdl2_static_private_libdirs "${_sdl2_static_private_libs_in}")
++string(REGEX REPLACE "^-L" "" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}")
++string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_private_libdirs}")
+ 
+ if(_sdl2_libraries MATCHES ".*SDL2main.*")
+   list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main)
+@@ -103,6 +110,7 @@ if(WIN32)
+       set_target_properties(SDL2::SDL2 PROPERTIES
+         INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
+         INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}"
++        INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}"
+         IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+         IMPORTED_IMPLIB "${_sdl2_implib}"
+         IMPORTED_LOCATION "${_sdl2_dll}"
+@@ -122,6 +130,7 @@ else()
+       set_target_properties(SDL2::SDL2 PROPERTIES
+         INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
+         INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries}"
++        INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs}"
+         IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+         IMPORTED_LOCATION "${_sdl2_shared}"
+       )
+@@ -142,6 +151,7 @@ if(EXISTS "${_sdl2_static}")
+         IMPORTED_LOCATION "${_sdl2_static}"
+         INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
+         INTERFACE_LINK_LIBRARIES "${_sdl2_link_libraries};${_sdl2_static_private_libs}"
++        INTERFACE_LINK_DIRECTORIES "${_sdl2_libdirs};${_sdl2_static_private_libdirs}"
+         IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+     )
+   endif()
+
+From: Anonymous Maarten <anonymous.maarten@gmail.com>
+Date: Wed, 24 Aug 2022 04:14:52 +0200
+Subject: [PATCH] cmake: always create SDL2::SDL2main target in autotools'
+ cmake config script
+
+--- a/sdl2-config.cmake.in
++++ b/sdl2-config.cmake.in
+@@ -62,38 +62,39 @@ string(REGEX REPLACE ";-L" ";" _sdl2_static_private_libdirs "${_sdl2_static_priv
+ if(_sdl2_libraries MATCHES ".*SDL2main.*")
+   list(INSERT SDL2_LIBRARIES 0 SDL2::SDL2main)
+   list(INSERT SDL2_STATIC_LIBRARIES 0 SDL2::SDL2main)
+-  set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  if(EXISTS "${_sdl2main_library}")
+-    set(SDL2MAIN_LIBRARY SDL2::SDL2main)
+-    if(NOT TARGET SDL2::SDL2main)
+-      add_library(SDL2::SDL2main STATIC IMPORTED)
+-      set_target_properties(SDL2::SDL2main
+-        PROPERTIES
+-          IMPORTED_LOCATION "${_sdl2main_library}"
+-      )
+-      if(WIN32)
+-        # INTERFACE_LINK_OPTIONS needs CMake 3.13
+-        cmake_minimum_required(VERSION 3.13)
+-        # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker.
+-        if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-          set_target_properties(SDL2::SDL2main
+-            PROPERTIES
+-              INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16"
+-          )
+-        else()
+-          set_target_properties(SDL2::SDL2main
+-            PROPERTIES
+-              INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain"
+-          )
+-        endif()
++endif()
++
++set(_sdl2main_library ${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX})
++if(EXISTS "${_sdl2main_library}")
++  set(SDL2MAIN_LIBRARY SDL2::SDL2main)
++  if(NOT TARGET SDL2::SDL2main)
++    add_library(SDL2::SDL2main STATIC IMPORTED)
++    set_target_properties(SDL2::SDL2main
++      PROPERTIES
++        IMPORTED_LOCATION "${_sdl2main_library}"
++    )
++    if(WIN32)
++      # INTERFACE_LINK_OPTIONS needs CMake 3.13
++      cmake_minimum_required(VERSION 3.13)
++      # Mark WinMain/WinMain@16 as undefined, such that it will be withheld by the linker.
++      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
++        set_target_properties(SDL2::SDL2main
++          PROPERTIES
++            INTERFACE_LINK_OPTIONS "-Wl,--undefined=_WinMain@16"
++        )
++      else()
++        set_target_properties(SDL2::SDL2main
++          PROPERTIES
++            INTERFACE_LINK_OPTIONS "-Wl,--undefined=WinMain"
++        )
+       endif()
+     endif()
+-    set(SDL2_SDL2main_FOUND TRUE)
+-  else()
+-    set(SDL2_SDL2main_FOUND FALSE)
+   endif()
+-  unset(_sdl2main_library)
++  set(SDL2_SDL2main_FOUND TRUE)
++else()
++  set(SDL2_SDL2main_FOUND FALSE)
+ endif()
++unset(_sdl2main_library)
+ 
+ # Remove SDL2 since this is the "central" library
+ # Remove SDL2main since this will be provided by SDL2::SDL2main (if available)
+
diff --git a/media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild b/media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild
new file mode 100644
index 000000000000..6d4ad20ae903
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.24.0-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://www.libsdl.org/"
+SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
+REQUIRED_USE="
+	alsa? ( sound )
+	fcitx4? ( dbus )
+	gles1? ( video )
+	gles2? ( video )
+	haptic? ( joystick )
+	ibus? ( dbus )
+	jack? ( sound )
+	nas? ( sound )
+	opengl? ( video )
+	pulseaudio? ( sound )
+	sndio? ( sound )
+	vulkan? ( video )
+	wayland? ( gles2 )
+	xscreensaver? ( X )"
+
+CDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fcitx4? ( app-i18n/fcitx:4 )
+	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] )
+	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	ibus? ( app-i18n/ibus )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	kms? (
+		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
+	)
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
+		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)"
+RDEPEND="${CDEPEND}
+	vulkan? ( media-libs/vulkan-loader )"
+DEPEND="${CDEPEND}
+	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	wayland? ( >=dev-util/wayland-scanner-1.20 )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/SDL2/SDL_config.h
+	/usr/include/SDL2/SDL_platform.h
+	/usr/include/SDL2/begin_code.h
+	/usr/include/SDL2/close_code.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.16-static-libs.patch
+	"${FILESDIR}"/${P}-cmake-target-fixes.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Unbundle some headers.
+	rm -r src/video/khronos || die
+	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
+
+	# SDL seems to customize SDL_config.h.in to remove macros like
+	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
+	# being reintroduced.
+	# https://bugs.gentoo.org/764959
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \
+		eautoreconf
+}
+
+multilib_src_configure() {
+	use custom-cflags || strip-flags
+
+	if use ibus; then
+		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
+	fi
+
+	# sorted by `./configure --help`
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--enable-atomic
+		$(use_enable sound audio)
+		$(use_enable video)
+		--enable-render
+		--enable-events
+		$(use_enable joystick)
+		$(use_enable haptic)
+		--enable-power
+		--enable-filesystem
+		$(use_enable threads pthreads)
+		--enable-timers
+		--enable-file
+		--enable-loadso
+		--enable-cpuinfo
+		--enable-assembly
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_sse ssemath)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable oss)
+		$(use_enable alsa)
+		--disable-alsa-shared
+		$(use_enable jack)
+		--disable-jack-shared
+		--disable-esd
+		$(use_enable pipewire)
+		--disable-pipewire-shared
+		$(use_enable pulseaudio)
+		--disable-pulseaudio-shared
+		--disable-arts
+		$(use_enable libsamplerate)
+		$(use_enable nas)
+		--disable-nas-shared
+		$(use_enable sndio)
+		--disable-sndio-shared
+		$(use_enable sound diskaudio)
+		$(use_enable sound dummyaudio)
+		$(use_enable wayland video-wayland)
+		--disable-wayland-shared
+		$(use_enable video_cards_vc4 video-rpi)
+		$(use_enable X video-x11)
+		--disable-x11-shared
+		$(use_enable X video-x11-xcursor)
+		$(use_enable X video-x11-xdbe)
+		$(use_enable X video-x11-xfixes)
+		$(use_enable X video-x11-xinput)
+		$(use_enable X video-x11-xrandr)
+		$(use_enable xscreensaver video-x11-scrnsaver)
+		$(use_enable X video-x11-xshape)
+		$(use_enable aqua video-cocoa)
+		--disable-video-directfb
+		--disable-fusionsound
+		--disable-fusionsound-shared
+		$(use_enable kms video-kmsdrm)
+		--disable-kmsdrm-shared
+		$(use_enable video video-dummy)
+		$(use_enable opengl video-opengl)
+		$(use_enable gles1 video-opengles1)
+		$(use_enable gles2 video-opengles2)
+		$(use_enable vulkan video-vulkan)
+		$(use_enable udev libudev)
+		$(use_enable dbus)
+		$(use_enable fcitx4 fcitx)
+		$(use_enable ibus)
+		--disable-directx
+		--disable-rpath
+		--disable-render-d3d
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		cd docs || die
+		doxygen || die
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# Do not delete the static .a libraries here as some are
+	# mandatory. They may be needed even when linking dynamically.
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
+	use doc && dodoc -r docs/output/html/
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 994115b383b4..d5f888913203 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 186fe79be85b..e7288999c476 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -14,5 +14,5 @@ EBUILD mpd-0.23.5.ebuild 8888 BLAKE2B 720e6e27f453b0a45f758674e15227953ad025a20b
 EBUILD mpd-0.23.6-r1.ebuild 7845 BLAKE2B 3d90c4be809d911408d5a2733748d13718518816a9e163997a8b9b70bae4ae43c9f08bf1a4848813250f3c17d6e46b39bb86f61fc367491d7d1aeefe67ebffd4 SHA512 f2fdc13933b6d61b900bd107e81bdeaab17f415b80743684dbb38c912600d04b599665d391f67dcfb890d2b30a7031606a48b54d1dfcab170649eba175f4aefc
 EBUILD mpd-0.23.7.ebuild 7881 BLAKE2B e4820273b66cbb205dddcfb0a15f0ee9521065da432ec51eeacb9182c9aa659e5b3a856f8e52f8a0fcb7d197ff80159dbfd1fbbac951a5664f7f88442611603b SHA512 45d92eafff221fa6981baa3362a65e05233f2ccff64d3d2c165561aade154a8c257ba7b07e06b54a4f79acc2f0eb94de8ad84e5798d216c431273e3ec047261f
 EBUILD mpd-0.23.8.ebuild 7881 BLAKE2B e4820273b66cbb205dddcfb0a15f0ee9521065da432ec51eeacb9182c9aa659e5b3a856f8e52f8a0fcb7d197ff80159dbfd1fbbac951a5664f7f88442611603b SHA512 45d92eafff221fa6981baa3362a65e05233f2ccff64d3d2c165561aade154a8c257ba7b07e06b54a4f79acc2f0eb94de8ad84e5798d216c431273e3ec047261f
-EBUILD mpd-0.23.9.ebuild 7828 BLAKE2B 9912f9a0b3ea2a1227d1f181dec5779a7990dc18f4e215d9a48a815f60a3d2fe5d587a05012d5f0b6468386025c6954d0c9f95444cf59ed38be4d4900cc82341 SHA512 0a97ca3a0cf2072bdc7ccbe03845d86f9a11c3b0d3cbe52b5f572228fa974a36a8660565e48728c971dd21b74a26d639ede386d10296dc112de2d3b498f2c51d
+EBUILD mpd-0.23.9.ebuild 7826 BLAKE2B a3375f8bfb694b98ac5f437c22c6b9a90c325d137245af5cfc73695dbbd6e1c21b7d02595def7db92c0b811c3d9b66043456f9d3fd3446ec6f9eef14f7a52482 SHA512 4212d1bafb5cf93c2dcd0d7925cb92a250b9677b8329fa8cb293aeed09b1d1805c9ca9beee9d5ce7a0e9aa0daa4fca45af1054f7e5799b8cb5e927ecffd43012
 MISC metadata.xml 2735 BLAKE2B 22624d573d9f0040d98cc8ad84ab9dbe710eab9f65454ccd7b111bd63ae4c9ce91c794869c6f566ca7182494622644c6c5933422e610a8d4ef9c590bb51fe295 SHA512 96996b5900b5366aa63b131240156dbc7393f54f7710b0474e2b0f0bc71e721b60278bd0b258d111d267004d9e1e6ed557081668afb448c291fc62829c2abd1b
diff --git a/media-sound/mpd/mpd-0.23.9.ebuild b/media-sound/mpd/mpd-0.23.9.ebuild
index 1fd13a8f0f7c..0c53684783c8 100644
--- a/media-sound/mpd/mpd-0.23.9.ebuild
+++ b/media-sound/mpd/mpd-0.23.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 7cb233e1cd87..0e8de2e56c5e 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -3,5 +3,5 @@ AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
 DIST snapcast-0.26.0.tar.gz 1537036 BLAKE2B f6ef4393f3601c749140a9505f57515582147aacf25072d9114491aafb108c202c3631142171858d2b8f914be8105bbd9c66054c6d36d0b4a443e5b9a642cf51 SHA512 fc7885e42a11794e33314544083251ffbb91a0cf160c6d4b854c56f57ffe9f38f75c7594478c9edabfe9076959938cd8de891dd456e66202692de664a75cde71
-EBUILD snapcast-0.26.0.ebuild 1582 BLAKE2B eedbe8e54c84718371de5a2100a9e45bfabed78b8d030bc05d3c41e7c7b45d94b88fb3bc92f57782e15a4cbcd5aeb0b5f3a881937180bfd31d52d4358952cdde SHA512 92b5eabef7744113b0caa682bd5f9fcf9bbf08ca8377616e1be2980e0fc10737dba19178901ba9ad8045e58cc4bc4192b9e17e2575ed721f43caf5ce5674e05b
+EBUILD snapcast-0.26.0.ebuild 1580 BLAKE2B 0f24fab9b1e9879139cfd2ab2e9eb9fc38fa073cfb0f42d2d8d08e45de1c8b21137c8ec1a8c992303ecd70f63b0780acb294e4d4d716076fabf6e190bca2c48f SHA512 ab428ca742dbbf56708ad74477dd87ff7af8f3366ea5bbbbabb4e15a0f50fdec70cbf4ee92236ef0c154435f0ae49e5192d952e2858b3a9c62cd68a1470cb580
 MISC metadata.xml 1040 BLAKE2B 5a5296b35eeae6e07b8b8c3dc3d63b58fb2d1aff7c0977f87690b9228183624c9d21fb2699aa82fef1d6027ff2cd89cb7a282cfa2c2ea0683f9da5a728fff17c SHA512 ac97766f2fe178adf1d6f642c60fab45be05e9b0509f34a270cb970ab16b3596ea90fc16b25d94b6457ff7c3543d4b88e5d291c62079ecc6b9d9e730fedc6250
diff --git a/media-sound/snapcast/snapcast-0.26.0.ebuild b/media-sound/snapcast/snapcast-0.26.0.ebuild
index eb636b7a42e5..676acf8c14ed 100644
--- a/media-sound/snapcast/snapcast-0.26.0.ebuild
+++ b/media-sound/snapcast/snapcast-0.26.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
 IUSE="+client +expat +flac +opus +server tremor +vorbis +zeroconf"
 REQUIRED_USE="|| ( server client )"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 0354eb5b717e..47eb32b65008 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ce18f69aaea6..49aeca427824 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Aug 2022 21:09:42 +0000
+Wed, 31 Aug 2022 03:09:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 08a9fb645768..b4d8ea582092 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 524322 BLAKE2B 3983f62074c223717c76ae7cd44857f5de5972e245bd5f084c8632e144cf7a950ad3ddd53324db99f9b82eb9e76e49cd3a84bf1f531314d7660db91335a05cb9 SHA512 9b6be0313a2999bb5ad817a373c95ecf8d02d687a3d707b14136357c7bc684ea302f0ccdb228be1e52484b458ecca78cec7150915afe09c096106aa055c4eae2
-TIMESTAMP 2022-08-30T21:09:45Z
+TIMESTAMP 2022-08-31T03:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMOfJlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMO0PpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCPAw//Ycxy2OJsf+JnThC0eZFRpY/CD1rAW5pVEoptU+mEbOK7/cp97G0Rsy3Q
-NPOIOVXMO4jcA51tg38vgsXM0RI8OZ5vEbEGR8hODTcdPCdqmUo3rmRscR+/WWAq
-UjeW/9aE4Bb9qoV1IePgKKcK+0tiVpBJmU9/Wz+j09TmIlgRhoM4Mbe4Gq8LkRTj
-y28ymTTTNiwdu4VIUDDin4lK3shqRCDi18W4p46CDnKHtDgKynCGVZys8rFsCN9j
-a+mFB9Y0A4twpAU9ikdbPNILQ1SoJDmz8Djwl+UDwDrkL6F0zBQB+jkJ4UHHX2Rq
-H6eFg8GQESTI8Oaba23lKm/vYHj9qirK9EwJeAn4jn3EszsEe3+6XdVEpG+ECPaD
-s9l/QAzxVfsObTgBrt2X60SU/y4bA8HC54hYpEB/rq2oU2IKCPj3CImanFZci2bl
-6pZC7zDCrbo0xXuxT8hq+fxwdsQgoQxPlOg/bmcqS1XfDPMxupicM38vD9ISQB93
-2Df2EPw+aoYqbVT8qMn7C2/+yvH+f/dh+1uz6LMX8TSvCO2EwBTciQF9uaRN8kbo
-pRGVbNaS9GclTOm6U+XdSBePtWCNhBCJ6xvcKIYyWIwPg7RiAXJpJEP9QDghKmx2
-W0b/LHz/jORqM4jIBUMA5o33B4vzgySQniHo9P54qnZcguz0m+A=
-=NuLJ
+klCMZxAAip8KHpNyyrCHmz0R/4xEFE+6rsnwnsp4l9SvfGVKQ2F/RhY/GnvYLEcS
+C0zAOS4IJl3Yy851VABA4L4afOyNyLH1roGDpso6wEOWFdowr7af0ZS1RQHSV/B7
+XCJzY1vri+jofFfQwW/XN+jRp040JU0EWArsJR9YJ3VfAkZQIk4w2ie1/VgNiDK0
+wh4ndvLM+/1fhW0YJIb19+7CY/L6QSAslCi8mkCv2MRjBYEOdWeWo77RNFrTj0W4
+v+f4NMEdc/7tL1QpLMIf05AFjfXuskLvgMG7Bx6VQCylW/GLy0jLWW7OMxyt5Dxj
+Wv4CtSC1G8sxFhZ+QWclztl3rQxxIEv82wWXhWDNEU4kWIxDZwm2+j9iEprq6soM
+xyK/s3ILnglxqePFgNfmdFL0OdVNZv6Q8iTmerni+diHF3p/HaZQdUBAJkSfhmoH
+3mRtA+GSHm60SB5v0s8yVkavUkQiED+IdQNFrQdi3T2dIk6XcvZDDBrK0JoX8QEu
+3xXL5ip2bVUPKkgBBeyWsXiv7oe4e1RCSKXzjtiDoeNQma6odMOqjJI8ZO5HRowU
+oR1unsIxTT12EqD2PuW7HwfUYEyiGdG330bAPR8Bo9xi9y/2lY8xNJ5vPTGO0hGY
+5+TBHfLKhDZz1bAuA3jadvW4qtAXkjUhpvv5giu6sdmnWHchEbQ=
+=XdLE
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ce18f69aaea6..49aeca427824 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Aug 2022 21:09:42 +0000
+Wed, 31 Aug 2022 03:09:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1658a9a33cc6..016cec3e686e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 005995e19906..f4160985d932 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/company-ebuild-0.1.2 b/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
new file mode 100644
index 000000000000..248bc24e12f8
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-26.2:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Company backend for editing Ebuild files
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/company-ebuild.git
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-26.2:*
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/company-ebuild.git/snapshot/company-ebuild-0.1.2.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=2d12f1b18d7c0b432b8f593d3179cbb3
diff --git a/metadata/md5-cache/app-emacs/company-ebuild-9999 b/metadata/md5-cache/app-emacs/company-ebuild-9999
index b50d17f6b531..16fa24d01638 100644
--- a/metadata/md5-cache/app-emacs/company-ebuild-9999
+++ b/metadata/md5-cache/app-emacs/company-ebuild-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-26.2:*
 SLOT=0
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
-_md5_=f45d1ff3e9f256e9dc272384d7c50049
+_md5_=2d12f1b18d7c0b432b8f593d3179cbb3
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.9.13_p20220720 b/metadata/md5-cache/app-emacs/company-mode-0.9.13_p20220720
index 78efe30ded2c..8683c3e61f25 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.9.13_p20220720
+++ b/metadata/md5-cache/app-emacs/company-mode-0.9.13_p20220720
@@ -4,10 +4,10 @@ DESCRIPTION=In-buffer completion front-end
 EAPI=8
 HOMEPAGE=https://company-mode.github.io/
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/16ffeba5ef96c4c8e0cd39860b5402e25e304601.tar.gz -> company-mode-0.9.13_p20220720.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=1a8dd26fa643f90aae59f4d643140dfe
+_md5_=4acd238e35fa0bdecbcfe0e06251f26a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 79a90d0b00f8..ced14471b317 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/jaq-0.8.0 b/metadata/md5-cache/app-misc/jaq-0.8.0
new file mode 100644
index 000000000000..0ecf095d5311
--- /dev/null
+++ b/metadata/md5-cache/app-misc/jaq-0.8.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Just another JSON query tool
+EAPI=8
+HOMEPAGE=https://github.com/01mf02/jaq
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 EPL-2.0 MIT Unicode-DFS-2016 Unlicense
+SLOT=0
+SRC_URI=https://github.com/01mf02/jaq/archive/refs/tags/v0.8.0.tar.gz -> jaq-0.8.0.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.3.8/download -> ahash-0.3.8.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/ariadne/0.1.5/download -> ariadne-0.1.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chumsky/0.8.0/download -> chumsky-0.8.0.crate https://crates.io/api/v1/crates/clap/3.2.17/download -> clap-3.2.17.crate https://crates.io/api/v1/crates/clap_derive/3.2.17/download -> clap_derive-3.2.17.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/colored_json/2.1.0/download -> colored_json-2.1.0.crate https://crates.io/api/v1/crates/const-random/0.1.13/download -> const-random-0.1.13.crate https://crates.io/api/v1/crates/const-random-macro/0.1.13/download -> const-random-macro-0.1.13.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/dyn-clone/1.0.9/download -> dyn-clone-1.0.9.crate https://crates.io/api/v1/crates/either/1.7.0/download -> either-1.7.0.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.3/download -> itoa-1.0.3.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.131/download -> libc-0.2.131.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.25/download -> libmimalloc-sys-0.1.25.crate https://crates.io/api/v1/crates/mimalloc/0.1.29/download -> mimalloc-0.1.29.crate https://crates.io/api/v1/crates/once_cell/1.13.0/download -> once_cell-1.13.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.3.0/download -> os_str_bytes-6.3.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/serde/1.0.143/download -> serde-1.0.143.crate https://crates.io/api/v1/crates/serde_derive/1.0.143/download -> serde_derive-1.0.143.crate https://crates.io/api/v1/crates/serde_json/1.0.83/download -> serde_json-1.0.83.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=aa24a76e33344605d7c5cc86c9a27c31
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 9d9858db939b..6c99c8a94fe8 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/elt-patches-20220830 b/metadata/md5-cache/app-portage/elt-patches-20220831
index 98d6765e2a8b..986cf949222d 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20220830
+++ b/metadata/md5-cache/app-portage/elt-patches-20220831
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/elt-patches-20220830.tar.xz https://dev.gentoo.org/~vapier/dist/elt-patches-20220830.tar.xz https://dev.gentoo.org/~sam/distfiles/app-portage/elt-patches/elt-patches-20220830.tar.xz
+SRC_URI=https://dev.gentoo.org/~grobian/distfiles/elt-patches-20220831.tar.xz https://dev.gentoo.org/~vapier/dist/elt-patches-20220831.tar.xz https://dev.gentoo.org/~sam/distfiles/app-portage/elt-patches/elt-patches-20220831.tar.xz
 _md5_=a8793cca8935d6585f6aeba91f251870
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 5002412684e3..6bfe43b828d2 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/aixlog-1.5.0 b/metadata/md5-cache/dev-cpp/aixlog-1.5.0
index 5cb6b7e98fa1..5c6426647832 100644
--- a/metadata/md5-cache/dev-cpp/aixlog-1.5.0
+++ b/metadata/md5-cache/dev-cpp/aixlog-1.5.0
@@ -4,9 +4,9 @@ DESCRIPTION=Header-only C++ logging library
 EAPI=7
 HOMEPAGE=https://github.com/badaix/aixlog
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/badaix/aixlog/archive/v1.5.0.tar.gz -> aixlog-1.5.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=76732113d7e0c60a917bc152e025f745
+_md5_=1aff0a9ab6bb0ccbf9905b7cb596f98a
diff --git a/metadata/md5-cache/dev-cpp/popl-1.2.0 b/metadata/md5-cache/dev-cpp/popl-1.2.0
index f80a61f6ce4a..58b7cdbaf641 100644
--- a/metadata/md5-cache/dev-cpp/popl-1.2.0
+++ b/metadata/md5-cache/dev-cpp/popl-1.2.0
@@ -4,9 +4,9 @@ DESCRIPTION=Header-only C++ program options parser library
 EAPI=7
 HOMEPAGE=https://github.com/badaix/popl
 INHERIT=cmake
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/badaix/popl/archive/v1.2.0.tar.gz -> popl-1.2.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aa31fab699276c3cc8cc775ccc643639
+_md5_=2303c712ca112b18d397427495ea3caf
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index d063a0b2a2ab..a188e36f545f 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlmap-1.6.6 b/metadata/md5-cache/dev-db/sqlmap-1.6.6
deleted file mode 100644
index 04480c2e0fa0..000000000000
--- a/metadata/md5-cache/dev-db/sqlmap-1.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=An automatic SQL injection and database takeover tool
-EAPI=8
-HOMEPAGE=https://sqlmap.org/
-INHERIT=bash-completion-r1 python-single-r1 wrapper
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 x86
-LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/sqlmapproject/sqlmap/archive/refs/tags/1.6.6.tar.gz -> sqlmap-1.6.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f15ec52958b664c8b8cd38e7aff8b814
diff --git a/metadata/md5-cache/dev-db/sqlmap-1.6.7 b/metadata/md5-cache/dev-db/sqlmap-1.6.7
deleted file mode 100644
index 56bffb1efa54..000000000000
--- a/metadata/md5-cache/dev-db/sqlmap-1.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=An automatic SQL injection and database takeover tool
-EAPI=8
-HOMEPAGE=https://sqlmap.org/
-INHERIT=bash-completion-r1 python-single-r1 wrapper
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/sqlmapproject/sqlmap/archive/refs/tags/1.6.7.tar.gz -> sqlmap-1.6.7.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a30c0eeccc3d53be3be8a623c3c2df58
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index a40499d3a98d..4cd4469b1206 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-4.0_alpha14 b/metadata/md5-cache/dev-games/godot-4.0_alpha14
index 4aae43654a04..5c216be870bb 100644
--- a/metadata/md5-cache/dev-games/godot-4.0_alpha14
+++ b/metadata/md5-cache/dev-games/godot-4.0_alpha14
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !tools? ( test )
 SLOT=4
 SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/alpha14/godot-4.0-alpha14.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d44dc0da7a4493f0902be69ca8c2d059
+_md5_=e1619e8db2afee45bdca87198fadb7c8
diff --git a/metadata/md5-cache/dev-games/godot-4.0_alpha15 b/metadata/md5-cache/dev-games/godot-4.0_alpha15
new file mode 100644
index 000000000000..fb3e2e5e675a
--- /dev/null
+++ b/metadata/md5-cache/dev-games/godot-4.0_alpha15
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( dev-util/glslang media-libs/alsa-lib media-libs/libglvnd[X] media-libs/vulkan-loader[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( dev-util/vulkan-headers x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
+EAPI=7
+HOMEPAGE=https://godotengine.org/
+INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+IUSE=+dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +webp
+LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( dev-util/glslang media-libs/alsa-lib media-libs/libglvnd[X] media-libs/vulkan-loader[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
+RESTRICT=!test? ( test ) !tools? ( test ) !webp? ( test )
+SLOT=4
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/alpha15/godot-4.0-alpha15.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6707244eb6481d119b13e295330663c2
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index fa9959ffda81..81bd1f64f6dd 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.2-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
index 42b8b01878bc..07c974f542e1 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=<sys-devel/llvm-15:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) !!sys-devel/llvm:0
 DESCRIPTION=assembly/assembler framework + bindings
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.2.tar.gz -> keystone-0.9.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=21d0005dc5570b4bae424b7abf8151d2
+_md5_=88183f2dedac03162251850b79a0b0ab
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index a6d584b49ecf..c22f142ab3b3 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=<sys-devel/llvm-15:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) !!sys-devel/llvm:0
 DESCRIPTION=assembly/assembler framework + bindings
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llv
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=21d0005dc5570b4bae424b7abf8151d2
+_md5_=88183f2dedac03162251850b79a0b0ab
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20220618 b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20220618
new file mode 100644
index 000000000000..c8b8e18c6a8f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20220618
@@ -0,0 +1,13 @@
+BDEPEND=verify-sig? ( app-crypt/minisign ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
+EAPI=8
+HOMEPAGE=https://libsodium.org
+INHERIT=autotools multilib-minimal
+IUSE=+asm minimal static-libs +urandom cpu_flags_x86_aes cpu_flags_x86_sse4_1 verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=ISC
+SLOT=0/23
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20220618.tar.gz -> libsodium-1.0.18_p20220618.tar.gz verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20220618.tar.gz.minisig -> libsodium-1.0.18_p20220618.tar.gz.minisig )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1ceafa050cb11585c1feb86e4b3e368b
diff --git a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4 b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
index 4810c4a550c8..984016bd326d 100644
--- a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4
+++ b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.1.4.tar.gz -> libxlsxwriter-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e11ab52fd9517b447d5589ddea77c678
+_md5_=5b231797a12f30ccd2aa24844f0bc1d9
diff --git a/metadata/md5-cache/dev-libs/tlsh-4.8.2 b/metadata/md5-cache/dev-libs/tlsh-4.8.2
index abae1035cb42..18e46fa5c998 100644
--- a/metadata/md5-cache/dev-libs/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-libs/tlsh-4.8.2
@@ -4,9 +4,9 @@ DESCRIPTION=Fuzzy matching library
 EAPI=8
 HOMEPAGE=https://github.com/trendmicro/tlsh
 INHERIT=cmake
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=|| ( Apache-2.0 BSD )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1a5dc3a1709bd43b17da6d17fb2c8d6e
+_md5_=f102852bc6cec845ceb80c13967b06bc
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index a29ea00f4d98..7b25afaec9c1 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luasec-1.2.0 b/metadata/md5-cache/dev-lua/luasec-1.2.0
index eb2e3788c3e6..0a59847da7fd 100644
--- a/metadata/md5-cache/dev-lua/luasec-1.2.0
+++ b/metadata/md5-cache/dev-lua/luasec-1.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/brunoos/luasec
 INHERIT=lua toolchain-funcs
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r103[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v1.2.0.tar.gz -> luasec-1.2.0.tar.gz
 _eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e5c1ab0cac5083d674aacd6abe068163
+_md5_=9defa14bd596f0c498237468faa22b18
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index aec861820e6d..bcf0b03d5dc6 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc20 b/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc20
new file mode 100644
index 000000000000..2f22a760031a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc20
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-admin/salt-3001.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pyfakefs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-admin/salt-3001.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The new generation of the pytest-salt Plugin
+EAPI=8
+HOMEPAGE=https://github.com/saltstack/pytest-salt-factories
+INHERIT=distutils-r1
+IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-admin/salt-3001.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/saltstack/pytest-salt-factories/archive/1.0.0rc20.tar.gz -> pytest-salt-factories-1.0.0_rc20.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a328d134a4f376c89445fc9c9d373f15
diff --git a/metadata/md5-cache/dev-python/tlsh-4.8.2 b/metadata/md5-cache/dev-python/tlsh-4.8.2
index 5af0d782c680..f4c3ef297a31 100644
--- a/metadata/md5-cache/dev-python/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-python/tlsh-4.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/python-tlsh/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=dev-libs/tlsh python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a4f2140a4be55d6d2bd377abbf54df76
+_md5_=12ea9cbc3134ee0cd23f800ea9cb4b3a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c137b0f621ce..b391b60095da 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cargo-tarpaulin-0.21.0 b/metadata/md5-cache/dev-util/cargo-tarpaulin-0.21.0
new file mode 100644
index 000000000000..a8956547613a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-tarpaulin-0.21.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Cargo-Tarpaulin is a tool to determine code coverage achieved via tests
+EAPI=8
+HOMEPAGE=https://github.com/xd009642/tarpaulin
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unlicense ZLIB
+SLOT=0
+SRC_URI=https://github.com/xd009642/tarpaulin/archive/refs/tags/0.21.0.tar.gz -> cargo-tarpaulin-0.21.0.gh.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/android_system_properties/0.1.4/download -> android_system_properties-0.1.4.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/camino/1.0.9/download -> camino-1.0.9.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.0/download -> cargo_metadata-0.15.0.crate https://crates.io/api/v1/crates/cc/1.0.72/download -> cc-1.0.72.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.22/download -> chrono-0.4.22.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/coveralls-api/0.5.0/download -> coveralls-api-0.5.0.crate https://crates.io/api/v1/crates/crc32fast/1.3.0/download -> crc32fast-1.3.0.crate https://crates.io/api/v1/crates/curl/0.4.41/download -> curl-0.4.41.crate https://crates.io/api/v1/crates/curl-sys/0.4.51+curl-7.80.0/download -> curl-sys-0.4.51+curl-7.80.0.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/gimli/0.26.2/download -> gimli-0.26.2.crate https://crates.io/api/v1/crates/git2/0.15.0/download -> git2-0.15.0.crate https://crates.io/api/v1/crates/gzip-header/0.3.0/download -> gzip-header-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.1/download -> hashbrown-0.12.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.46/download -> iana-time-zone-0.1.46.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/0.7.2/download -> io-lifetimes-0.7.2.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/js-sys/0.3.58/download -> js-sys-0.3.58.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libgit2-sys/0.14.0+1.5.0/download -> libgit2-sys-0.14.0+1.5.0.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.23/download -> libssh2-sys-0.2.23.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/linux-raw-sys/0.0.46/download -> linux-raw-sys-0.0.46.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matchers/0.0.1/download -> matchers-0.0.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/md5/0.7.0/download -> md5-0.7.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/nix/0.24.2/download -> nix-0.24.2.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/object/0.29.0/download -> object-0.29.0.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.4/download -> openssl-probe-0.1.4.crate https://crates.io/api/v1/crates/openssl-src/111.22.0+1.1.1q/download -> openssl-src-111.22.0+1.1.1q.crate https://crates.io/api/v1/crates/openssl-sys/0.9.72/download -> openssl-sys-0.9.72.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/procfs/0.14.1/download -> procfs-0.14.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-xml/0.23.0/download -> quick-xml-0.23.0.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.35.6/download -> rustix-0.35.6.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/semver/1.0.10/download -> semver-1.0.10.crate https://crates.io/api/v1/crates/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/serde_derive/1.0.144/download -> serde_derive-1.0.144.crate https://crates.io/api/v1/crates/serde_json/1.0.85/download -> serde_json-1.0.85.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/tracing/0.1.34/download -> tracing-0.1.34.crate https://crates.io/api/v1/crates/tracing-core/0.1.22/download -> tracing-core-0.1.22.crate https://crates.io/api/v1/crates/tracing-log/0.1.2/download -> tracing-log-0.1.2.crate https://crates.io/api/v1/crates/tracing-subscriber/0.2.25/download -> tracing-subscriber-0.2.25.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.81/download -> wasm-bindgen-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.81/download -> wasm-bindgen-backend-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.81/download -> wasm-bindgen-macro-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.81/download -> wasm-bindgen-macro-support-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.81/download -> wasm-bindgen-shared-0.2.81.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=373612fa505e08542165c4a52a60e249
diff --git a/metadata/md5-cache/dev-util/diffoscope-214 b/metadata/md5-cache/dev-util/diffoscope-214
deleted file mode 100644
index faf5f53e1d1b..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-214
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-INHERIT=distutils-r1
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-214.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ade38f3116095a40dbaf5f6554f6d2f
diff --git a/metadata/md5-cache/dev-util/diffoscope-220 b/metadata/md5-cache/dev-util/diffoscope-220
deleted file mode 100644
index 6ac6cab8c2b6..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-220
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-INHERIT=distutils-r1
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-220.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=27fac03f8e1f1928e0badac1c0690334
diff --git a/metadata/md5-cache/dev-util/diffoscope-221 b/metadata/md5-cache/dev-util/diffoscope-221
index 0784bf73174f..f7ccbc1de477 100644
--- a/metadata/md5-cache/dev-util/diffoscope-221
+++ b/metadata/md5-cache/dev-util/diffoscope-221
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 INHERIT=distutils-r1
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-221.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=27fac03f8e1f1928e0badac1c0690334
+_md5_=911c9fcf082f30db048e57d761b48b3f
diff --git a/metadata/md5-cache/dev-util/ninja-1.11.1 b/metadata/md5-cache/dev-util/ninja-1.11.1
new file mode 100644
index 000000000000..1cdf012953be
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ninja-1.11.1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest )
+DEFINED_PHASES=compile install postinst postrm setup test
+DESCRIPTION=A small build system similar to make
+EAPI=8
+HOMEPAGE=https://ninja-build.org/
+INHERIT=edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+IUSE=doc emacs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ninja-build/ninja/archive/v1.11.1.tar.gz -> ninja-1.11.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=964c7bbaed1bd1f2d3b00f870e8d91d8
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index b4485b01a4c1..ba7d68f59b0d 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -1,14 +1,14 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm setup test unpack
 DESCRIPTION=A small build system similar to make
-EAPI=7
+EAPI=8
 HOMEPAGE=https://ninja-build.org/
-INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs git-r3
-IUSE=doc emacs test vim-syntax
+INHERIT=edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs git-r3
+IUSE=doc emacs test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c2711d3dd1b76a231d592bf02bc2e7e9
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=964c7bbaed1bd1f2d3b00f870e8d91d8
diff --git a/metadata/md5-cache/dev-util/pwndbg-20220830 b/metadata/md5-cache/dev-util/pwndbg-20220830
new file mode 100644
index 000000000000..2984eb4ff0dc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pwndbg-20220830
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=A GDB plug-in that makes debugging with GDB suck less
+EAPI=8
+HOMEPAGE=https://github.com/pwndbg/pwndbg
+INHERIT=python-single-r1 wrapper
+IUSE=python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-devel/gdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_9? ( dev-libs/capstone[python,python_targets_python3_9(-)] dev-python/future[python_targets_python3_9(-)] dev-python/isort[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pycparser[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] dev-python/python-ptrace[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-util/ROPgadget[python_targets_python3_9(-)] dev-util/unicorn[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/capstone[python,python_targets_python3_10(-)] dev-python/future[python_targets_python3_10(-)] dev-python/isort[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pycparser[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] dev-python/python-ptrace[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-util/ROPgadget[python_targets_python3_10(-)] dev-util/unicorn[python,python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/pwndbg/pwndbg/archive/2022.08.30.tar.gz -> pwndbg-20220830.tar.gz https://github.com/martinradev/gdb-pt-dump/archive/f25898adc61d60e5f30c6452b15700bbf1bd630c.tar.gz -> gdb-pt-dump-f25898adc61d60e5f30c6452b15700bbf1bd630c.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a322d4362d09c938445af595ac041997
diff --git a/metadata/md5-cache/dev-util/pwndbg-99999999 b/metadata/md5-cache/dev-util/pwndbg-99999999
index d3fa29ef0f22..33807e3ad903 100644
--- a/metadata/md5-cache/dev-util/pwndbg-99999999
+++ b/metadata/md5-cache/dev-util/pwndbg-99999999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fb5a3150b6817c817c1e52e7892f12a
+_md5_=a322d4362d09c938445af595ac041997
diff --git a/metadata/md5-cache/dev-util/seer-1.9-r2 b/metadata/md5-cache/dev-util/seer-1.9-r2
new file mode 100644
index 000000000000..c0f62d70641f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/seer-1.9-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+DESCRIPTION=A GUI frontend to gdb
+EAPI=8
+HOMEPAGE=https://github.com/epasveer/seer
+INHERIT=cmake desktop xdg
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-devel/gdb
+SLOT=0
+SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.9.tar.gz -> seer-1.9.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=725545c51f93786b8089f4f9172b30e2
diff --git a/metadata/md5-cache/dev-util/seer-9999 b/metadata/md5-cache/dev-util/seer-9999
new file mode 100644
index 000000000000..ffc3ca32896e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/seer-9999
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+DESCRIPTION=A GUI frontend to gdb
+EAPI=8
+HOMEPAGE=https://github.com/epasveer/seer
+INHERIT=cmake desktop xdg git-r3
+LICENSE=GPL-3
+PROPERTIES=live
+RDEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-devel/gdb
+SLOT=0
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=725545c51f93786b8089f4f9172b30e2
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f5dfbbc3e223..2fa818a712e2 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38-r2 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38-r2
index c77ea6edf774..e54556dbcff8 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38-r2
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM
 INHERIT=autotools toolchain-funcs verify-sig
 IUSE=bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma openmp perl png postscript q16 q32 static-libs svg tcmalloc threads tiff truetype webp wmf X zlib zstd verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) heif? ( media-libs/libheif:= ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tcmalloc? ( dev-util/google-perftools:= ) tiff? ( media-libs/tiff ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.38.tar.xz verify-sig? ( mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.38.tar.xz.sig )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=28d7a5930a429407bfd99ec4de5d400a
+_md5_=1f358035c3b199239eccd2d0756ff27c
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.28 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.28
deleted file mode 100644
index 0d8d602dfdef..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.28
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=8
-HOMEPAGE=https://www.imagemagick.org/
-INHERIT=flag-o-matic libtool perl-functions toolchain-funcs
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/6.9.11-60
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-28.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=633f61aba52f40f12a634808b0e7587f
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.58 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.58
deleted file mode 100644
index a3edc90381d4..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.58
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=8
-HOMEPAGE=https://www.imagemagick.org/
-INHERIT=flag-o-matic libtool perl-functions toolchain-funcs
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/6.9.12-58
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-58.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ef67f2e6d2266a74594063b892e1ea8f
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.13 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.13
deleted file mode 100644
index 481b5fb01e26..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.13
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=8
-HOMEPAGE=https://www.imagemagick.org/
-INHERIT=flag-o-matic libtool perl-functions toolchain-funcs
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.1.0-0
-SRC_URI=mirror://imagemagick/ImageMagick-7.1.0-13.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1f113420c1983b0520159039f89a3dd5
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.43 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.43
deleted file mode 100644
index 1f433de9e896..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.43
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=8
-HOMEPAGE=https://www.imagemagick.org/
-INHERIT=autotools flag-o-matic perl-functions toolchain-funcs
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.1.0-43
-SRC_URI=mirror://imagemagick/ImageMagick-7.1.0-43.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d1bbfe0775eb609277b70a2658f85bda
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 4d10c68449ff..5ae93edc1dbb 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.24.0-r1 b/metadata/md5-cache/media-libs/libsdl2-2.24.0-r1
new file mode 100644
index 000000000000..6e7eae256f80
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsdl2-2.24.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) wayland? ( >=dev-util/wayland-scanner-1.20 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fcitx4? ( app-i18n/fcitx:4 ) gles1? ( media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles1] ) gles2? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) ibus? ( app-i18n/ibus ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kms? ( >=x11-libs/libdrm-2.4.82[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gbm(+)] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( media-video/pipewire:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ibus? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Simple Direct Media Layer
+EAPI=8
+HOMEPAGE=https://www.libsdl.org/
+INHERIT=autotools flag-o-matic multilib-minimal
+IUSE=alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=ZLIB
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fcitx4? ( app-i18n/fcitx:4 ) gles1? ( media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles1] ) gles2? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) ibus? ( app-i18n/ibus ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kms? ( >=x11-libs/libdrm-2.4.82[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gbm(+)] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( media-video/pipewire:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
+REQUIRED_USE=alsa? ( sound ) fcitx4? ( dbus ) gles1? ( video ) gles2? ( video ) haptic? ( joystick ) ibus? ( dbus ) jack? ( sound ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) sndio? ( sound ) vulkan? ( video ) wayland? ( gles2 ) xscreensaver? ( X )
+SLOT=0
+SRC_URI=https://www.libsdl.org/release/SDL2-2.24.0.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ba8c7cf79bf8f6491026bda67bfb2b0a
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 61c7c5e44546..d13543a9b541 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/mpd-0.23.9 b/metadata/md5-cache/media-sound/mpd-0.23.9
index a07f95383526..132edf0ab598 100644
--- a/metadata/md5-cache/media-sound/mpd-0.23.9
+++ b/metadata/md5-cache/media-sound/mpd-0.23.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
 INHERIT=flag-o-matic linux-info meson systemd xdg
 IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd test twolame udisks vorbis wavpack webdav wildmidi upnp zeroconf zip zlib
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-user/mpd dev-libs/libfmt:= dev-libs/libpcre2 media-libs/libogg sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= virtual/libiconv ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2.4.0 ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) pipewire? ( media-video/pipewire:= ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) snapcast? ( media-sound/snapcast ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd:= ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) qobuz? ( curl soundcloud ) soundcloud? ( curl qobuz ) udisks? ( dbus ) upnp? ( curl expat ) webdav? ( curl expat )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.23/mpd-0.23.9.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	56708ddc53d8b607ed88fd97a56e59dc	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c4fa186a5067b56c2abbbe5f9e7aadea
+_md5_=09f78989ea5070f70820c29ece0dbeca
diff --git a/metadata/md5-cache/media-sound/snapcast-0.26.0 b/metadata/md5-cache/media-sound/snapcast-0.26.0
index a57dea99141a..5a51cbf0d0c8 100644
--- a/metadata/md5-cache/media-sound/snapcast-0.26.0
+++ b/metadata/md5-cache/media-sound/snapcast-0.26.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/badaix/snapcast
 INHERIT=cmake
 IUSE=+client +expat +flac +opus +server tremor +vorbis +zeroconf
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/boost:= media-libs/alsa-lib client? ( acct-user/snapclient ) expat? ( dev-libs/expat ) flac? ( media-libs/flac ) opus? ( media-libs/opus ) server? ( acct-group/snapserver acct-user/snapserver ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=|| ( server client )
 SLOT=0
 SRC_URI=https://github.com/badaix/snapcast/archive/v0.26.0.tar.gz -> snapcast-0.26.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=179731c87d885d33dd9ccd91b430bdda
+_md5_=f043882bdd3c8338bbfe8ff9bcd9d0d7
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 79a5b41e859b..d21980f242c7 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libssh-0.10.0-r1 b/metadata/md5-cache/net-libs/libssh-0.10.1
index a44be5946415..b74bd5103f29 100644
--- a/metadata/md5-cache/net-libs/libssh-0.10.0-r1
+++ b/metadata/md5-cache/net-libs/libssh-0.10.1
@@ -12,6 +12,6 @@ RDEPEND=!gcrypt? ( !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,ab
 REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=!test? ( test )
 SLOT=0/4
-SRC_URI=https://www.libssh.org/files/0.10/libssh-0.10.0.tar.xz
+SRC_URI=https://www.libssh.org/files/0.10/libssh-0.10.1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a9373f3bdf1f2e7c1cb482631f203181
+_md5_=d3e3de9e6464405da2a83590d43ee79e
diff --git a/metadata/md5-cache/net-libs/libssh-9999 b/metadata/md5-cache/net-libs/libssh-9999
index 36094c1c4695..d28057c27f8f 100644
--- a/metadata/md5-cache/net-libs/libssh-9999
+++ b/metadata/md5-cache/net-libs/libssh-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=!test? ( test )
 SLOT=0/4
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d920ceb0bc3a8c3df3bc2294f7ea5a99
+_md5_=d3e3de9e6464405da2a83590d43ee79e
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.3.4 b/metadata/md5-cache/net-libs/socket_wrapper-1.3.4
index 00cff2a9e085..22483ca9ff0e 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.3.4
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.3.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://cwrap.org/socket_wrapper.html
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.3.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fac3b7ad64a401d8068238bbde7580d3
+_md5_=72305b398daf330e8ad5945624972299
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index c61cd63c80ff..a12246979a35 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/libdap-3.18.1 b/metadata/md5-cache/sci-libs/libdap-3.18.1
deleted file mode 100644
index 604bd344ea3b..000000000000
--- a/metadata/md5-cache/sci-libs/libdap-3.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libxml2:2 net-misc/curl sys-libs/zlib virtual/pkgconfig sys-devel/flex test? ( dev-util/cppunit ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Implementation of a C++ SDK for DAP 2.0 and 3.2
-EAPI=6
-HOMEPAGE=https://www.opendap.org
-INHERIT=autotools flag-o-matic
-IUSE=static-libs test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-2.1 URI )
-RDEPEND=dev-libs/libxml2:2 net-misc/curl sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.opendap.org/pub/source/libdap-3.18.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6202ca3a9df310516a253679925b75fb
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index f55d8047141c..57883cfef4ab 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/calc-2.12.5.4 b/metadata/md5-cache/sci-mathematics/calc-2.12.5.4
deleted file mode 100644
index 085d18706e28..000000000000
--- a/metadata/md5-cache/sci-mathematics/calc-2.12.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig
-DESCRIPTION=Arbitrary precision C-like arithmetic system
-EAPI=6
-HOMEPAGE=http://www.isthe.com/chongo/tech/comp/calc/
-INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=http://www.isthe.com/chongo/src/calc/calc-2.12.5.4.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=771f2d0a4029f017f2bdeab8705393eb
diff --git a/metadata/md5-cache/sci-mathematics/jags-4.2.0 b/metadata/md5-cache/sci-mathematics/jags-4.2.0
deleted file mode 100644
index e30643551df6..000000000000
--- a/metadata/md5-cache/sci-mathematics/jags-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=virtual/blas virtual/lapack virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra )
-DESCRIPTION=Just Another Gibbs Sampler for Bayesian MCMC simulation
-EAPI=6
-HOMEPAGE=http://mcmc-jags.sourceforge.net/
-INHERIT=toolchain-funcs
-IUSE=doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/blas virtual/lapack
-SLOT=0
-SRC_URI=mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.2.0.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f960cee34ddeaa990981cf525b087064
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e13724a3fe34..38ebcec49ea3 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/dbus-1.14.0-r4 b/metadata/md5-cache/sys-apps/dbus-1.14.0-r4
index ad09945bcd84..21da4cfb29aa 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.14.0-r4
+++ b/metadata/md5-cache/sys-apps/dbus-1.14.0-r4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/dbus/
 INHERIT=autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
 IUSE=debug doc elogind selinux static-libs systemd test X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) acct-user/messagebus selinux? ( sec-policy/selinux-dbus ) systemd? ( virtual/tmpfiles )
 REQUIRED_USE=?? ( elogind systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cff108da53c3870549c5c1559639c891
+_md5_=b3a5f7eacd06f118e2a52d381a2edbec
diff --git a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3 b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
index 59f287eb442c..8d048e43ab7b 100644
--- a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
+++ b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.red-bean.com/~bos/
 INHERIT=toolchain-funcs
 IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.red-bean.com/~bos/netplug/netplug-1.2.9.2.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ca191c4b2f86f4f0d92dd8cfd7682e84
+_md5_=6ac0efacff172d38ca21e12ca2c4475d
diff --git a/metadata/md5-cache/sys-apps/sparc-utils-1.9-r7 b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r7
index c447db814687..3327dc162412 100644
--- a/metadata/md5-cache/sys-apps/sparc-utils-1.9-r7
+++ b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Various sparc utilities from Debian GNU/Linux
 EAPI=8
 HOMEPAGE=https://packages.debian.org/sparc-utils
 INHERIT=toolchain-funcs
-KEYWORDS=-* ~sparc
+KEYWORDS=-* sparc
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.13-r1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9.orig.tar.gz mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9-4.diff.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=47a44a3079d8afb68ace9ce527c317df
+_md5_=b03191ac64bb8e649246837c8d169583
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 38cbb33f4105..7406b69b4c8b 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/polkit-121 b/metadata/md5-cache/sys-auth/polkit-121
index 451057dee543..6cc68aa3e9a0 100644
--- a/metadata/md5-cache/sys-auth/polkit-121
+++ b/metadata/md5-cache/sys-auth/polkit-121
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit
 INHERIT=meson pam pax-utils python-any-r1 systemd xdg-utils
 IUSE=+duktape examples gtk +introspection kde pam selinux systemd test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent )
 RDEPEND=dev-libs/glib:2 dev-libs/expat duktape? ( dev-lang/duktape:= ) !duktape? ( dev-lang/spidermonkey:91[-debug] ) pam? ( sys-auth/pambase sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:0=[policykit] ) !systemd? ( sys-auth/elogind ) acct-user/polkitd selinux? ( sec-policy/selinux-policykit )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-121.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=218425ff6704ba7ceb4f0d925fa02820
+_md5_=f04823c5e105099ebf23f038567fec94
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 742b4fa68603..298b9e8630eb 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.12 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.12
index 20f3b9951693..820b1c6f1bc3 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.12
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.12
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://cwrap.org/nss_wrapper.html
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.12.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ab9ee7438df98337f940e5934cee55ec
+_md5_=b8d09726d0211c250aa7d6d8b5f073df
diff --git a/metadata/md5-cache/sys-libs/pam-1.5.2-r1 b/metadata/md5-cache/sys-libs/pam-1.5.2-r1
index ebd0a16f5d00..3d62ada10b30 100644
--- a/metadata/md5-cache/sys-libs/pam-1.5.2-r1
+++ b/metadata/md5-cache/sys-libs/pam-1.5.2-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/linux-pam/linux-pam
 INHERIT=autotools db-use fcaps toolchain-funcs multilib-minimal
 IUSE=audit berkdb debug nis selinux +filecaps abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD GPL-2 )
 PDEPEND=>=sys-auth/pambase-20200616
 RDEPEND=virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libtirpc-0.2.4-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2.tar.xz https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2-docs.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	db-use	867a9246a45efc09934e0f8e3380c813	fcaps	babe6282ea5c195981bd302af1adaf3a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3b76656c969aaace378b10ac35be5302
+_md5_=d184015ade64c3c85989844c45d23a16
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.9 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.9
index f5f613445893..f251c37796db 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.9
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.9
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://cwrap.org/uid_wrapper.html
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.9.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.9.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=46d1136a79bdb9c5cd710afb4b216403
+_md5_=efac278319eb6bcfb5cc8e791e0c7fe2
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 814d362e8274..00540b629e4a 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20210805 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20210805
index 2b5ff6a8cae7..89ece74a717e 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20210805
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20210805
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
 INHERIT=autotools
 IUSE=dbus doc gnome
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dbus? ( sys-apps/dbus gnome? ( dev-perl/Net-DBus dev-perl/X11-Protocol ) ) x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
 REQUIRED_USE=gnome? ( dbus )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/1a58bc28f6844898532daf9ee1bf6da7764955a9/xdg-utils-1.1.3_p20210805.tar.bz2 https://dev.gentoo.org/~sam/distfiles/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-no-which.patch.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8d85e5716897c787f16a948d36c41dd5
+_md5_=d1663ca9c2d64e63f7e6f0ecdcd20513
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 166bee4a2189..0fe3089277a4 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-30T21:09:45Z
+TIMESTAMP 2022-08-31T03:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMOfJlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMO0PpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDcAg/+PidMZRikAtAMqEG3l0nOsyZTu0TnN3c4axaOEzTcYu11STlfheF3e9XX
-hzIc7ae6dHDyZvn8e8oOOkrC97bw4yr+75H5036oi/us8J9dH5edLqFNRH21wEuM
-Uzle3N8ZUwRfPRwki/G0cUWLPjfGEiIMmxjcv394WJ/PamMZJHOi7bYe3YmfiAij
-Q3b/G7uU3Iw5s0V75o2k8gLh1iBDu3AQHyxnXKxyZMbNItVrjfGTfWuqgMM8AHJV
-H554pfLw0iT7xFD1RYp+cgiuHoz33Sm1Fj1aT5kGR676UyiLQVVHSPsHK4BOGVAf
-6XptIVWTAYP2QdXOsxX6WJBGLWJlmU5MoXxKlFlbZxmn13j+uGKWDf3dNb/RlcE0
-9u6GHlbeGuxNO0QsoPCDhvOE8ksgidBjOW5HK0BDpb5yp7ma1MoruBLrEzUWf9mm
-JaMRfnVgUfF1oztWC67DhKV071/QZUtOtI+Un8qSUCYO9GglgKm1I4Boop+nVbSZ
-WDRRtgN1yQ6aPaUuo6Xsc6VsnDCsZTXQeUQn2fBH7FAzeYHVGMT+gRraDhI4v2lw
-OnDKKghkgYDnomP8gkmRARvT+aKhc5Pys3lDlBFEIDNuDsH8itaC/Llwqp6Ckdk8
-nRNOGv8QCSUnRW1HCZHuxA4uB8Ng+OgFEG5zJmWvUS3ZBwssKi8=
-=wNLF
+klB8BxAAq6dBiKcIJD9kndeIDiZHKJfyG7Y/p602laSvjBcc3SEKQ5N8ApArxA+q
+adBoX+hD/A7xQiIg78f+NWTnls5P1nKWPnIGqlds0vbAlv413alW9trEFifLaJ7H
+6cTuZy9oPZYM5pxfAwEsKH+nOu13ygJKyt2qSyGBQYd/ZyOWsp+b+Y26klWZv6cm
+ExKbifzzKbD+fdByUT763KeiemzbtIFX1CIdvOjn7vhENUznpuHVN0F4e+Ez9Ups
+dmy5DyYmeYOuQnbGpk0YNDdejzN6tpLPEY/Ksh2Otzt15zr8lmM5kOVRMU1VY+pH
+Oblwab6sWGqjyk1noO3kjqmZSm6kjgPHDcQGLe0HX+R1DN96uEZZgxbWcnLkYgjr
+SLv3cDtAq/qP1ISweK1+cVce5CqxQ9IhRcHh5FgFVwwc54cIwVCpuwc4+r/Xhlrn
+bhwnSzgkbIFJqvsHbIw5qGfJp1hJGkFHxS/R+eGUnr8gH32CghoSaRWo+FEWXzwK
+mC/BJZ9jnjgSp2mC9UWEf14H0O3y0JbSVo0DS6BYBoGMmhIOtHlZljKGOAX2VM4G
+YicP51b7Tw6e+CCpeXqrmwDnjJSUUhT5i55kKQWKbRRccxnBsc5xUTk9r2LC7XSt
+P+Rrb+lcaTFMNoW3Y23yjrAxjfdZJ9VAaiHu9ixkIGyuZkXk/tE=
+=QH7k
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ce18f69aaea6..49aeca427824 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Aug 2022 21:09:42 +0000
+Wed, 31 Aug 2022 03:09:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e984d1a95d4e..ba39283d9e42 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Aug 30 09:09:42 PM UTC 2022
+Wed Aug 31 03:09:42 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ee8c7688ef9e..fc65259ee418 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Aug 2022 21:15:01 +0000
+Wed, 31 Aug 2022 03:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a9c78d990bbb..7fdbd124dcac 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-498e9d93ab5b819e4bc6929ca12af7e1aa45d684 1661892618 2022-08-30T20:50:18+00:00
+7b56f76d85ea363d9f84e6102e0860b6e25f05fa 1661914362 2022-08-31T02:52:42+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1d203d91353f..7f24d087f510 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1661893801 Tue 30 Aug 2022 09:10:01 PM UTC
+1661915401 Wed 31 Aug 2022 03:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ce18f69aaea6..49aeca427824 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Aug 2022 21:09:42 +0000
+Wed, 31 Aug 2022 03:09:42 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3db62b8e4ec8..6f6c6842e014 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index d8887d8afe91..11bdc3026f4c 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,4 +1,3 @@
-AUX libnftnl-1.2.1-missing-export-set_elem.patch 640 BLAKE2B 6b5a1470c2e8175a1ed9667f7dc8dba09f074b57d20b3b5baff27f3cc3cc08014070744022b004573255c29f8124b6a0bc5a2d569fdf955c1e566a7646ead773 SHA512 afe61d68f2348c9ad02386a452611cb38b88eaf32cbbe565efc0cc929d73db89541b3675301773bd195e09c1834c006b22be92d1c7e923aeb2095d8db78ea54a
 DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
 DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f50101d566be1d40217ea092ec1a9af08281b22193bb274a1ad462c081980ccc8da35c76d910cf0d613ecb0235449 SHA512 dc589d7fcd7d4b0e5e7d50b02967f265ef11b2de69018c8eb264251eb5fab4b4fabb147b8b934f29cdbf66e7bee3f030ef9f02b5872bd76c4cf3523f7e38b94b
 DIST libnftnl-1.2.2-clang-fortify-source.patch.xz 2704 BLAKE2B 107c90a2875e7477a5e8b7af8ff4c2139d2117e41a4ca9a7656b5f15c430668572c18a43e9b14a5af36c60818289e00bc082cad5d601b4c489335ca7161e5871 SHA512 c024607cb138748adcd28a511b858bbf51f2f09e13afa48d3090ba5ecd7bff1c1e87fcf38330eb24ae52c79d1a8bfce91f75be5dc81cfec6f0bc5334dd2f7456
diff --git a/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch
deleted file mode 100644
index 0ff574ddc48a..000000000000
--- a/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://git.netfilter.org/libnftnl/commit/?id=accee9a75e0e6678863d092d6a4f4afbadf0eed9
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Wed, 18 May 2022 23:54:03 +0200
-Subject: set_elem: missing export symbol
-
-nftnl_set_elem_nlmsg_build_payload() is already available through .map
-file and headers, add missing EXPORT_SYMBOL.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---- a/src/set_elem.c
-+++ b/src/set_elem.c
-@@ -300,6 +300,7 @@ err:
- 	return NULL;
- }
- 
-+EXPORT_SYMBOL(nftnl_set_elem_nlmsg_build_payload);
- void nftnl_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh,
- 				      struct nftnl_set_elem *e)
- {
-cgit v1.2.3
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index bdfbac5caa90..e7840ce3ed0a 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,8 +1,8 @@
-AUX libssh-0.10.0-fix-musl-gnu-source.patch 1961 BLAKE2B 2a6fe18a8a1e1a712b8af791721ee46f862c56cf88188bc9788b61842f4a429d0d2b02126f4a5c4c76859aea6896fba071b077a69e1c5ec2b36e264d30200d29 SHA512 1d7d73fa1d3219e1fe11559c53e4fe0024458e3a5238c3c6680c938189da33742eb222a7f3d7a9a38fe58d6eda35b63a9bb15cca3978a115857f0cdf56007103
+AUX libssh-0.10.1-disable-broken-test.patch 1182 BLAKE2B 2ae0c370077d0c8dc79b81f33b84949f26ced643788d414973b1cd56ab2ee0223fdabb1fcf4e311774a7d47018d8258e7b0f4d073c08f825eb0da62a5a45ed4b SHA512 923f18a7c125d1becb83aec6a743535588ca7b99e35a9a54f76189558892f56bbde55ef6f7b44141f7a8b30aed945fc6e7fc00625644b5621bdb82eaccdb05a0
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
-DIST libssh-0.10.0.tar.xz 553384 BLAKE2B 4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c SHA512 d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212aaaa
+DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
-EBUILD libssh-0.10.0-r1.ebuild 3294 BLAKE2B 4b714f450303a30b52f882d405ef3f4328ad9f23e60b4fd4f231c9ed9943f2db168eca2ba2718594fb6fa2fe142157fa85ed25742d5233e954a45d8f2906889c SHA512 f08ac0db3214801c4a63a6dfe591b423af82a4543853a080ac556c4c0f89fbcb86f32d0f9e5e9fb64ff5c65053caca0ac46c87afb761fcd3c5b562b23b7aa240
+EBUILD libssh-0.10.1.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585
 EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513
-EBUILD libssh-9999.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3
+EBUILD libssh-9999.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585
 MISC metadata.xml 726 BLAKE2B 351703a7c13b7f66c152121dac43d09b53f3d141d9a37e0dfcd8601f6f30943698c66cf6e51cb6053d1891313b1bc46fbf4071aca39bf3d07d218f8d47ed1e83 SHA512 8f639e4c5ee39a54778e9948e347551372b2f83ca30fe360a1281a52c681563c5dd2d2e053c2263b24440fc1a11c6d3cf866eaa46e39610cbd01c76c29fde7bc
diff --git a/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch b/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch
deleted file mode 100644
index be234bab53c9..000000000000
--- a/net-libs/libssh/files/libssh-0.10.0-fix-musl-gnu-source.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://gitlab.com/libssh/libssh-mirror/-/commit/8cf9c8162fc317761f19c35f60fc0cae7337ceea
-https://gitlab.com/libssh/libssh-mirror/-/issues/141
-
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Mon, 29 Aug 2022 12:48:34 +0200
-Subject: [PATCH] Do not force GNU_SOURCE during build to fix #141
-
-Signed-off-by: Jakub Jelen <jjelen@redhat.com>
-Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -348,10 +348,6 @@ endif (WITH_SYMBOL_VERSIONING AND HAVE_LD_VERSION_SCRIPT AND ABIMAP_FOUND)
- # This gets built as a static library, if -DBUILD_SHARED_LIBS=OFF is passed to
- # cmake.
- add_library(ssh ${libssh_SRCS})
--target_compile_options(ssh
--                       PRIVATE
--                           ${DEFAULT_C_COMPILE_FLAGS}
--                           -D_GNU_SOURCE)
- target_include_directories(ssh
-                            PUBLIC
-                                $<BUILD_INTERFACE:${libssh_SOURCE_DIR}/include>
-@@ -408,10 +404,6 @@ install(EXPORT libssh-config
- 
- if (BUILD_STATIC_LIB)
-   add_library(ssh-static STATIC ${libssh_SRCS})
--  target_compile_options(ssh-static
--                         PRIVATE
--                            ${DEFAULT_C_COMPILE_FLAGS}
--                            -D_GNU_SOURCE)
- 
-   target_include_directories(ssh-static
-                              PUBLIC
---- a/src/misc.c
-+++ b/src/misc.c
-@@ -1956,7 +1956,7 @@ char *ssh_strerror(int err_num, char *buf, size_t buflen)
- #if defined(_WIN32)
-     strerror_s(buf, buflen, err_num);
-     return buf;
--#elif defined(__linux__) && defined(_GNU_SOURCE)
-+#elif defined(__linux__) && defined(__GLIBC__) && defined(_GNU_SOURCE)
-     /* GNU extension on Linux */
-     return strerror_r(err_num, buf, buflen);
- #else
---- a/tests/torture.h
-+++ b/tests/torture.h
-@@ -24,10 +24,6 @@
- #ifndef _TORTURE_H
- #define _TORTURE_H
- 
--#ifndef _GNU_SOURCE
--#define _GNU_SOURCE
--#endif
--
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-GitLab
diff --git a/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch b/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch
new file mode 100644
index 000000000000..0e91bedaef6e
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.10.1-disable-broken-test.patch
@@ -0,0 +1,28 @@
+https://sources.debian.org/patches/libssh/0.9.6-2/2003-disable-expand_tilde_unix-test.patch/
+
+Description: Disable torture_path_expand_tilde_unix, its not working well on buildd
+ On buildd, the HOME is set to a non-existing directory, this makes
+ torture_path_expand_tilde_unix fail
+Author: Laurent Bigonville <bigon@debian.org>
+Forwarded: not-needed
+
+--- a/tests/unittests/torture_misc.c
++++ b/tests/unittests/torture_misc.c
+@@ -662,11 +662,11 @@ int torture_run_tests(void) {
+         cmocka_unit_test(torture_basename),
+         cmocka_unit_test(torture_dirname),
+         cmocka_unit_test(torture_ntohll),
+-#ifdef _WIN32
+-        cmocka_unit_test(torture_path_expand_tilde_win),
+-#else
+-        cmocka_unit_test(torture_path_expand_tilde_unix),
+-#endif
++//#ifdef _WIN32
++//        cmocka_unit_test(torture_path_expand_tilde_win),
++//#else
++//        cmocka_unit_test(torture_path_expand_tilde_unix),
++//#endif
+         cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
+         cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
+         cmocka_unit_test_setup_teardown(torture_path_expand_percent, setup, teardown),
+
diff --git a/net-libs/libssh/libssh-0.10.0-r1.ebuild b/net-libs/libssh/libssh-0.10.1.ebuild
index 0a5989b9a16b..25b41a81f804 100644
--- a/net-libs/libssh/libssh-0.10.0-r1.ebuild
+++ b/net-libs/libssh/libssh-0.10.1.ebuild
@@ -45,10 +45,8 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-musl-gnu-source.patch
+	"${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
 )
 
 src_prepare() {
@@ -57,22 +55,24 @@ src_prepare() {
 	# just install the examples, do not compile them
 	cmake_comment_add_subdirectory examples
 
-	# keyfile torture test is currently broken
-	sed -e "/torture_keyfiles/d" \
-		-i tests/unittests/CMakeLists.txt || die
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || die
 
-	# disable tests that take too long (bug #677006)
-	if use sparc; then
-		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
+	if use test; then
+		# keyfile torture test is currently broken
+		sed -e "/torture_keyfiles/d" \
 			-i tests/unittests/CMakeLists.txt || die
-	fi
 
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
+		# disable tests that take too long (bug #677006)
+		if use sparc; then
+			sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
+				-i tests/unittests/CMakeLists.txt || die
+		fi
 
-	if use test && use elibc_musl; then
-		sed -e "/SOLARIS/d" \
-			-i tests/CMakeLists.txt || die
+		if use elibc_musl; then
+			sed -e "/SOLARIS/d" \
+				-i tests/CMakeLists.txt || die
+		fi
 	fi
 }
 
@@ -90,6 +90,7 @@ multilib_src_configure() {
 		-DWITH_SERVER=$(usex server)
 		-DWITH_SFTP=$(usex sftp)
 		-DBUILD_STATIC_LIB=$(usex static-libs)
+		# TODO: try enabling {CLIENT,SERVER}_TESTING
 		-DUNIT_TESTING=$(usex test)
 		-DWITH_ZLIB=$(usex zlib)
 	)
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 9b897cf8885e..25b41a81f804 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -45,7 +45,9 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
+)
 
 src_prepare() {
 	cmake_src_prepare
@@ -53,22 +55,24 @@ src_prepare() {
 	# just install the examples, do not compile them
 	cmake_comment_add_subdirectory examples
 
-	# keyfile torture test is currently broken
-	sed -e "/torture_keyfiles/d" \
-		-i tests/unittests/CMakeLists.txt || die
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || die
 
-	# disable tests that take too long (bug #677006)
-	if use sparc; then
-		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
+	if use test; then
+		# keyfile torture test is currently broken
+		sed -e "/torture_keyfiles/d" \
 			-i tests/unittests/CMakeLists.txt || die
-	fi
 
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
+		# disable tests that take too long (bug #677006)
+		if use sparc; then
+			sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
+				-i tests/unittests/CMakeLists.txt || die
+		fi
 
-	if use test && use elibc_musl; then
-		sed -e "/SOLARIS/d" \
-			-i tests/CMakeLists.txt || die
+		if use elibc_musl; then
+			sed -e "/SOLARIS/d" \
+				-i tests/CMakeLists.txt || die
+		fi
 	fi
 }
 
@@ -86,6 +90,7 @@ multilib_src_configure() {
 		-DWITH_SERVER=$(usex server)
 		-DWITH_SFTP=$(usex sftp)
 		-DBUILD_STATIC_LIB=$(usex static-libs)
+		# TODO: try enabling {CLIENT,SERVER}_TESTING
 		-DUNIT_TESTING=$(usex test)
 		-DWITH_ZLIB=$(usex zlib)
 	)
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 54fb91c17b68..85933a222fd1 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST socket_wrapper-1.3.2.tar.gz 86255 BLAKE2B 33f526a8871cfb1a889a84660ea8e82b6e591646924e16d2c452bb001e0eb4c1457b8151208bbec55c13c40fd124c160fc85d0df227519f62a2683e4ea1acb85 SHA512 f4d3a7026f1777a4c3b5481a0f6e6057b6372e9b64f44523ec1ebf0a34159d7154493dce6ee3c95fbea15607c6ada1382f2475d5d553133a061c80719c135b9d
 DIST socket_wrapper-1.3.4.tar.gz 81997 BLAKE2B 5d290ef59c16fbdde362749196cc91c3f050518f82cb14fbafa3e00d5fb51a6b085b94b08413ca601731440d8eadb5dfbe8d011567fd67b1240b0cc380504813 SHA512 6e6a940e26d0f4dc4f1c0f84643d5a124bb2cccd1713481e9c42ea7986884928d736b1ef8da8a2aef3d3803938b6e1ebd30bdbe9784fda95a9a59cdbd1d19f61
 EBUILD socket_wrapper-1.3.2.ebuild 613 BLAKE2B c76ba6dda81912852db5c50ad35f504192b6743d7061584018b8ce0b85971f255fed41362b9ea56811b9b11743bb5e45ebb34563b190000ff0aa01dd190322bb SHA512 dde73f3b4057563727f4bd331dc326e73e9ec9d7a677e70f863053be9aca700330fd3853f8e11064c6100d85ed93ef5a28a5f88825ac04001e8e02662004ac47
-EBUILD socket_wrapper-1.3.4.ebuild 619 BLAKE2B c1ecfd3e196cb868e6ba0ecb973ff68fa49d59ca18e12ae2a1b1f38e4f238af011d9fa5d9909ebe8999f29e4f65974555c65c6225495dd913636348c31bfeb4e SHA512 c406ed7c9f6d670e9dd24d799cd9ba5c47504329a9e30de664d8bcee3361e9d603a4140253fbb063876d8e06cef2e8dcd7c814e6fb9122411c40128148dc1e8b
+EBUILD socket_wrapper-1.3.4.ebuild 614 BLAKE2B ec0d695a1947e83ccd163808f7d09810ce91dfd7cd10345ccb79f915ea1b851812e5c8fe39aac21c9d937f05cec44ecc69436b649f5c4dc1f0d1065fc09d0825 SHA512 f9a8929c6b40ac3ea9d957e79a5857133e378c6a5f6eabea504ea21ff587a8a6f16428eab29da66c3da36a1f1387facb831051b6ed48df686b9f11ebea241d25
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.3.4.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.3.4.ebuild
index 52c36e4a8cc9..ce8e5e090386 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.3.4.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 06ae5bb15a18..c9beb5427751 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest
index 2c8611b68ff6..a1ac0e5e170f 100644
--- a/sci-libs/libdap/Manifest
+++ b/sci-libs/libdap/Manifest
@@ -1,12 +1,4 @@
-AUX libdap-3.18.1-disable-broken-tests.patch 719 BLAKE2B de9bdfc1580f077a69272b8f104b19d3a9d168fdfbe3a21df82996feb1dc965f614694d06f0b85dd0eebce1e6552ff8560bd634a5d1f96da6d2e5b1cc3183f35 SHA512 11237422b0d129aaa52dc3559e2ffe0d4bcc0562e0acd476290af7a4026a1c7272bc1e0a0ceddcb40250746c0c71e4c6d63a780c5c1635132faf0ee609e3b88c
-AUX libdap-3.18.1-disable-cache-test.patch 965 BLAKE2B 615baece5bd65d8f45c71df1f05f3918e96b6df1a144692503fbbef8e7c3f5c3a24f2677d6409ba5f2bea49889d5ecbc825ea3e55498835897f233d61c8bcf50 SHA512 087dd231f92d4117cbf469077922975029576239e507ef2cd5ae9d5b1f8f38ab3c4a3f32c8e2781a5c299c5e0a29c77cfd7d67ea8bf141058839f2bb4299b187
-AUX libdap-3.18.1-disable-dmr-tests.patch 1241 BLAKE2B fd7d07f506bb2832f78dce512e71f032338b8a8cbd22168a55450df052de735e9a802536fda2e22b7358da4a3c1b1c3f28d767a0990d4133f1e15f58e0a3f247 SHA512 5becf972bed0d27b32a67127af5ca2567757c05e04ef13aa3d514212320c552ad91a7b11b5386b73211a72017712b10875931a764f88ba9fa4fba40da453340f
-AUX libdap-3.18.1-disable-net-tests.patch 1281 BLAKE2B fd00fb1920a8440a633aa9595ddcf423b7883be26a9c0efc3ffb3fa8bef608fb68a641f1df7b449b1d786acb2cca815bfa6132361ddff88247319e0925ce99f2 SHA512 91db2d34693eed9a4e4c6f1d138520472c86290de131adaf47b609e3cc2ee7a6806eaf47d7d11a440034c226a18cb7ee1af5efadf08b2c3ba173792b6ee64813
-AUX libdap-3.18.1-fix-buildsystem.patch 621 BLAKE2B 09ec113a8860388d9d1150b7111352316b52d8307e29c3db2d6de00d2bc912d46d7c27f2e0f3429382691ff2d3696252c019554c28d8c92ea8f74db9c7877e5b SHA512 4aeb883dd338ed3c27ab2fe217d8419c8e4130485eec11f12b75dad6979034b4cbe251b4f81d21280a05257cd7bd5e56fdbb20b08f48ac0d48822024cf00d9bb
-AUX libdap-3.18.1-fix-c++14.patch 2287 BLAKE2B 2d6c036ab9ad4d611215de48b4288aa93868f3411d5637fcde7757ada661319472827bc4eea7084f925ecd9f9561d2156a4add8f5eb04693b4eb687f02efc398 SHA512 6bd2722f16cd3491922b43040148efb09dcf66f2403bcc8caae028d3497a5c864d6539b980c32cda01f35fffc2c724b68d20042f8d341f0a3a50c8fa78670535
 AUX libdap-3.20.9-disable-net-tests.patch 1279 BLAKE2B cc9e813074d590f7fe9c15f4854ad7d721694bff6cea0376e2b8f7c701ad05a7b602b86959b7d0b260df55bd6f7e8fd5424fc221a18535c2a6b3695c86c4305f SHA512 a2c7d1b1591c41dea792a3805208d39e850ce794d02717c327203b2d0a1856c28bb7f1a830c4b8c504c619b2a3557893fcc066a0327b375ea2330f115b2fe0b1
-DIST libdap-3.18.1.tar.gz 2209343 BLAKE2B 0b71f5a557315a1481f45b465a73d62e8bf44c78c7b0d257f56c758a63137eca3777a1e2e9ef1e7dc3e2c434709f238fc7ed40e56f61eb89f8d5b47af7504efa SHA512 a1d06bbbad654718bbf9980dc0943935089c09772678f6457d4de8a9d37f1ce33c0e1cab4c5eefec6f9e159028b194d6e3a6021597276b233eda52603ae8dd38
 DIST libdap-3.20.9.tar.gz 2838651 BLAKE2B 84186a73455d8756d0dccaf11554861d48f55a358cc3f70d899d7f24b0b676b0bacdfff47b63c956619717c7fb7f7e3678669599724a2170221a4bc74d8388c2 SHA512 2e360148e5ca3b5c12552ff429b161d8be6905594ae2df98c5b005cd286cb803913b8336371cd07361082749122f7aa5cbc93ff1812ed598908afd0e83df927c
-EBUILD libdap-3.18.1.ebuild 1180 BLAKE2B b12babd0caa23d50003305be2afce6a99180787e0d6ef7c50d4b9b6e6aef8a2a4b036c0867c788917a2993f6f5ac03b9a028c8e14787bbef3d5f78e5bd0239bc SHA512 4cd049a6acf16274e56b2f9177dc7dcd39bfe82be1e5cbea71a39a3a6f7b8775ec53c7713a9708e3dab726517d09b6eb57c78246f34825532aa3a1b782eed4c8
 EBUILD libdap-3.20.9.ebuild 958 BLAKE2B 02e6cf77258761fb34c7e9d10474c95dd290459c403c05c065e3d1cdbf46aaeb1ab1c605637607213d82b4f66174e8474b279e02a810494410b1063024502e4f SHA512 49de2e5d7f508033161d8c210e01f4953aaa6b151b6de830ab1cd56d1291fee0b36289533b09cb0d2a8286978a92661eea4c92acf1a76c6ae1397cfe3b3fbf1a
 MISC metadata.xml 773 BLAKE2B f1334411aab7288075c7683ec32c35ed82e5eafb48e87a0b1d320d3e29d514f20934ff65ab214add8f8fd9df7e2c54491f6804314f5d7abb06e855476f898662 SHA512 48fbdada76f39eaf72cf385d9f73f029ce166919e1d80a57ec98ddf257955faa6de18673b94388526a41f2f126c9a313d55f016fed63243848251fe0ead4c27c
diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch
deleted file mode 100644
index 09c33e6f381a..000000000000
--- a/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: D4FilterClauseTest breaks on arm*, powerpc, s390x.
-Author: Alastair McKinstry <mckinstry@debian.org>
-Last-Updated: 2016-08-31
-Forwarded: no
-
-Index: libdap-3.18.0/unit-tests/Makefile.am
-===================================================================
---- libdap-3.18.0.orig/unit-tests/Makefile.am
-+++ libdap-3.18.0/unit-tests/Makefile.am
-@@ -74,7 +74,7 @@ UNIT_TESTS = marshT arrayT attrTableT st
- if DAP4_DEFINED
- UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
- 	D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \
--	chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \
-+	chunked_iostream_test D4AsyncDocTest DMRTest  \
- 	D4SequenceTest
- endif
- 
diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch
deleted file mode 100644
index 6ce7ae0c4f6d..000000000000
--- a/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Alastair McKinstry <mckinstry@debian.org>
-Description: Disable test as website appears to be down
-Forwarded: no
-Last-Updated: 2015-10-20
-
-Index: libdap-3.18.0/unit-tests/Makefile.am
-===================================================================
---- libdap-3.18.0.orig/unit-tests/Makefile.am
-+++ libdap-3.18.0/unit-tests/Makefile.am
-@@ -67,9 +67,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
- if CPPUNIT
- UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
- 	RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
--	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
--	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
--	HTTPCacheTest ServerFunctionsListUnitTest
-+	DDSTest	DDXParserTest  generalUtilTest  parserUtilTest \
-+	SequenceTest SignalHandlerTest  MarshallerTest \
-+	ServerFunctionsListUnitTest
- 
- if DAP4_DEFINED
- UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch
deleted file mode 100644
index d4691f59518f..000000000000
--- a/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Alastair McKinstry <mckinstry@debian.org>
-Description: Disable DMR tests which break on big-endian archs at the moment
-Last-Updated: 2015-11-08
-Forwarded: no
-
-Index: libdap-3.18.0/tests/Makefile.am
-===================================================================
---- libdap-3.18.0.orig/tests/Makefile.am
-+++ libdap-3.18.0/tests/Makefile.am
-@@ -31,7 +31,7 @@ endif
- # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
- 
- check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \
--	$(DMRTESTSUITE) $(GETDAPTESTSUITE)
-+	$(GETDAPTESTSUITE)
- 
- # Build the test drivers. The drivers all use the
- # subclassed types in Test*.cc and the TestTypesFactory.
-@@ -107,11 +107,10 @@ DMRTESTSUITE = $(srcdir)/DMRTest
- GETDAPTESTSUITE = $(srcdir)/getdapTest
- 
- check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \
--$(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE) 
-+$(EXPRTESTSUITE)  $(GETDAPTESTSUITE) 
- 	$(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS)
- 	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
- 	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
--	$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
- 	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
- 
- # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch
deleted file mode 100644
index 7c42ec1199c4..000000000000
--- a/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Alastair McKinstry <mckinstry@debian.org>
-Description: Disable network tests, as network not available on
- most build systems
-Last-Updated: 2016-02-06
-Forwarded: not-needed
-
-Index: libdap-3.18.0/tests/Makefile.am
-===================================================================
---- libdap-3.18.0.orig/tests/Makefile.am
-+++ libdap-3.18.0/tests/Makefile.am
-@@ -30,8 +30,7 @@ endif
- 
- # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
- 
--check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \
--	$(GETDAPTESTSUITE)
-+check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) 
- 
- # Build the test drivers. The drivers all use the
- # subclassed types in Test*.cc and the TestTypesFactory.
-@@ -107,11 +106,10 @@ DMRTESTSUITE = $(srcdir)/DMRTest
- GETDAPTESTSUITE = $(srcdir)/getdapTest
- 
- check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \
--$(EXPRTESTSUITE)  $(GETDAPTESTSUITE) 
-+$(EXPRTESTSUITE) 
- 	$(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS)
- 	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
- 	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
--	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
- 
- # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
- # Delete the scripts here and not using CLEANFILES because this target is
diff --git a/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch b/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch
deleted file mode 100644
index f36fdceb1fd0..000000000000
--- a/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Do not install headers and static library required only for test suite.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -36,13 +36,13 @@
- # Build the test drivers. The drivers all use the
- # subclassed types in Test*.cc and the TestTypesFactory.
- 
--lib_LIBRARIES = libtest-types.a
-+noinst_LIBRARIES = libtest-types.a
- 
- libtest_types_a_SOURCES = $(TESTSRCS) $(TEST_HDR)
- libtest_types_a_CXXFLAGS = -fPIC
- 
- testheadersdir = $(pkgincludedir)/test
--testheaders_HEADERS = $(TEST_HDR)
-+noinst_testheaders = $(TEST_HDR)
- 
- das_test_SOURCES = das-test.cc
- das_test_LDADD =  libtest-types.a ../libdapserver.la ../libdap.la 
diff --git a/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch b/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch
deleted file mode 100644
index 6b74fa10a240..000000000000
--- a/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-C++11 changed destructor semantics to be noexcept(true)
-by default, leading to potentially changed semantics.
-
---- a/HTTPResponse.h
-+++ b/HTTPResponse.h
-@@ -115,6 +115,9 @@
-     temp_file and headers are deleted. If the tmp file name is "", it is
-     not deleted. */
-     virtual ~HTTPResponse()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-     {
-         DBG(cerr << "Freeing HTTPConnect resources (" + d_file + ")... ");
- 
---- a/MarshallerThread.cc
-+++ b/MarshallerThread.cc
-@@ -106,6 +106,9 @@
-  * Unlock the mutex
-  */
- Locker::~Locker()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
- {
-     DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl);
- 
-@@ -140,6 +143,9 @@
- }
- 
- ChildLocker::~ChildLocker()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
- {
-     DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl);
- 
-@@ -164,6 +170,9 @@
- }
- 
- MarshallerThread::~MarshallerThread()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
- {
-     int status = pthread_mutex_lock(&d_out_mutex);
-     if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not lock m_mutex");
---- a/MarshallerThread.h
-+++ b/MarshallerThread.h
-@@ -52,7 +52,11 @@
- class Locker {
- public:
-     Locker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count);
--    virtual ~Locker();
-+    virtual ~Locker()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-+    ;
- 
- private:
-     pthread_mutex_t& m_mutex;
-@@ -74,7 +78,11 @@
- class ChildLocker {
- public:
-     ChildLocker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count);
--    virtual ~ChildLocker();
-+    virtual ~ChildLocker()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-+    ;
- 
- private:
-     pthread_mutex_t& m_mutex;
-@@ -144,7 +152,11 @@
- 
- public:
-     MarshallerThread();
--    virtual ~MarshallerThread();
-+    virtual ~MarshallerThread()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-+    ;
- 
-     pthread_mutex_t &get_mutex() { return d_out_mutex; }
-     pthread_cond_t &get_cond() { return d_out_cond; }
---- a/Response.h
-+++ b/Response.h
-@@ -93,6 +93,9 @@
- 
-     /** Close the stream. */
-     virtual ~Response()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-     {
-         if (d_stream)
-             fclose(d_stream);
diff --git a/sci-libs/libdap/libdap-3.18.1.ebuild b/sci-libs/libdap/libdap-3.18.1.ebuild
deleted file mode 100644
index 07e468687be9..000000000000
--- a/sci-libs/libdap/libdap-3.18.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Implementation of a C++ SDK for DAP 2.0 and 3.2"
-HOMEPAGE="https://www.opendap.org"
-SRC_URI="https://www.opendap.org/pub/source/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 URI )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	net-misc/curl
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	test? ( dev-util/cppunit )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.18.1-fix-buildsystem.patch"
-	"${FILESDIR}/${PN}-3.18.1-fix-c++14.patch"
-	"${FILESDIR}/${PN}-3.18.1-disable-cache-test.patch"
-	"${FILESDIR}/${PN}-3.18.1-disable-dmr-tests.patch"
-	"${FILESDIR}/${PN}-3.18.1-disable-net-tests.patch"
-	"${FILESDIR}/${PN}-3.18.1-disable-broken-tests.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619144
-	append-cxxflags -std=c++14
-
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 569bc50337d0..7cbfaf7ea7ab 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index fcff09fac480..6f62b0957f28 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,8 +1,5 @@
-AUX calc-2.12.5.4-as-needed.patch 6202 BLAKE2B c1ed259eba709b26938ebf60aa5ca2cb2d329e121034560464dfae8416061aa00ac5e918039d38c68e425b8569a3eefe36d67146d6505a376bf7a61b455b1c38 SHA512 50641158fd7bc598e208f404ce8c9831f9287eced1c29f995c133b1725862aa1aec924014e165e03097e875554ac87633d9a0ab16804eeb3076c23af22e9bd3a
 AUX calc-2.13.0.1-RPATH.patch 7951 BLAKE2B 97a3fac3850f2d6f6d81145f75fdd5cd97e7877720ee15e9ad2163acfecadf246c08e459648f2404ae2ba2f5c7c8af09f5ad4ee5693cac3683285169518ce402 SHA512 39391f63a718df325a197adbfc289a97a8dfd367ef26b23becf37c85a90a55eeddae679b7df3eca77ac588e743235d356035fbc9eba4e57d7f3b3029ce078216
 AUX calc-2.13.0.1-respect-LDFLAGS.patch 9767 BLAKE2B a8a8852fd806e17c0eeec5e82ce9ce4f80f53641c691942c4599550e8f6506c4f2464882d6694f5e3ce37a91df5f57786e6666a93504318f531ad9b29c9ed564 SHA512 83be5d78452a24695d5c4ff55ad92852ac755801170e7e67a81b60fac20ba4d7d782a59786e96f9fb7ec08d5249a1829b687a14f781c7eb5ce6e13b0620742dd
-DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f
 DIST calc-2.13.0.1.tar.bz2 987542 BLAKE2B bbd93aa296211dde8f7d00a86e222bf4ccc0065da021c1666c333610c6837a1984995c74995571af025e68ec64519ed2d158731448037ee0a4f2eafccfc1a625 SHA512 7d7e07072779c97aaeb966f9282a6e4127c839ecadd0b7269d37d587949c47075d301c3420735f903ba179ae2bbbd309fd29e459fbf12b450e528aadc66537c4
-EBUILD calc-2.12.5.4.ebuild 1310 BLAKE2B 2e98a4bc4665ecd786f5db43576177d3761e26f1b9dc74daf4ce52d45305c53e160c849348b8a93513618930f87934fa552da799d9eb0b95e6d50be72232953d SHA512 5d39ec954eb6f18d6fd00be72df0ce15696ca795ee1fbde5460e3fe8c4609446d2557051bf8bf283a52c19d8ff6bfd5caaad29c2d9d2f954634647b4e212583b
 EBUILD calc-2.13.0.1.ebuild 1410 BLAKE2B 4647509d3e53b2b052ff26f2de3176a7723c4c187b68909c7fb30292c00351b0a7a374e925e1b59c0965a9be325fdc873f2d1cdadf586ccf43ccc6561e624053 SHA512 66d7d979bab894f1d3963ac6667bb7dfab89e23b2280c7166d79bac1f6e51c6128e9e204875d4117e0ccd6ca41ef37a9e17ef4793762fa6a204cd36e8890171d
 MISC metadata.xml 712 BLAKE2B e8c7c0ef864549f54fa59e97a9e166770b28e68ee05f19f759e91c88de315a7d35f3db7aa59cf857a872dcf6dea099534ef5524864d594806d5ee29680e248ef SHA512 7c6b6aa1ce1fa19227e9176f6881b9e0d96b84985844c18ce7555a89eeca7b1b4a16f471cb05132f63a97447d27cd0f351e0bdaf59b82d1dada8bdf410a56697
diff --git a/sci-mathematics/calc/calc-2.12.5.4.ebuild b/sci-mathematics/calc/calc-2.12.5.4.ebuild
deleted file mode 100644
index d1dc4ec7f9e1..000000000000
--- a/sci-mathematics/calc/calc-2.12.5.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Arbitrary precision C-like arithmetic system"
-HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
-SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-as-needed.patch"
-)
-
-src_prepare() {
-	default
-	ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die
-	sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die
-}
-
-src_compile() {
-	# parallel compilation hard to fix. better to leave upstream.
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		DEBUG="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CALCPAGER="${PAGER}" \
-		USE_READLINE="-DUSE_READLINE" \
-		READLINE_LIB="-lreadline -lhistory $($(tc-getPKG_CONFIG) --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
-		all
-}
-
-src_test() {
-	if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
-		ewarn "Can't run check when running in sandbox - see bug #59676"
-	else
-		emake chk
-	fi
-}
-
-src_install() {
-	emake \
-		T="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-	dodoc BUGS CHANGES LIBRARY README
-}
diff --git a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
deleted file mode 100644
index 3dbb2cd1bf47..000000000000
--- a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1136,14 +1136,14 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- else
--LIBCUSTCALC_SHLIB=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- endif
- #
- CC_STATIC=
-@@ -1173,7 +1173,6 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
- LD_SHARE= ${DARWIN_ARCH}
- #SET_INSTALL_NAME= no
- SET_INSTALL_NAME= yes
-@@ -1249,14 +1248,14 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- else
--LIBCUSTCALC_SHLIB=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- endif
- #
- CC_STATIC=
-@@ -1294,12 +1293,10 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1333,12 +1330,10 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1370,12 +1365,10 @@
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1411,11 +1404,9 @@
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- #
- CC_STATIC=
- LD_STATIC=
-@@ -1470,12 +1461,11 @@
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
- LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1510,14 +1500,14 @@
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- else
--LIBCUSTCALC_SHLIB=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- endif
- #
- CC_STATIC=
-@@ -2110,7 +2100,7 @@
- 
- calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
- 	${RM} -f $@
--	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
-+	${CC} ${LDFLAGS} ${CALCOBJS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
- 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
- 
- libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest
index 66e34697bcc0..9382d0b5404c 100644
--- a/sci-mathematics/jags/Manifest
+++ b/sci-mathematics/jags/Manifest
@@ -1,5 +1,3 @@
-DIST JAGS-4.2.0.tar.gz 1875538 BLAKE2B 039cefdb546ec28b905f22a4ec3dfe6d85c64064701283fe38be59f53da971b523d8bb5b7c5efe3e9da81a255b064cb8b66cac2fd4e844883b7fcf89cdabdbb1 SHA512 316483cd1a879c70c9b8ad6f23665196b95b9745da3924a47e14f4b0fd7c1abf9237575561cb31044623594360b6e991de68e1d9746baedeb285c65b77baada8
 DIST JAGS-4.3.0.tar.gz 2057409 BLAKE2B 5820c66dd10cc90343d53b901b7dbc1acf85dca0f5f80280864190882f0af865edad877eb2cfd421ec2035d3ae843373da1facee8a10b6735e2fc0387d452949 SHA512 d0564c73ff45484afad532ed788353f9c0945cd9667030eed5be674492bf97524d05903b22d4995c1de8a331dba7b04425d009e114d98a38b4bfce5214518b36
-EBUILD jags-4.2.0.ebuild 894 BLAKE2B aba98ae327b60f41e48cdd755a8ad260d36e30ee443815b1de1bf46849305fa3e80f093323d358fe796f0def4c04c980a9ea4123c22ff51a779167ebd19cb38f SHA512 e0391a0dc0fd916ea0c82d722f7d989451866218a31ada58bc217cd5eb6d365ec75612e57664a977eb87240ee85229bf10676d9805b3688503a65b8f6bb93623
 EBUILD jags-4.3.0.ebuild 906 BLAKE2B 6ca94785094a93df979f6804febc3b83bf01c8803b904a9943043f45a8a491c0aa743c270a2d7f6b85a73957f077c118247639a338183111034129bcc764f977 SHA512 31c1ad935ecfb112d936ce18c3dc23e9575487f8addc9f26d6b3eeef0bd239c53c4f3e58abcc78260d8190ae46b8e2a4a55da0d121ee5195d14b8a99e70e5ccf
 MISC metadata.xml 863 BLAKE2B 4a27600d0ea71c02bd35359336cc15ba7a9cbba04c3354b70513e257f263dba19922d196632bd7c136d5c40ccdf091d788b94db93de5a99693738df257e2b5a7 SHA512 90711c41b27d732a7ef69d3b94d4df1ffb89c2cccbb86ba1bd4e9808423de9cc11ddbb15a1e63a59fc87b4b191e8220731fd00497ea1dbc3a83abbde3bbd492d
diff --git a/sci-mathematics/jags/jags-4.2.0.ebuild b/sci-mathematics/jags/jags-4.2.0.ebuild
deleted file mode 100644
index 0ed77c62577f..000000000000
--- a/sci-mathematics/jags/jags-4.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MYP="JAGS-${PV}"
-
-DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation"
-HOMEPAGE="http://mcmc-jags.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-	)"
-
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	econf \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-}
-
-src_compile() {
-	emake all $(usex doc docs "")
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/manual/*.pdf
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d8440f0d9fd6..d94cde7625e6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 834c27bab333..5a72ec6395cf 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -12,5 +12,5 @@ DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e359696
 EBUILD dbus-1.12.20-r5.ebuild 7556 BLAKE2B c84cbaa05ea704e11ce4e4a30d49aab696be711c19ed1420aaabeac5e8032b122b2d5fe31ccdfff3c0348bc1100f4eb248777c92d06d83214910eb759c62d2f3 SHA512 83dae4eafd70d47f560092491ebcc024230e346c77db199346464b5cff91fc58ba08c7c7491c0c1240538cb9b7b8489179fe70e17bcb2d8b797d54e7d0d0fc32
 EBUILD dbus-1.12.22-r2.ebuild 7681 BLAKE2B 126c3b7802a3ae3d1e3f928e33249f731f43bb1ad40f4992e645b727cc35e0836bd382810ef97b9f594a7db13bfa602ea13ed7c8da8c376fb9ebccc6c0ff2f47 SHA512 db95a5f1ddb86ad4657cef1e108b429976517961c374213d9b4fb158d65568bd71c1d4a67b53b6548c4349a8ed67e0ae1d7bed547678a97ef85b4db7f9b7f97c
 EBUILD dbus-1.14.0-r2.ebuild 7905 BLAKE2B 8a68a64871afd716c57be3c8d13c18e9eeab2405b716daa913e9e723d062c2bde528f73ebf2b8e6e545b038a6108e7d08ac0f5f755590991cd399d619c484d5f SHA512 f7189dca552c555bcfe8ea1e42c0f84435a36418bc2d22f803b0d2da79ff9417cd568cce4e3d068eb339de2fbc070af6eefe7b311faa0c6cd4db45327d10f13d
-EBUILD dbus-1.14.0-r4.ebuild 7894 BLAKE2B 6c5058cbf4b736d3954e5abd95bc2bc196b945bb7b26a56ecb4a0b1721d26e7867eaaaea7649b8e15be8ea5559a4c92725807ee5ed1a9610018f71f2091726ec SHA512 738e26fa8afba39605420352f042569b01d6f121a0a19c2d7e732d05b49a5d31d1a3a5ec47f244d8878353ea4d376964981144429013f049cfa87a2e1048ab42
+EBUILD dbus-1.14.0-r4.ebuild 7891 BLAKE2B a050d7d859daa4d8a0d19545e942b4c7c2be36d88cda31b0c3e025e1116e4338dd224702079d66e2f10c575edfdf409784e8aab0c04d4f0f29f1b47da362b732 SHA512 e1be544835fb7b085488e3bd0dcf0bf32e538ad0ccf04e5ce0a52b48a7d24613b2e7fe31adcd891d01afe043e2c2e782ba29df9bda1fa2eef355b230a4d0000f
 MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.14.0-r4.ebuild b/sys-apps/dbus/dbus-1.14.0-r4.ebuild
index 19c59de260f4..9b7cf5e78819 100644
--- a/sys-apps/dbus/dbus-1.14.0-r4.ebuild
+++ b/sys-apps/dbus/dbus-1.14.0-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index 6fad7f58fa20..0dfd939bf3ce 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -5,5 +5,5 @@ AUX netplug-1.2.9.2-multi-waitpid-sigchld.patch 1865 BLAKE2B c70d7fbf21c27bdaf70
 AUX netplug-2 715 BLAKE2B df2ffc7a904a86bedb5c160ad0ba8a2d49a8125ed3042f85a361a6270ab79668cdb4dd693e022908b2637a4522f8038f22c0c03b19909d1cdaca2e7da0da21ae SHA512 11efb8b8916d40615840c5721aba089dc9f81bf30f2af6f47d6df2fd8f2b6f22e0cd59ebd37fd9875c4af31e064128e93acbef5cf859b3cabb553fbdd2f3c9ee
 DIST netplug-1.2.9.2.tar.bz2 22332 BLAKE2B 3a4232178e782417e30da3dc33361c4043d5ff9bb610c2f9a82281d395af470ddeab9cf12f91ef4a18f4fe6ff49f85b7015fecc7018b1b561e2e7f179d8d206b SHA512 b68a00eb8874ec7dd6aa9f7b7f529a6e1d9ecece4b798c8cee996b7f3534c556656f642de0ac4b2a6d06fbaf18e3bfaab00934a9292b95939a4935e673e9ca8c
 EBUILD netplug-1.2.9.2-r2.ebuild 1367 BLAKE2B 623141474c25647e63dbb7353f4e98c8a46046ce0f3731d7561d2020d09f23ea5de1007e437b3395feb13582b7f39921bd1df2c311eed51c1eccff4dbdbc71d1 SHA512 fe7bb9d19ae3e4f649b50ecda9a7669a7e130c4b4136037441760098c77de5df485ea7f3173659f3d722c7b8a5904862d2ba48f13c135be930bdd45af3ae887b
-EBUILD netplug-1.2.9.2-r3.ebuild 1503 BLAKE2B 0d9ded186b560a29eefef5aba8cf9758c7d4d21c97643d152cc3cf57e42816fe29f4552ab24022035ef20c172175b61815577fcef1b24b6e524288189df169e6 SHA512 5cacca0956912c49efe534cde9c9afdab72c21f351dc0e9a80a592b5c0009293b2bd157ff5f7b91d39aae6b88e225966dce326108bce3542712d0daabfc8f438
+EBUILD netplug-1.2.9.2-r3.ebuild 1499 BLAKE2B 857ee01760d8608ececf3e2c4daa70b206d1bef6bfba7c0cdd92a742f6fa0d2fe54fae042098fabe8fcb0da48a1559eb3ce75b8ac5d81fc32d144414f3c3bbdc SHA512 0e16e3a19ec3e5d0e1f603f28d22269db2acde498a27c8b292f15e73b1df6ed95774cfb466ef4a8838b8cd23f5a3c63a4949ccb290653676591f42e0b7d94549
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
index e226a88eeb91..e746e763443e 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="debug doc"
 
 DEPEND="doc? ( app-text/ghostscript-gpl
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index 28f4ba76fa97..b658895e3731 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -3,5 +3,5 @@ AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da8559889
 DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
 EBUILD sparc-utils-1.9-r6.ebuild 1585 BLAKE2B b91d32f573e973dd9fcfa68f28652da3d3a7ed29a786f40222fa865a65d887ab923e4d16be613d61190d3358af87f7975f49881bba375c09a47d229efd9d1c39 SHA512 79cb400fb36e2aab458eba75f9580ead604451986bee29b275570b5c1b91143fcbf0ccf5b657a383feeefb243c411cf13c239ba0ec23197c53fd94560c759703
-EBUILD sparc-utils-1.9-r7.ebuild 1586 BLAKE2B 6863cba0c0ee442437137d0c142dcc419816326787f43a5644a6c4cdd3eab50582927d815d920753bb2cdbf42549c9bf83a8f022c179d8e1191e39bd128d1325 SHA512 0a600262916b855c200e89cfc4f72478ad9340d2ac7748bb2b755c1af0a164ca66093f6f3b63ef5bcbdc112ee7b2d29460682479503dd0dbcf078bcc5848261c
+EBUILD sparc-utils-1.9-r7.ebuild 1585 BLAKE2B 3cfa0313f9c70176ea45fb8f9d13b3e66bf21a03470a0522f60edea5c5e10aa2974009579fe5f2dfc4bd3ec2a25245dc39799a43f41662d721ea830c5617e2d7 SHA512 1c7ec88db943eb1a895cde3bf3ed215089400a6b2f770dbcf77c487c47f2f1829baa6e1de14cf5c75e6f95cd5de5a92cedecbae06563f519c813becf727e8a1e
 MISC metadata.xml 417 BLAKE2B b4587439dde12d46f37b31c0bb4a5086e52f233ff0d81dc31dcacca84765a249d2b9936e6dd078c30bdba8efe305548d642269613737f64a059b17a1f5163368 SHA512 276bb8187a9c6a34b13de96dfaa228ac1d2a3a2bef27d87ead61fa373aafa1d08786f9d5506f87088f1bdcef03fec283e9f7b7b69d2ec161c5768ebe41102f3f
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r7.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r7.ebuild
index 585dd2e6facb..616cb65f473b 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r7.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r7.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="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~sparc"
+KEYWORDS="-* sparc"
 IUSE=""
 
 DEPEND="virtual/os-headers"
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 54fe7d3b1aa7..c1cdcf3d0492 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 0f67ca48a2b8..c7b256a20f0f 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -8,5 +8,5 @@ DIST polkit-121.tar.gz 743287 BLAKE2B 6ebda8fc866ef960281ef912a3d3c45572da3ba90a
 EBUILD polkit-0.120_p20220221-r1.ebuild 3303 BLAKE2B b00a260b749e8ee0620a04c93fd4cbe83de8e80d11fd4388be07914229b4dfefb881b35d2b22c231c1ebaa844a30f3579ae5948d290118a528414cbcd7e81110 SHA512 3b7d82d879a1611fcbb70562da47feace213acd0055a03bd752b7e2ee98951db3f8e3a12b04da80dcbf49eecbaf2573d71007879692c5f11264bde4f095ba239
 EBUILD polkit-0.120_p20220221.ebuild 3236 BLAKE2B a0255cdd9d3b77b27d6962747ac34ce11c71dd10b1400bf187098216415856be84209f7b242ec25f0504ba7557b1cec622d796a8774ed33a14fde382f97b78dd SHA512 bcfd31c336e628b3bbfe20e7d43799945625f4af0b64b19969f56264833645ed2779da073d2731729c3faa7e2c824da75f6f69c4677322a3591feb4912d4d9da
 EBUILD polkit-0.120_p20220509.ebuild 3801 BLAKE2B a11fbcc81ea0c6f0e4a17a3fc4b11a4dcbb4d3a2985f5961cd92115f41b2e415bb31e4ad143d8653d8e0a7507399df6d00b44ae1f80f29a17efa26921f869d63 SHA512 75261b434a9086c3e623a569b981306584da571d25393ffdba471af1dc33e99f4fa6fc3b75dae562a52f0f13a231749d8eb6836a039453224b3eba86704e724d
-EBUILD polkit-121.ebuild 3871 BLAKE2B 39efd05c32f02ad94859810f51374ae61bb0b250201415c25e5910c2595d678e938d9b9c743d460a5aaf33c628d184a9f7a39f52bc2eebff3fc6cd170d6defdd SHA512 8c368214caf4b348d5b6146604b1612bba44369f0f03d1917ae1f080f9feb777a0de38815a96f636693790a1d78b3ff207cdf7b31e0e4721b162f3e5a1496991
+EBUILD polkit-121.ebuild 3868 BLAKE2B 736b38c316848e643eacf177f5b94874e3a8b010e1de79aaa9d93bf16c339d1550defd72c2ba22f861e564b6c635ea2601714bb24654299e76be5221f1f21b41 SHA512 993c6494f811c046cc5cd050790e248809e13e62dd87def16213ad013d308eca2755766035da19f063159c49591af1d27f7b9cf9b6cce068d166bae0da724d3e
 MISC metadata.xml 454 BLAKE2B 1a94248c1f7e644ab2501a45aa66efb0fcfe2dd2526e486b1a7c73a56d4910463b69eff0b10cc568437b467f523ced8a2f38a9b67ed6f1891a3411230819f209 SHA512 3fabdf6bce379fa08c802b52398d65071515e08eef357c9886b6c74e1415671068cad942c711e1b1348f6e4b583ae6bec443e902e7d675df1938e981d3ff8143
diff --git a/sys-auth/polkit/polkit-121.ebuild b/sys-auth/polkit/polkit-121.ebuild
index f27a8a8d9199..afc5e8b7b1a6 100644
--- a/sys-auth/polkit/polkit-121.ebuild
+++ b/sys-auth/polkit/polkit-121.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="+duktape examples gtk +introspection kde pam selinux systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 3c407adf9f17..9db9d16b979a 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 490f9aa7c3af..12c242269306 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,3 @@
-AUX gcc-11.2.0-cross-compile-include.patch 875 BLAKE2B 92ed84f2b75dd88c73ca115a9faf454ff51a445fb7939ba51ac2b2e7bf6847cacd699cf4a147f056563b0b50b2ac4a0f907cec5bf0b411ec6a8b8b02ec1f410e SHA512 1195825ce57a43ea3826f1f3bcdb4ed17ce849887419960ab79d49e75117586ffcadb0363d6fd845e79417dc6186d6e93100e20c5d24961b5d827cce5ee85635
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20220811.tar.xz 71753800 BLAKE2B 3aa402b185da2e0ea9d262c561a72acc7dd801ea62ca4a8d7a3b053adc5a94dc9b7ecb657b782961505e907cded25bb28a3495d0b975f68fab5385bcc5d9dccc SHA512 cd6fa0673c3bdea1fe857529ec4c847f9306a4380def895b361e70202984bc5bac820b8a9f0d7fdcf9a39258c804fe556b567258aa7ee19b84849eef8a61801d
diff --git a/sys-devel/gcc/files/gcc-11.2.0-cross-compile-include.patch b/sys-devel/gcc/files/gcc-11.2.0-cross-compile-include.patch
deleted file mode 100644
index d06410650bb0..000000000000
--- a/sys-devel/gcc/files/gcc-11.2.0-cross-compile-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/803371
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80196
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017
---- a/configure
-+++ b/configure
-@@ -17044,7 +17044,7 @@ else
- fi
-
-
--RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
-+RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ar" >&5
- $as_echo_n "checking where to find the target ar... " >&6; }
---- a/configure.ac
-+++ b/configure.ac
-@@ -3529,7 +3529,7 @@ ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip)
- ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
- ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc)
-
--RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
-+RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++"
-
- GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar])
- GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new])
-
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index eaeabdb9a892..031b9f0bf3d7 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index 0be551ff281f..c5a4f3699610 100644
--- a/sys-libs/nss_wrapper/Manifest
+++ b/sys-libs/nss_wrapper/Manifest
@@ -4,6 +4,6 @@ DIST nss_wrapper-1.1.12.tar.gz 176038 BLAKE2B 16c8b81dc9a56b074d61ddb3c7ac6108ce
 DIST nss_wrapper-1.1.6.tar.gz 57893 BLAKE2B 4952b1af2b2b0487104b650b98694e5d39aed9edb44992d22e10ea38a2c4009f076aafa36f43775a021eca5b1f2708c9f42fa711d6715c43b077a9a3341570e8 SHA512 213d611abc072cb8d098b0782f661b4cdf1dcfd04fb564fb05034f023197aeed15a684478c660c00fb72f9438a192914e7b6878e505e4380435534bef52e0328
 EBUILD nss_wrapper-1.1.10.ebuild 394 BLAKE2B be2d618adfb5e60fcb996ab5e84921029a0e44db432efe52ade6f17da7439a7eb532159f05077185ec36e43d009a68dc4dfcf8c69df387e02ed9c4d33185a7b4 SHA512 d46a97ea7f44cfd282e04c8ccc2ede1b52ee98b73807c0ed3f240945c8cf9ebf7cfb29f91e47f66e9ef7eb5b859fec6767e8dbbe314b4a80c82751bded1cd863
 EBUILD nss_wrapper-1.1.11.ebuild 401 BLAKE2B 505ab13bbcf79b7ffad28fee4430e1bfded51510d4e5768bfb455354a6f57f2da691c44399e0d1a40c9f7361892f5b0606fa9273da059f23082705054df138dc SHA512 203254432a3b1d937491b9d1e9d036e5394645bf5bcf03a8f51c2a1b6167f6bedd31914455fa3905c86c754589db11e81b39aeff534c67eba80e9d62b892e30b
-EBUILD nss_wrapper-1.1.12.ebuild 583 BLAKE2B 09927ef0f8e3de4f0ddbd5ac77edd5fd4e8a1958b5029180b9bf359e1ca3e1eae40162ae3042d8ebcb4a363dbb4055d3a4ba46b068319f017d77a0875a5a1915 SHA512 e17ce0368789ce568aecf802a35df5963962383074791d5a3b72aabf053e88cd0d155fdf271201c836963bac97e612adb14d19c1207095c40fd7a2e2a797757e
+EBUILD nss_wrapper-1.1.12.ebuild 579 BLAKE2B 5e0080bff94e1341148f5486825ca748b5cfcae197c5772716967124427adebeb5f76016aec82156571aaa79f844a0cd7b5140bf0caee489475988db858411c6 SHA512 686ea0fa8eae21ad61bc61faec6f81c63584ff69d49a5aad13eb9ab785db6bf4d74171115a8cc756cf70bc6b82d98bcd681de3514867a828208ce56d530cdf69
 EBUILD nss_wrapper-1.1.6.ebuild 387 BLAKE2B c7a4e54867d2ffb5aa7e5117d22258203b9fa33bdc1796cc6c562f81a91a403ec9331b3276066cb6260701781aae652c308e46ecdc6dafe4887bca3ab71cf7e8 SHA512 19184243d8c42e086bb5e3bd4275093067adf65b06244306aaa6b4c22bee2728f28853b9d8cc581b895dde55ce527a5271f5a6b7854c8f85b35da2fcccaac263
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.12.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.12.ebuild
index c6714d8e2163..8b2b26fc96c3 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.12.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index c577f5194cec..eaabbf812227 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -4,5 +4,5 @@ DIST Linux-PAM-1.5.2.tar.xz 988784 BLAKE2B a835034cd239bc9377419c13dda45276e8e64
 DIST pam-1.5.1_p20210622.tar.gz 783068 BLAKE2B c8f13c2ccef73ad367d4fac9a7d1d0d3f3d0e4f1c8eea877d2ab467411cf17cc32c6c9c89e98d94090481d7d7746723175031ba8713a8fb0c3e1976e2854e58b SHA512 5b7a84b9de2d0b0c39cb33e9b8d24aeedca670b998536d74dc497eb7af31cb1f3157f196a01712c4ae273634b51ddad2062f207534b35b1d1a1e790816c8dc1b
 DIST pam-doc-1.5.1_p20210610.tar.xz 62308 BLAKE2B b3311e704ddc840b7fd28ea7764e8a0d3fdf508e2e37405acbfa26462a188c480859b3b21bd4a4b4acea70928e68650c216e8fb2d2b6f11ba33f54c6692cf3a2 SHA512 89b88f8ebf0c46f6b25dc0c5f39383ecbef0b12d6ffab388d92026066ee986f9068819cdbf38baaa1e341cd6cc84b1e8d3ad02db121aaf0ddad27e4e6efe26e7
 EBUILD pam-1.5.1_p20210622-r1.ebuild 3659 BLAKE2B 00ad76cec99ccc356d6e594125921b58dea4112bc8dd06b86a57d19c4b688511517c8a3c4205dc7cd3a1b20fa92b39e5ade0114594a8c765146fe11ccae56bb4 SHA512 12335aac62d987c2cfb8d1f630b0c0c3030c945382b5b6cf42aedd4eb75570a3f6cc98f12b9a43e4b81607c31a159f14ca3721534d089c151d4a6841d1b5b479
-EBUILD pam-1.5.2-r1.ebuild 3609 BLAKE2B 9f94b362cab1bfcecb221cbb2c22071d184d4a66f0f65b01bd91a1fa0840d553123af082c42790bb91796cc953c0ebb52ba9aea47731cd570f8ceb4574b5b202 SHA512 e51ca637b58faf1938f74fa6d85b330b83316b4e48ac57e66c92b96890e0880bcda2506a3a7c83feaa45a5da0a60b5bb15b527fb15f087f59d8176cb05fa214a
+EBUILD pam-1.5.2-r1.ebuild 3605 BLAKE2B 2eccee997dd4c9758e23f8c7d842324c6c63354c70b0421c6250ece055303493fa17462938a589d67a30838cdb73a751c314c5d395c43ced4110ec558a3bb6c0 SHA512 780bb7bfc682ee3135c532c26b80c44dd5d430964980096b5948ecbcf89e21d3b25ca24c7b2cd77c036bb013a0361bc95f120f73540180cac745cb3e62e61f2e
 MISC metadata.xml 754 BLAKE2B 366be10dfcad98d08ea3e307312b9a84804efa6f097f1505907e03fcb5fd0f4a6067d1d85d8dc5fec82c54c2e1fdf76d716d09a45571b0994d96130a2506e1f5 SHA512 b453a62fc3cdc6c0e7cd9c15d1bf72f8641a8eefc3971304ae5f0db3c93b69ca5f9c059e70b94ce799b15b640831c8832707fc1740f1361aca3a28c30ae8f366
diff --git a/sys-libs/pam/pam-1.5.2-r1.ebuild b/sys-libs/pam/pam-1.5.2-r1.ebuild
index b32eb9cbf1fc..0ba2fbc2e299 100644
--- a/sys-libs/pam/pam-1.5.2-r1.ebuild
+++ b/sys-libs/pam/pam-1.5.2-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb debug nis selinux"
 
 BDEPEND="
diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index 7ea25a5cb9ff..281216e32168 100644
--- a/sys-libs/uid_wrapper/Manifest
+++ b/sys-libs/uid_wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST uid_wrapper-1.2.8.tar.gz 47864 BLAKE2B d165954b4418ee23c7564d809a3c2189fc43c91822c8e4a73bdf6ea8e1621156bf0a29097b07a4d8b31ea1d10af35c3be367c4ca8f1e13db1b430f297b47b6ea SHA512 536f353f35e84ffd350a3cd5a96ff30e7b1fd4ba455dbe34fd232ed1a14b061351110c7e0cb4376a27cbde1eda789ef93e635ffa2e9948cadc41c2f1fdcfc3b5
 DIST uid_wrapper-1.2.9.tar.gz 48150 BLAKE2B bfd52c5a5e6a6a4322cff9fbf9bb2ceee3f5eb004d1174cf1d548bf08eade02453c0b551e006ea30aaa0b147748c6592184a597f9c615da2ed5355fe96222a20 SHA512 561dd8d5b139020f47a908e6baca9197d46f6192c280c23f85fad80fcac3fffb2823200777b0f353f79949cfb45b7dcc21b9a585a4bc21b26632b0e0df11d825
 EBUILD uid_wrapper-1.2.8.ebuild 436 BLAKE2B 01b09d35cffad441ccd6d5ae9ba3045a26a0c23e7eeecfc2b748923f3c34b70ffd83071177881caef3fdfd0799521c85d11b7133c62f7e21e7fcd8834dfd8d47 SHA512 b292320eea3ad964710ceeace6001cd0ee7d2fff70bcab04869f2a861cb0374a09d201ba5acb7e93a67e8ecc7087320ee66766479bbb81b75e985267a944dbe4
-EBUILD uid_wrapper-1.2.9.ebuild 625 BLAKE2B 0720a8f981d06906e2c9b5d952b37f897c7c9c1c556f630470224ba1a35ea061c7d309a8a5eabd0def50a28c0cf7047e4def2ec362d1eaaa5048fb20b848d7ac SHA512 b3064babc5532d00a4b9d3337bfec6f3520ef13e08153092aa20e7e10da5c17cd6ee2a60eed848c8efa336a37867cc4249c31b2803c7d4685499e048b5180fa4
+EBUILD uid_wrapper-1.2.9.ebuild 621 BLAKE2B 13fd8125dcfd2c95ce5a9944fc405899c9204d63626ddad0216805880ffca8596e772728a723368a1de134c8d817622077ddf1e2a03a273e67c25153847c0c84 SHA512 3a508cb126b00a85237ae29ea254a66c31257a591cab3dce4eab3f69eaeaf6fda7492a4051c5c8917e21ab54414afb8ac0dde1cef16f3e2494cc9b958470a075
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.9.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.9.ebuild
index 73a19f22dc8d..294839bd9d62 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.9.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 37fdf53efec1..b93686ad7c40 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index e44bfe24ab3e..bb68a3c58d2d 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -2,5 +2,5 @@ DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add
 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
 EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2066 BLAKE2B f149d99306cf8df43776894b72b06b7173149f45abb0cb38a77e85dd08a63e445647d6532c2066bc9c760882891ca49af1b54fda97e79b1c949a80d264f8ab16 SHA512 22a6f7cb86e056f2dd0887b67562b1f849f9eed71cca16d67edb9a9e436a2941cdf8147d17ba9e536f5bac640a7759928acb08746d8f0e3d2b1c572b7565833a
-EBUILD xdg-utils-1.1.3_p20210805.ebuild 2308 BLAKE2B 2dc95e5fc672dff85186cc26f0d1e08a0788f5c654f5f855740470eba322168ba6d908b5d3f6be79a1cf48a8998bf87d081825756c949c5bb1fb8a1c69c2ef1e SHA512 360208d597743117bce649395eda1b113e3846afb6a86987a10cba0d1abd976eaaf755cf7acd9baa1433f8578bf2533faf3908fa9a28265566a7dad7b6b472bd
+EBUILD xdg-utils-1.1.3_p20210805.ebuild 2304 BLAKE2B d45c4a5a3b0900679157670fd860610cdfe5afb774f088abaa49b923db3a45ae250498bf7c078be37c815120dec8bee2a88835274f0cde1b769a46c7cdfb1bd2 SHA512 e690cca37f517bf8af949a767c579f516acfd15c276014bacadb38200bafe3814955e99009af4de001e888d8b54bfb92967b5d36a9328b492fbf2f0ce4f31aed
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
index db26c50443bd..8dda4d7e4bfc 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome"
 REQUIRED_USE="gnome? ( dbus )"
author	V3n3RiX <venerix@koprulu.sector>	2022-08-31 04:49:49 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-31 04:49:49 +0100
commit	c8f83ad526fb6b554daf375e0ad65eb2d56e669b (patch)
tree	cafe57965da48ad47a4e5e88ae7885492f21da6f
parent	6cef603bfc4353c863a1a0b460a0aa882d2dc51c (diff)